-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 It has come to light that this patch breaks binpkg use in stage1. Personally I'd like to revert it entirely as the code is complex and confusing to me for no reason. Seperately I would fix the default update_seed command because the "--rebuild-if-new-ver gcc" bit seems a lot better to me.
Everyone approved this patch and it's been sitting in git for 2 months without anyone realizing it's broken. That alone should make it evident that this code is too hard to read. Can I get an ACK or NACK from the team members? Thanks, Zero On 03/26/2013 11:09 PM, Jorge Manuel B. S. Vicetto (jmbsvicetto) wrote: > From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <[email protected]> > > --- > 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" > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRpDO+AAoJEKXdFCfdEflKr2QP/0Whgw5sSD6MmcKYcFRm5f/F zJoKJ7bhGX5i2AOOFDj7C05ronjSPn5ADinEDNydBLLtrPkTSaMBvf+/XsJNRI8M 4IFAF39q3h4a7jBzRDI/SzjebXT1lJo2Tdx5HnF1lEJN28u8fyKoMW9SHRQXCqIt mOj8tt6Ajw8SFXGgDpkmwii9nvp3MP5vIsO/yKoMnZoUm6cLXN5kT9JiE8RpPyYy Gs7l4lVrBmwngGw40tpBNU5n1Koi3a7052qOQlUrdb4Bb29eVMEb53AbBGyvqZAb vyO/b52qLJn2LmLDmhyZsDxOl76i98OxzHTgd/b5yNcF3J3kv4gI1iWI7fQUO6YI gTpo5sZRzPvljAtqX3MfuLMtn5ZtsnxoKhSw1Oe30DBkcT0tzY36H/dNkdEA1WY0 Xh0i0UtwIgYKSU4WWMjsDErPtAbway2GuhfpSyjfGePaDiV84W3XvFQyBoBIQ6E8 g86t/y76mdINpqXKp7urYjb+o1CKt+zUQ+XoCOSkGDkA8yBhAheJu5RkLsztvvMd C1hz2u/HxDGxqaWw40fWTWI3RKywJbL/JMC+pWULqI9Wz4Fv6DkaUoVM0BToqkGP vgOVLbGc86t0mYYaSunUhZMQbSw99p0CdBUmxgnF8OyjPSJ9dd52ptiEFa3fllK/ vvGg8mlTjjWrmzliVBh4 =PNec -----END PGP SIGNATURE-----
