1 |
There should be no need for custom updates, and if there are exceptional |
2 |
circumstances the new --enter-chroot option can be used. |
3 |
|
4 |
Signed-off-by: Matt Turner <mattst88@g.o> |
5 |
--- |
6 |
catalyst/targets/stage1.py | 2 -- |
7 |
doc/catalyst-spec.5.txt | 10 ------- |
8 |
targets/stage1/chroot.sh | 43 +++++++++-------------------- |
9 |
targets/support/chroot-functions.sh | 2 +- |
10 |
4 files changed, 14 insertions(+), 43 deletions(-) |
11 |
|
12 |
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py |
13 |
index 5a154e76..f7c723ee 100644 |
14 |
--- a/catalyst/targets/stage1.py |
15 |
+++ b/catalyst/targets/stage1.py |
16 |
@@ -16,8 +16,6 @@ class stage1(StageBase): |
17 |
required_values = frozenset() |
18 |
valid_values = required_values | frozenset([ |
19 |
"chost", |
20 |
- "update_seed", |
21 |
- "update_seed_command", |
22 |
]) |
23 |
|
24 |
def __init__(self, spec, addlargs): |
25 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
26 |
index 4c1df857..47a62709 100644 |
27 |
--- a/doc/catalyst-spec.5.txt |
28 |
+++ b/doc/catalyst-spec.5.txt |
29 |
@@ -116,16 +116,6 @@ releases, we use a default README.txt, and this will be used on your |
30 |
CD if you do not provide one yourself. We do not use this for the |
31 |
official releases. This setting is supported by the livecd targets. |
32 |
|
33 |
-*update_seed*:: |
34 |
-This is an optional setting supported by stage1 to tell catalyst if |
35 |
-it should update the seed stage or not (valid values: `yes no`). |
36 |
- |
37 |
-*update_seed_command*:: |
38 |
-This is an optional command to pass to emerge for updating the seed |
39 |
-stage (example: `--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`) |
40 |
-If not specified, catalyst will update gcc deps. |
41 |
-This setting requires enabling update_seed. |
42 |
- |
43 |
Compilation |
44 |
~~~~~~~~~~~ |
45 |
|
46 |
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh |
47 |
index a1818425..76a30941 100755 |
48 |
--- a/targets/stage1/chroot.sh |
49 |
+++ b/targets/stage1/chroot.sh |
50 |
@@ -27,37 +27,20 @@ FEATURES="${FEATURES} nodoc noman noinfo" |
51 |
sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \ |
52 |
/usr/share/portage/config/make.globals |
53 |
|
54 |
-# We need to ensure the base stage3 has USE="bindist" |
55 |
-# if BINDIST is set to avoid issues with openssl / openssh |
56 |
-[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf} |
57 |
- |
58 |
-# Update stage3 |
59 |
-if [ -n "${clst_update_seed}" ]; then |
60 |
- if [ "${clst_update_seed}" == "yes" ]; then |
61 |
- echo "Updating seed stage..." |
62 |
- |
63 |
- ROOT=/ USE=-rsync-verify run_merge --oneshot --update sys-apps/portage |
64 |
- |
65 |
- if [ -n "${clst_update_seed_command}" ]; then |
66 |
- ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}" |
67 |
- elif grep -q '^\[changed-subslot\]' /usr/share/portage/config/sets/portage.conf; then |
68 |
- ROOT=/ run_merge --ignore-built-slot-operator-deps y @changed-subslot |
69 |
- else |
70 |
- ROOT=/ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc |
71 |
- fi |
72 |
- elif [ "${clst_update_seed}" != "no" ]; then |
73 |
- echo "Invalid setting for update_seed: ${clst_update_seed}" |
74 |
- exit 1 |
75 |
+# Update seed stage |
76 |
+echo "Updating seed stage" |
77 |
+( |
78 |
+ # Don't build or use binpkgs when updating the seed stage |
79 |
+ clst_PKGCACHE= setup_emerge_opts |
80 |
+ |
81 |
+ export ROOT=/ |
82 |
+ USE=-rsync-verify run_merge --oneshot --update sys-apps/portage |
83 |
+ if grep -q '^\[changed-subslot\]' /usr/share/portage/config/sets/portage.conf; then |
84 |
+ run_merge --ignore-built-slot-operator-deps y @changed-subslot |
85 |
+ else |
86 |
+ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc |
87 |
fi |
88 |
- |
89 |
- # reset emerge options for the target |
90 |
- clst_update_seed=no setup_emerge_opts |
91 |
-else |
92 |
- echo "Skipping seed stage update..." |
93 |
-fi |
94 |
- |
95 |
-# Clear USE |
96 |
-[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf} |
97 |
+) |
98 |
|
99 |
export ROOT="${clst_root_path}" |
100 |
mkdir -p "$ROOT" |
101 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
102 |
index 88465c31..94d7c938 100755 |
103 |
--- a/targets/support/chroot-functions.sh |
104 |
+++ b/targets/support/chroot-functions.sh |
105 |
@@ -136,7 +136,7 @@ setup_emerge_opts() { |
106 |
emerge_opts+=(--load-average "${clst_load_average}") |
107 |
fi |
108 |
|
109 |
- if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] |
110 |
+ if [ -n "${clst_PKGCACHE}" ] |
111 |
then |
112 |
emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse) |
113 |
bootstrap_opts+=(-r) |
114 |
-- |
115 |
2.26.2 |