From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD2CB138206 for ; Tue, 2 Jan 2018 13:39:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F562E0839; Tue, 2 Jan 2018 13:39:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1D4DE0839 for ; Tue, 2 Jan 2018 13:39:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 438DA335C2C for ; Tue, 2 Jan 2018 13:39:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0830B74 for ; Tue, 2 Jan 2018 13:39:20 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1514900347.3762c6fa6c5c4214698512376fc10e0581956c6e.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: scripts/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: scripts/automatic_updater.sh X-VCS-Directories: scripts/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 3762c6fa6c5c4214698512376fc10e0581956c6e X-VCS-Branch: master Date: Tue, 2 Jan 2018 13:39:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b1fe884e-5e3f-466a-91ba-73c1dbce404e X-Archives-Hash: 59a1cc4c57652dcdcba522d689656280 commit: 3762c6fa6c5c4214698512376fc10e0581956c6e Author: Yuta SATOH gmail com> AuthorDate: Tue Jan 2 13:39:07 2018 +0000 Commit: Yuta SATOH gentoo gr jp> CommitDate: Tue Jan 2 13:39:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=3762c6fa automatic_updater.sh: add the missing code to upgrade correctly. scripts/automatic_updater.sh | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 2afa6f6..58e8ced 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -42,7 +42,7 @@ move_makeconf(){ } update_portage(){ - local dl_portage_ver="2.3.8" + local dl_portage_ver="2.3.6" echo "Updating the sys-apps/portage with a manual method..." @@ -63,8 +63,8 @@ update_portage(){ eselect python set 1 } -update_bmake(){ - echo "Updating the bmake..." +update_bmake_command(){ + echo "Updating bmake..." [[ -e /usr/local/bin/make ]] && exit 1 @@ -73,15 +73,32 @@ update_bmake(){ make cp -a make /usr/local/bin/ cd "${PORTDIR}/sys-freebsd/freebsd-ubin" && ebuild $(ls -1 freebsd-ubin-${TARGETVER}*.ebuild | tail -n 1) clean + + env-update + source /etc/profile +} + +update_config_command(){ + echo "Updating config..." + + [[ -e /usr/local/sbin/config ]] && exit 1 + + cd "${PORTDIR}/sys-freebsd/freebsd-usbin" && ebuild $(ls -1 freebsd-usbin-${TARGETVER}*.ebuild | tail -n 1) prepare + cd "${PORTAGE_TMPDIR}"/portage/sys-freebsd/freebsd-usbin-${TARGETVER}*/work/usr.sbin/config + /usr/local/bin/make -m /usr/share/mk/system + cp -a config /usr/local/sbin/ + cd "${PORTDIR}/sys-freebsd/freebsd-usbin" && ebuild $(ls -1 freebsd-usbin-${TARGETVER}*.ebuild | tail -n 1) clean } update_minimal(){ echo "Updating the minimal packages to upgrade the Gentoo/FreeBSD..." emerge -u sys-devel/gcc-config --exclude sys-freebsd/* - update_bmake + update_bmake_command emerge --nodeps sys-freebsd/freebsd-mk-defs + update_config_command + emerge -u ' /etc/portage/package.unmask/binutils-oldversion + echo "sys-devel/binutils" > /etc/portage/package.unmask/toolchain-oldversion + echo "sys-devel/gcc" >> /etc/portage/package.unmask/toolchain-oldversion emerge -u '