From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 445741381FB for ; Wed, 27 Mar 2013 03:10:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70509E0818; Wed, 27 Mar 2013 03:10:02 +0000 (UTC) Received: from lantean.jmbsvicetto.name (lantean.jmbsvicetto.name [88.198.230.205]) by pigeon.gentoo.org (Postfix) with ESMTP id E360CE0818 for ; Wed, 27 Mar 2013 03:10:01 +0000 (UTC) Received: by lantean.jmbsvicetto.name (Postfix, from userid 1000) id DFCF3E00AA; Wed, 27 Mar 2013 03:10:00 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" To: gentoo-catalyst@lists.gentoo.org Cc: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Subject: [gentoo-catalyst] [PATCH 1/2] Fix update_seed use by not using nor building binary packages during the seed update. Date: Wed, 27 Mar 2013 03:09:56 +0000 Message-Id: <1364353797-7607-1-git-send-email-jmbsvicetto@gentoo.org> X-Mailer: git-send-email 1.8.1.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 99e6bfd9-5450-46f7-b30f-1493bdb8821e X-Archives-Hash: 3c1f1e6f7cc64809e533ac6be696a17d From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" --- targets/stage1/stage1-chroot.sh | 5 ++++- targets/support/chroot-functions.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 3f628c2..ed83f38 100644 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -30,12 +30,15 @@ if [ -n "${clst_update_seed}" ]; then if [ -n "${clst_update_seed_command}" ]; then clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" else - clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc" + clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" fi elif [ "${clst_update_seed}" != "no" ]; then echo "Invalid setting for update_seed: ${clst_update_seed}" exit 1 fi + + # reset emerge options for the target + clst_update_seed=no setup_myemergeopts else echo "Skipping seed stage update..." fi diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 35ffbaa..0705b5b 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -133,7 +133,7 @@ setup_myemergeopts(){ then export bootstrap_opts="${bootstrap_opts} -f" export clst_myemergeopts="${clst_myemergeopts} -f" - elif [ -n "${clst_PKGCACHE}" ] + elif [ -n "${clst_PKGCACHE}" -a -z "${clst_update_seed}" ] then export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" export bootstrap_opts="${bootstrap_opts} -r" -- 1.8.1.5