| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA1 |
| 3 |
|
| 4 |
It has come to light that this patch breaks binpkg use in stage1. |
| 5 |
Personally I'd like to revert it entirely as the code is complex and |
| 6 |
confusing to me for no reason. Seperately I would fix the default |
| 7 |
update_seed command because the "--rebuild-if-new-ver gcc" bit seems a |
| 8 |
lot better to me. |
| 9 |
|
| 10 |
Everyone approved this patch and it's been sitting in git for 2 months |
| 11 |
without anyone realizing it's broken. That alone should make it evident |
| 12 |
that this code is too hard to read. |
| 13 |
|
| 14 |
Can I get an ACK or NACK from the team members? |
| 15 |
|
| 16 |
Thanks, |
| 17 |
Zero |
| 18 |
|
| 19 |
On 03/26/2013 11:09 PM, Jorge Manuel B. S. Vicetto (jmbsvicetto) wrote: |
| 20 |
> From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o> |
| 21 |
> |
| 22 |
> --- |
| 23 |
> targets/stage1/stage1-chroot.sh | 5 ++++- |
| 24 |
> targets/support/chroot-functions.sh | 2 +- |
| 25 |
> 2 files changed, 5 insertions(+), 2 deletions(-) |
| 26 |
> |
| 27 |
> diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 28 |
> index 3f628c2..ed83f38 100644 |
| 29 |
> --- a/targets/stage1/stage1-chroot.sh |
| 30 |
> +++ b/targets/stage1/stage1-chroot.sh |
| 31 |
> @@ -30,12 +30,15 @@ if [ -n "${clst_update_seed}" ]; then |
| 32 |
> if [ -n "${clst_update_seed_command}" ]; then |
| 33 |
> clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
| 34 |
> else |
| 35 |
> - clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc" |
| 36 |
> + clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" |
| 37 |
> fi |
| 38 |
> elif [ "${clst_update_seed}" != "no" ]; then |
| 39 |
> echo "Invalid setting for update_seed: ${clst_update_seed}" |
| 40 |
> exit 1 |
| 41 |
> fi |
| 42 |
> + |
| 43 |
> + # reset emerge options for the target |
| 44 |
> + clst_update_seed=no setup_myemergeopts |
| 45 |
> else |
| 46 |
> echo "Skipping seed stage update..." |
| 47 |
> fi |
| 48 |
> diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 49 |
> index 35ffbaa..0705b5b 100644 |
| 50 |
> --- a/targets/support/chroot-functions.sh |
| 51 |
> +++ b/targets/support/chroot-functions.sh |
| 52 |
> @@ -133,7 +133,7 @@ setup_myemergeopts(){ |
| 53 |
> then |
| 54 |
> export bootstrap_opts="${bootstrap_opts} -f" |
| 55 |
> export clst_myemergeopts="${clst_myemergeopts} -f" |
| 56 |
> - elif [ -n "${clst_PKGCACHE}" ] |
| 57 |
> + elif [ -n "${clst_PKGCACHE}" -a -z "${clst_update_seed}" ] |
| 58 |
> then |
| 59 |
> export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" |
| 60 |
> export bootstrap_opts="${bootstrap_opts} -r" |
| 61 |
> |
| 62 |
|
| 63 |
-----BEGIN PGP SIGNATURE----- |
| 64 |
Version: GnuPG v2.0.19 (GNU/Linux) |
| 65 |
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ |
| 66 |
|
| 67 |
iQIcBAEBAgAGBQJRpDO+AAoJEKXdFCfdEflKr2QP/0Whgw5sSD6MmcKYcFRm5f/F |
| 68 |
zJoKJ7bhGX5i2AOOFDj7C05ronjSPn5ADinEDNydBLLtrPkTSaMBvf+/XsJNRI8M |
| 69 |
4IFAF39q3h4a7jBzRDI/SzjebXT1lJo2Tdx5HnF1lEJN28u8fyKoMW9SHRQXCqIt |
| 70 |
mOj8tt6Ajw8SFXGgDpkmwii9nvp3MP5vIsO/yKoMnZoUm6cLXN5kT9JiE8RpPyYy |
| 71 |
Gs7l4lVrBmwngGw40tpBNU5n1Koi3a7052qOQlUrdb4Bb29eVMEb53AbBGyvqZAb |
| 72 |
vyO/b52qLJn2LmLDmhyZsDxOl76i98OxzHTgd/b5yNcF3J3kv4gI1iWI7fQUO6YI |
| 73 |
gTpo5sZRzPvljAtqX3MfuLMtn5ZtsnxoKhSw1Oe30DBkcT0tzY36H/dNkdEA1WY0 |
| 74 |
Xh0i0UtwIgYKSU4WWMjsDErPtAbway2GuhfpSyjfGePaDiV84W3XvFQyBoBIQ6E8 |
| 75 |
g86t/y76mdINpqXKp7urYjb+o1CKt+zUQ+XoCOSkGDkA8yBhAheJu5RkLsztvvMd |
| 76 |
C1hz2u/HxDGxqaWw40fWTWI3RKywJbL/JMC+pWULqI9Wz4Fv6DkaUoVM0BToqkGP |
| 77 |
vgOVLbGc86t0mYYaSunUhZMQbSw99p0CdBUmxgnF8OyjPSJ9dd52ptiEFa3fllK/ |
| 78 |
vvGg8mlTjjWrmzliVBh4 |
| 79 |
=PNec |
| 80 |
-----END PGP SIGNATURE----- |
Archives