1 |
commit: e7ea409acb52b43e9ea141c57201f9f87673f7ba |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 31 03:57:36 2013 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 31 03:57:36 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e7ea409a |
7 |
|
8 |
don't build packages during update_seed |
9 |
|
10 |
when update_seed is run it uses the default catalyst emerge options |
11 |
which causes binary packages to be built which are linked against the |
12 |
seed stage rather than the generated stage. These binary packages |
13 |
can be later used and cause significant and odd issues due to being |
14 |
linked to older libraries. I am passing "--buildpkg=n" for the |
15 |
update_seed runs to prevent this issue and close bug #454184 |
16 |
|
17 |
--- |
18 |
targets/stage1/stage1-chroot.sh | 4 ++-- |
19 |
1 files changed, 2 insertions(+), 2 deletions(-) |
20 |
|
21 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
22 |
index 462ea28..3f628c2 100644 |
23 |
--- a/targets/stage1/stage1-chroot.sh |
24 |
+++ b/targets/stage1/stage1-chroot.sh |
25 |
@@ -28,9 +28,9 @@ if [ -n "${clst_update_seed}" ]; then |
26 |
if [ "${clst_update_seed}" == "yes" ]; then |
27 |
echo "Updating seed stage..." |
28 |
if [ -n "${clst_update_seed_command}" ]; then |
29 |
- clst_root_path=/ run_merge "${clst_update_seed_command}" |
30 |
+ clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
31 |
else |
32 |
- clst_root_path=/ run_merge "--update --deep --newuse --onlydeps gcc" |
33 |
+ clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc" |
34 |
fi |
35 |
elif [ "${clst_update_seed}" != "no" ]; then |
36 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |