diff options
| author |   Yuta SATOH <nigoro.dev@gmail.com> | 2016-03-21 07:49:46 +0900 |
|---|---|---|
| committer | Yuta SATOH <nigoro.dev@gmail.com> | 2016-03-21 07:49:46 +0900 |
| commit | b78e47898ff0e22ba4ec0cf320a9179bf34df8ff (patch) | |
| tree | 525058d6b02c7813dde46a28b291daf28c2e54c2 | |
| parent | automatic_updater.sh: clang updated twice. (diff) | |
| download | gentoo-bsd-b78e47898ff0e22ba4ec0cf320a9179bf34df8ff.tar.gz gentoo-bsd-b78e47898ff0e22ba4ec0cf320a9179bf34df8ff.tar.bz2 gentoo-bsd-b78e47898ff0e22ba4ec0cf320a9179bf34df8ff.zip | |
automatic_bugfix.sh, automatic_updater.sh: Fix bug 577714.
| -rwxr-xr-x | scripts/automatic_bugfix.sh | 12 | ||||
| -rwxr-xr-x | scripts/automatic_updater.sh | 16 |
2 files changed, 11 insertions, 17 deletions
diff --git a/scripts/automatic_bugfix.sh b/scripts/automatic_bugfix.sh index edb917b..85abef9 100755 --- a/scripts/automatic_bugfix.sh +++ b/scripts/automatic_bugfix.sh @@ -3,6 +3,7 @@ # sys-apps/portage: bug 493126, 574626 # app-shells/bash: bug 574426 # sys-devel/gettext: bug 564168 +# sys-apps/findutils: bug 577714 PORTDIR="${PORTDIR:-/usr/portage}" TMPDIR="${TMPDIR:-/tmp/autofix}" @@ -49,6 +50,15 @@ fix_gettext() { echo "dev-libs/libintl-0.19.7" >> ${PORTDIR}/profiles/default/bsd/fbsd/package.provided } +fix_findutils() { + # Fix bug 577714 + local pkg="sys-apps/findutils" + local ebuild="$(latest_ebuild ${pkg})" + + gsed -i '/<sys\/sysmacros.h>/d' "${PORTDIR}/${pkg}/${ebuild}" + ebuild "${PORTDIR}/${pkg}/${ebuild}" manifest +} + mk_patches() { cat > "${TMPDIR}/bug493126.patch" <<-'EOF' diff --git a/portage-2.2.7/pym/portage/process.py b/portage-2.2.7/pym/portage/process.py @@ -188,7 +198,7 @@ mk_patches() { EOF } -for func in mk_patches fix_portage fix_bash fix_gettext +for func in mk_patches fix_portage fix_bash fix_gettext fix_findutils do echo "${func}" ${func} diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 1439751..c2d2507 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -39,16 +39,6 @@ update_portage(){ PYTHON_TARGETS="python2_7" "portage-${dl_portage_ver}"/bin/emerge --nodeps sys-apps/portage } -create_pmask(){ - if [[ -f /etc/portage/package.mask ]] ; then - mv /etc/portage/package.mask /etc/portage/package.mask.file_tmp - mkdir -p /etc/portage/package.mask - mv /etc/portage/package.mask.file_tmp /etc/portage/package.mask/local - fi - [[ ! -d /etc/portage/package.mask ]] && mkdir -p /etc/portage/package.mask - echo '>=sys-apps/findutils-4.6' >> /etc/portage/package.mask/force-upgrade -} - update_minimal(){ emerge --nodeps sys-freebsd/freebsd-mk-defs emerge -u sys-apps/findutils --exclude sys-freebsd/* @@ -88,10 +78,6 @@ update_toolchain(){ fi } -remove_pmask(){ - [[ -e /etc/portage/package.mask/force-upgrade ]] && rm /etc/portage/package.mask/force-upgrade -} - update_kernel(){ emerge -C freebsd-sources sys-freebsd/virtio-kmod sys-fs/fuse4bsd && : emerge --nodeps freebsd-sources @@ -148,12 +134,10 @@ case "$TARGETMODE" in "kernel" ) set_profile move_makeconf - create_pmask update_portage update_minimal update_toolchain update_kernel - remove_pmask ;; "kernelonly" ) update_kernel ;; "freebsd_userland" ) |