* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2011-11-16 4:05 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-11-16 4:05 UTC (permalink / raw
To: gentoo-commits
commit: 1451d23137c29f47a5d003baef1e1b14343ccedb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 04:02:55 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 04:04:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1451d231
Update USE flags for stage1 to add cxx to fix the building of stages - bug 390701.
---
targets/stage1/stage1-chroot.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 74d36c9..550eef7 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -31,8 +31,8 @@ make_destpath /tmp/stage1root
# Now, we install our packages
[ -e /etc/make.conf ] && \
- echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \
+ echo "USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"" \
>> /etc/make.conf
run_merge "--oneshot ${clst_buildpkgs}"
-sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
+sed -i "/USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
/etc/make.conf
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2011-11-19 19:43 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-11-19 19:43 UTC (permalink / raw
To: gentoo-commits
commit: fce86fec026039b9e2fd1a44f44f6a6b93c1199d
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 19:30:22 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 19:39:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=fce86fec
@£§§@§£ - Next time make sure your "fat" finger doesn't add extra characters to variable names: BOOTSTRAP0_USE -> BOOTSTRAP_USE.
---
targets/stage1/stage1-chroot.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index dadd0f5..79f127f 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
source /tmp/chroot-functions.sh
# Setup our environment
-BOOTSTRAP0_USE="$(portageq envvar BOOTSTRAP_USE)"
+BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
## Sanity check profile
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-08-23 5:55 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-23 5:55 UTC (permalink / raw
To: gentoo-commits
commit: 59295a79a91f6a6c27a6363f0d11ee1d24bcb938
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 02:47:10 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 02:47:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=59295a79
Create /etc/portage on stage1-controller.
Also update the copy of make.conf to use /etc/portage instead of /etc. Stop copying make.profile as it's set by eselect inside the chroot.
---
targets/stage1/stage1-controller.sh | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3c348ce..70a6634 100644
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -7,14 +7,13 @@ case $1 in
;;
run)
cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
-
+
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}/${clst_root_path}/etc
-
+ install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
+
# Setup make.conf and make.profile link in "ROOT in chroot":
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
- /${clst_root_path}/etc
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
# Enter chroot, execute our build script
exec_in_chroot \
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-08-23 5:55 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-23 5:55 UTC (permalink / raw
To: gentoo-commits
commit: 096634ffe24c4c13ebf15a9294efe346e28afab9
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 02:57:41 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 02:57:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=096634ff
We need to set the profile before trying to determine what packages to build.
---
targets/stage1/stage1-chroot.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index e238012..af50a1c 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,10 +1,10 @@
#!/bin/bash
+source /tmp/chroot-functions.sh
+
# We do this first, so we know our package list for --debug
export clst_buildpkgs="$(/tmp/build.py)"
-source /tmp/chroot-functions.sh
-
# Setup our environment
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-08-29 3:18 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-29 3:18 UTC (permalink / raw
To: gentoo-commits
commit: ce3433d22948ea3183b6d033e0cf4e7cb3a1d8fd
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 02:46:40 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 02:46:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ce3433d2
Add initial support to update the seed stage on stage1 - bug 397505.
---
targets/stage1/stage1-chroot.sh | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index af50a1c..00f390d 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -23,6 +23,13 @@ fi
[ -e /etc/portage/make.conf ] && \
echo 'USE="${USE} -build"' >> /etc/portage/make.conf
run_merge "--oneshot --nodeps sys-apps/baselayout"
+
+# Update stage3
+UPDATE_SEED_STAGE="yes"
+if [ -n ${UPDATE_SEED_STAGE} ]; then
+ echo "Updating seed stage..."
+ clst_root_path=/ run_merge "--update --deep --newuse @world"
+fi
sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
# Next, we install the package manager
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-08-31 1:57 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-31 1:57 UTC (permalink / raw
To: gentoo-commits
commit: 97daf71e380e5e70403358339cde93ebd8d7cad9
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 01:56:45 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 01:56:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=97daf71e
We need to quote UPDATE_SEED_STAGE or the test will always return sucess.
---
targets/stage1/stage1-chroot.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 641f5c3..2c4daca 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -26,7 +26,7 @@ run_merge "--oneshot --nodeps sys-apps/baselayout"
# Update stage3
#UPDATE_SEED_STAGE="yes"
-if [ -n ${UPDATE_SEED_STAGE} ]; then
+if [ -n "${UPDATE_SEED_STAGE}" ]; then
echo "Updating seed stage..."
clst_root_path=/ run_merge "--update --deep --newuse @world"
fi
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-09-03 3:09 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-09-03 3:09 UTC (permalink / raw
To: gentoo-commits
commit: 0393146a3894326a1dbf8642e42902762eb987d9
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 3 03:08:30 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Sep 3 03:08:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0393146a
Fix optional update of seed_stage.
---
targets/stage1/stage1-chroot.sh | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 2c4daca..c26bd72 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -18,18 +18,20 @@ then
exit 1
fi
+# Update stage3
+if [ -n "${clst_update_seed_cache}" ]; then
+ echo "Updating seed stage..."
+ clst_root_path=/ run_merge "--update --deep --newuse @world"
+else
+ echo "Skipping seed stage update..."
+fi
+
## START BUILD
# First, we drop in a known-good baselayout
[ -e /etc/portage/make.conf ] && \
echo 'USE="${USE} -build"' >> /etc/portage/make.conf
run_merge "--oneshot --nodeps sys-apps/baselayout"
-# Update stage3
-#UPDATE_SEED_STAGE="yes"
-if [ -n "${UPDATE_SEED_STAGE}" ]; then
- echo "Updating seed stage..."
- clst_root_path=/ run_merge "--update --deep --newuse @world"
-fi
sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
# Next, we install the package manager
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-10-22 1:20 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2012-10-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: b266cfaa322e0791915004765a74f75c673c70f4
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 22 01:19:59 2012 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 01:19:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b266cfaa
setup portage before updating seed_cache
When updating of seed_cache support was added it was added before portage
was setup/updated. We always was portage first.
---
targets/stage1/stage1-chroot.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index c26bd72..6f7e5b0 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -21,6 +21,7 @@ fi
# Update stage3
if [ -n "${clst_update_seed_cache}" ]; then
echo "Updating seed stage..."
+ clst_root_path=/ setup_pkgmgr
clst_root_path=/ run_merge "--update --deep --newuse @world"
else
echo "Skipping seed stage update..."
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-10-23 17:18 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2012-10-23 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 694e7872695d384a170830835a1863ed1a2ebdfc
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 17:19:51 2012 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 17:19:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=694e7872
fix order of stage1 portage updates
Reorder things based on proper understanding of stage1 builds.
This allows a slight reduction in redundancy.
---
targets/stage1/stage1-chroot.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 6f7e5b0..a9536a6 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -18,15 +18,19 @@ then
exit 1
fi
+## Setup seed pkgmgr to ensure latest
+clst_root_path=/ setup_pkgmgr
+
# Update stage3
if [ -n "${clst_update_seed_cache}" ]; then
echo "Updating seed stage..."
- clst_root_path=/ setup_pkgmgr
clst_root_path=/ run_merge "--update --deep --newuse @world"
else
echo "Skipping seed stage update..."
fi
+make_destpath /tmp/stage1root
+
## START BUILD
# First, we drop in a known-good baselayout
[ -e /etc/portage/make.conf ] && \
@@ -35,10 +39,6 @@ run_merge "--oneshot --nodeps sys-apps/baselayout"
sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
-# Next, we install the package manager
-clst_root_path=/ setup_pkgmgr
-make_destpath /tmp/stage1root
-
# Now, we install our packages
[ -e /etc/portage/make.conf ] && \
echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-11-21 5:20 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2012-11-21 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 81796dee7481246aa6ec0634ccdc2350746bfb20
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Nov 10 23:38:03 2012 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Nov 11 00:16:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=81796dee
Use update_seed's argument as an argument list to emerge
Previously, update_seed caused the seed stage to be updated with
--update --deep --newuse @world. This proved to be unnecessary in the
majority of cases.
Simply give run_merge the previously unused argument of update_seed as
an argument list. This allows updating select packages in a seed stage.
---
targets/stage1/stage1-chroot.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index a9536a6..377a7cf 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -24,7 +24,7 @@ clst_root_path=/ setup_pkgmgr
# Update stage3
if [ -n "${clst_update_seed_cache}" ]; then
echo "Updating seed stage..."
- clst_root_path=/ run_merge "--update --deep --newuse @world"
+ clst_root_path=/ run_merge "${clst_update_seed_cache}"
else
echo "Skipping seed stage update..."
fi
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2012-12-07 1:49 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-12-07 1:49 UTC (permalink / raw
To: gentoo-commits
commit: 8a05e877d2f34a37bc15fc21a1dd05853d4a3a50
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 7 01:49:30 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 7 01:49:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8a05e877
Fix broken syntax in previous commit.
---
targets/stage1/stage1-chroot.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 72c741a..e40982b 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -30,7 +30,7 @@ if [ -n "${clst_update_seed}" ]; then
else
clst_root_path=/ run_merge "--update --deep --newuse --onlydeps gcc"
fi
- else if [ "${clst_update_seed}" != "no" ];
+ elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"
exit 1
fi
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2013-01-25 2:46 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2013-01-25 2:46 UTC (permalink / raw
To: gentoo-commits
commit: 9254ba3d62c732ad4979302ba2e13074d1e27c39
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 25 02:48:27 2013 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 25 02:48:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9254ba3d
Use update_seed_command, as documented
Not update_command. Bug in 4dc9de30.
---
targets/stage1/stage1-chroot.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index e40982b..73d27ff 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -25,8 +25,8 @@ clst_root_path=/ setup_pkgmgr
if [ -n "${clst_update_seed}" ]; then
if [ "${clst_update_seed}" == "yes" ]; then
echo "Updating seed stage..."
- if [ -n "${clst_update_command}" ]; then
- clst_root_path=/ run_merge "${clst_update_command}"
+ if [ -n "${clst_update_seed_command}" ]; then
+ clst_root_path=/ run_merge "${clst_update_seed_command}"
else
clst_root_path=/ run_merge "--update --deep --newuse --onlydeps gcc"
fi
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2013-01-31 4:00 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2013-01-31 4:00 UTC (permalink / raw
To: gentoo-commits
commit: e7ea409acb52b43e9ea141c57201f9f87673f7ba
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 03:57:36 2013 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 03:57:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e7ea409a
don't build packages during update_seed
when update_seed is run it uses the default catalyst emerge options
which causes binary packages to be built which are linked against the
seed stage rather than the generated stage. These binary packages
can be later used and cause significant and odd issues due to being
linked to older libraries. I am passing "--buildpkg=n" for the
update_seed runs to prevent this issue and close bug #454184
---
targets/stage1/stage1-chroot.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 462ea28..3f628c2 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -28,9 +28,9 @@ if [ -n "${clst_update_seed}" ]; then
if [ "${clst_update_seed}" == "yes" ]; then
echo "Updating seed stage..."
if [ -n "${clst_update_seed_command}" ]; then
- clst_root_path=/ run_merge "${clst_update_seed_command}"
+ clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
else
- clst_root_path=/ run_merge "--update --deep --newuse --onlydeps gcc"
+ clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc"
fi
elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
@ 2014-02-07 23:24 ` Brian Dolbec
0 siblings, 0 replies; 44+ messages in thread
From: Brian Dolbec @ 2014-02-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 0e1ead9d8d20d29db6aed7eb2d036b9e9210fb86
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 14:56:04 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Jan 12 20:48:21 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0e1ead9d
Remove an extra slash in the path.
---
targets/stage1/stage1-controller.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3671095..8dbd16b 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -10,11 +10,11 @@ case $1 in
cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
- install -d ${clst_chroot_path}/${clst_root_path}/etc
- install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
+ install -d ${clst_chroot_path}${clst_root_path}/etc
+ install -d ${clst_chroot_path}${clst_root_path}/etc/portage
# Setup make.conf and make.profile link in "ROOT in chroot":
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf ${clst_root_path}/etc/portage
# Enter chroot, execute our build script
exec_in_chroot \
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
@ 2014-02-07 23:24 ` Brian Dolbec
0 siblings, 0 replies; 44+ messages in thread
From: Brian Dolbec @ 2014-02-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: fcbcea415123390eb5956f146cd20c4552a4bf4a
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 15:22:41 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Jan 11 05:17:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=fcbcea41
chmod +x targets/stage1/build.py
---
targets/stage1/build.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/stage1/build.py b/targets/stage1/build.py
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2014-09-02 5:54 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
@ 2014-09-11 3:26 ` Brian Dolbec
0 siblings, 0 replies; 44+ messages in thread
From: Brian Dolbec @ 2014-09-11 3:26 UTC (permalink / raw
To: gentoo-commits
commit: d6417ace0b61697d0f94e9812af4621107b01cd7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 26 01:31:00 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep 2 05:43:13 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d6417ace
stage1-controller.sh: Remove some old poor cleaning code
This code had portage bin path hard coded. That path needed to be
changed for a new portage ebuild and install system.
After testing the origianl code and comparing it with some updated code
supplied by Douglas Freed. It turned out both code chunks resulted in
nothing being cleaned.
Tested-by: Rick Zero_Chaos Farina <zerochaos <AT> gentoo.org>
---
targets/stage1/stage1-controller.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 8dbd16b..d029545 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -31,11 +31,6 @@ case $1 in
rm -rf usr/share/{man,doc,info}/*
# Zap all .pyc and .pyo files
find . -iname "*.py[co]" -exec rm -f {} \;
- # Cleanup all .a files except libgcc.a, *_nonshared.a and
- # /usr/lib/portage/bin/*.a
- find . -type f -iname "*.a" | grep -v 'libgcc.a' | \
- grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
- grep -v 'libgcc_eh.a' | xargs rm -f
;;
*)
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
@ 2015-05-24 0:08 ` Brian Dolbec
0 siblings, 0 replies; 44+ messages in thread
From: Brian Dolbec @ 2015-05-24 0:08 UTC (permalink / raw
To: gentoo-commits
commit: 6b5ca8e6aa5469660c1657a104655c9026725c15
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 20:23:01 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 03:05:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6b5ca8e6
targets/stage1/stage1-chroot.sh: don't quote ${clst_HOSTUSEEXPAND}
Remove the quotes on ${clst_HOSTUSEEXPAND} so the for loops skip
any iterations when clst_HOSTUSEEXPAND is unset. Otherwise a
spurious line is introduced in the make.conf file which causes
a syntax error.
To illustrate the problem, run the follow two lines of bash:
unset A ; for i in $A; do echo x${i}x ; done #line 1
unset A ; for i in "$A"; do echo x${i}x ; done #line 2
Line 1 leads to no output, while line 2 leads to "xx".
We also fix a typo in the sed line.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
targets/stage1/stage1-chroot.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f79f360..63aa563 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -57,7 +57,7 @@ sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
if [ -e /etc/portage/make.conf ]; then
echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
>> /etc/portage/make.conf
- for useexpand in "${clst_HOSTUSEEXPAND}"; do
+ for useexpand in ${clst_HOSTUSEEXPAND}; do
x="clst_${useexpand}"
echo "${useexpand}=\"${!x}\"" \
>> /etc/portage/make.conf
@@ -66,8 +66,8 @@ fi
run_merge "--oneshot ${clst_buildpkgs}"
sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
/etc/portage/make.conf
-for useexpand in "${clst_HOSTUSEEXPAND}"; do
+for useexpand in ${clst_HOSTUSEEXPAND}; do
x="clst_${useexpand}"
- sed -i "${useexpand}=\"${!x}\"" \
+ sed -i "/${useexpand}=\"${!x}\"/d" \
/etc/portage/make.conf
done
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2015-08-30 3:14 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-08-30 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 7fd5b929311713e393de00767c0a7a6cd5595f6d
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 03:10:53 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 03:14:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7fd5b929
We need to ensure bindist is set in USE when updating the seed (if we have OPTIONS="bindist").
Fix some typos / broken syntax.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
targets/stage1/stage1-chroot.sh | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 4afc8fe..0c7e85b 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -26,12 +26,19 @@ clst_root_path=/ setup_pkgmgr "build"
# Update stage3
if [ -n "${clst_update_seed}" ]; then
if [ "${clst_update_seed}" == "yes" ]; then
+ # We might need BOOTSTRAP_USE to avoid blocks related to bindist use flag
+ [ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BOOTSTRAP_USE}\"" >> ${clst_make_conf}
+
echo "Updating seed stage..."
if [ -n "${clst_update_seed_command}" ]; then
clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
else
clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
fi
+
+ # Clean-up USE again
+ sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf}
+
elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"
exit 1
@@ -47,22 +54,19 @@ make_destpath /tmp/stage1root
## START BUILD
# First, we drop in a known-good baselayout
-[ -e ${clst_make_conf} ] && \
- echo 'USE="${USE} -build"' >> ${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo 'USE="${USE} -build"' >> ${clst_make_conf}
run_merge "--oneshot --nodeps sys-apps/baselayout"
-
-sed -i '/USE="${USE} -build"/d' ${clst_make_conf}
+sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
# Now, we install our packages
-if [ -e ${clst_make_conf} ] && \
- echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
+[ -e ${clst_make_conf} ] &&
+echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf}
+for useexpand in ${clst_HOSTUSEEXPAND}; do
+ x="clst_${useexpand}"
+ echo "${useexpand}=\"${!x}\"" \
>> ${clst_make_conf}
- for useexpand in ${clst_HOSTUSEEXPAND}; do
- x="clst_${useexpand}"
- echo "${useexpand}=\"${!x}\"" \
- >> ${clst_make_conf}
- done
-fi
+done
+
run_merge "--oneshot ${clst_buildpkgs}"
sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
${clst_make_conf}
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2015-08-30 3:51 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-08-30 3:51 UTC (permalink / raw
To: gentoo-commits
commit: d0e1598f3af1adb5d3a8959740cef4dce66f75da
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 03:51:02 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 03:51:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0e1598f
Switch back to the if block for setting make.conf.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
targets/stage1/stage1-chroot.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 0c7e85b..01ef8d1 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -59,13 +59,14 @@ run_merge "--oneshot --nodeps sys-apps/baselayout"
sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
# Now, we install our packages
-[ -e ${clst_make_conf} ] &&
-echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf}
-for useexpand in ${clst_HOSTUSEEXPAND}; do
- x="clst_${useexpand}"
- echo "${useexpand}=\"${!x}\"" \
- >> ${clst_make_conf}
-done
+if [ -e ${clst_make_conf} ]; then
+ echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf}
+ for useexpand in ${clst_HOSTUSEEXPAND}; do
+ x="clst_${useexpand}"
+ echo "${useexpand}=\"${!x}\"" \
+ >> ${clst_make_conf}
+ done
+fi
run_merge "--oneshot ${clst_buildpkgs}"
sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2015-08-30 4:32 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-08-30 4:32 UTC (permalink / raw
To: gentoo-commits
commit: ceafc1abfdffb34e1dc0f5e1d9ec08c02f189786
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 04:31:34 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 04:31:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ceafc1ab
Don't use BOOTSTRAP_USE to update the seed but just build and bindist (if set).
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
targets/stage1/stage1-chroot.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 01ef8d1..ebd6551 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -7,7 +7,8 @@ export clst_buildpkgs="$(/tmp/build.py)"
# Setup our environment
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-[ -n "${clst_BINDIST}" ] && BOOTSTRAP_USE="${BOOTSTRAP_USE} bindist"
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
@@ -26,8 +27,8 @@ clst_root_path=/ setup_pkgmgr "build"
# Update stage3
if [ -n "${clst_update_seed}" ]; then
if [ "${clst_update_seed}" == "yes" ]; then
- # We might need BOOTSTRAP_USE to avoid blocks related to bindist use flag
- [ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BOOTSTRAP_USE}\"" >> ${clst_make_conf}
+ # Set USE flags build and bindist if clst_BINDIST is set
+ [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}" >> ${clst_make_conf}
echo "Updating seed stage..."
if [ -n "${clst_update_seed_command}" ]; then
@@ -37,7 +38,7 @@ if [ -n "${clst_update_seed}" ]; then
fi
# Clean-up USE again
- sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf}
+ sed -i "/USE=\"${USE} build ${BINDIST}\"/d" ${clst_make_conf}
elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2015-08-30 19:28 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 44+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-08-30 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 656e4c20b3520ed243817425b92c5175391ffca7
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 19:28:01 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 19:28:01 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=656e4c20
Add missing '"' and replace '' in strings so we get interpolation.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
targets/stage1/stage1-chroot.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index ebd6551..2853f04 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -28,7 +28,7 @@ clst_root_path=/ setup_pkgmgr "build"
if [ -n "${clst_update_seed}" ]; then
if [ "${clst_update_seed}" == "yes" ]; then
# Set USE flags build and bindist if clst_BINDIST is set
- [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}" >> ${clst_make_conf}
+ [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}\"" >> ${clst_make_conf}
echo "Updating seed stage..."
if [ -n "${clst_update_seed_command}" ]; then
@@ -55,7 +55,7 @@ make_destpath /tmp/stage1root
## START BUILD
# First, we drop in a known-good baselayout
-[ -e ${clst_make_conf} ] && echo 'USE="${USE} -build"' >> ${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
run_merge "--oneshot --nodeps sys-apps/baselayout"
sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2015-09-03 1:51 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2015-09-03 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 306d797509244bf3508def0aa6c1bbcdfb6e1257
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 01:50:33 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 01:50:33 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=306d7975
remove stray bindist use flag setting from stage1 chroot, this is handled by setup_pkgmgr early enough
targets/stage1/stage1-chroot.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 028089e..91ab1fa 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -7,8 +7,6 @@ export clst_buildpkgs="$(/tmp/build.py)"
# Setup our environment
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2015-09-08 2:58 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2015-09-08 2:58 UTC (permalink / raw
To: gentoo-commits
commit: b25875dc87683b6790d7ad1b5e067f1f9bbd1ae5
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 02:59:00 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 02:59:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b25875dc
fix 6d795daf6d86779b17206f8a558bfcac44822a6b as caught by dol-sen
targets/stage1/stage1-chroot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f77bd9f..fbda84b 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -7,7 +7,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
# Setup our environment
[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
+BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE) ${BINDIST}"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2016-09-15 0:57 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2016-09-15 0:57 UTC (permalink / raw
To: gentoo-commits
commit: d6ee458ad47915230291708eaaaf38c059d4fd1c
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 18:04:40 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 18:04:40 2016 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d6ee458a
operate in /tmp/stage1root as appropriate during stage1
targets/stage1/stage1-controller.sh | 4 ++--
targets/stage1/stage1-preclean-chroot.sh | 16 +++++++++-------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3ad0ed5..6af1385 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -28,9 +28,9 @@ case "$1" in
clean)
# Clean out man, info and doc files
- rm -rf usr/share/{man,doc,info}/*
+ rm -rf /tmp/stage1root/usr/share/{man,doc,info}/*
# Zap all .pyc and .pyo files
- find . -iname "*.py[co]" -exec rm -f {} \;
+ find /tmp/stage1root/ -iname "*.py[co]" -exec rm -f {} \;
;;
*)
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index a80fc92..0ba4c00 100755
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,25 +1,27 @@
#!/bin/bash
export RUN_DEFAULT_FUNCS="no"
+export ROOT=/tmp/stage1root
source /tmp/chroot-functions.sh
update_env_settings
show_debug
-# Now, some finishing touches to initialize gcc-config....
-unset ROOT
-
+# Right now these will parse the unpacked stage3 but change things
+# inside of /tmp/stage1root due to ROOT env variable
setup_gcc
setup_binutils
# Stage1 is not going to have anything in zoneinfo, so save our Factory timezone
-if [ -d /usr/share/zoneinfo ]
+if [ -d "${ROOT}/usr/share/zoneinfo" ]
then
- rm -f /etc/localtime
- cp /usr/share/zoneinfo/Factory /etc/localtime
+ rm -f "${ROOT}/etc/localtime"
+ cp "${ROOT}/usr/share/zoneinfo/Factory" "${ROOT}/etc/localtime"
else
- echo UTC > /etc/TZ
+ echo UTC > "${ROOT}/etc/TZ"
fi
+# unset ROOT for safety (even though cleanup_stages doesn't use it)
+unset ROOT
cleanup_stages
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2016-09-15 0:57 Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2016-09-15 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 9b8a61e03e3062335a369cd34146cd26eb675c1b
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 16:00:18 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 16:00:18 2016 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9b8a61e0
quotes to make shellcheck happy
targets/stage1/stage1-controller.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 0f44e97..3ad0ed5 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,29 +1,29 @@
#!/bin/bash
-source ${clst_shdir}/support/functions.sh
+source "${clst_shdir}/support/functions.sh"
-case $1 in
+case "$1" in
enter)
;;
run)
- cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
+ cp "${clst_shdir}/stage1/build.py" "${clst_chroot_path}/tmp"
# Setup "ROOT in chroot" dir
- install -d ${clst_chroot_path}/${clst_root_path}/etc
- install -d ${clst_chroot_path}/${clst_root_path}${clst_port_conf}
+ install -d "${clst_chroot_path}/${clst_root_path}/etc"
+ install -d "${clst_chroot_path}/${clst_root_path}${clst_port_conf}"
# Setup make.conf and make.profile link in "ROOT in chroot":
- copy_to_chroot ${clst_chroot_path}${clst_make_conf} ${clst_root_path}${clst_port_conf}
+ copy_to_chroot "${clst_chroot_path}${clst_make_conf}" "${clst_root_path}${clst_port_conf}"
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
+ "${clst_shdir}/${clst_target}/${clst_target}-chroot.sh" \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot "${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh" || exit 1
;;
clean)
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2016-09-14 22:12 [gentoo-commits] proj/catalyst:fix_stage1 " Richard Farina
@ 2016-09-15 0:57 ` Richard Farina
0 siblings, 0 replies; 44+ messages in thread
From: Richard Farina @ 2016-09-15 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 36f490a4476148f800fb7c16a6b45d46cc6ee4f7
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 22:11:47 2016 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 22:11:47 2016 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=36f490a4
stage1-controller.sh was *not running in chroot*, move it's functions into the pre-clean which does safely run in chroot
targets/stage1/stage1-controller.sh | 5 +----
targets/stage1/stage1-preclean-chroot.sh | 5 +++++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 6af1385..ac813de 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -27,10 +27,7 @@ case "$1" in
;;
clean)
- # Clean out man, info and doc files
- rm -rf /tmp/stage1root/usr/share/{man,doc,info}/*
- # Zap all .pyc and .pyo files
- find /tmp/stage1root/ -iname "*.py[co]" -exec rm -f {} \;
+ exit 0
;;
*)
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index 0ba4c00..1b623f1 100755
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -22,6 +22,11 @@ else
echo UTC > "${ROOT}/etc/TZ"
fi
+# Clean out man, info and doc files
+rm -rf "${ROOT}"/usr/share/{man,doc,info}/*
+# Zap all .pyc and .pyo files
+find "${ROOT}"/ -iname "*.py[co]" -exec rm -f {} \;
+
# unset ROOT for safety (even though cleanup_stages doesn't use it)
unset ROOT
cleanup_stages
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2017-11-29 17:20 Brian Dolbec
0 siblings, 0 replies; 44+ messages in thread
From: Brian Dolbec @ 2017-11-29 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 2d574bfa8e5f385f495b3b3e7f4df882bb6751c4
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 00:39:12 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d574bfa
Improve the order of USE definition, make sure to remove USE after building portage, add the contents of BOOTSTRAP_USE to USE and clean USE and CATALYST_USE after building pacakges.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
targets/stage1/stage1-chroot.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f2438660..1b0aa08b 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -25,7 +25,7 @@ clst_root_path=/ setup_pkgmgr "build"
# We need to ensure the base stage3 has USE="bindist"
# if BINDIST is set to avoid issues with openssl / openssh
-[ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BINDIST}\"" >> ${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}
# Update stage3
if [ -n "${clst_update_seed}" ]; then
@@ -48,7 +48,7 @@ else
fi
# Clear USE
-[ -e ${clst_make_conf} ] && sed -i -e "USE=\"s/${BINDIST}//" ${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf}
make_destpath /tmp/stage1root
@@ -61,7 +61,8 @@ sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
# Now, we install our packages
if [ -e ${clst_make_conf} ]; then
echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf}
- echo "USE=\"\${CATALYST_USE} ${USE} \${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf}
+ echo "USE=\"\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf}
+
for useexpand in ${clst_HOSTUSEEXPAND}; do
x="clst_${useexpand}"
echo "${useexpand}=\"${!x}\"" \
@@ -77,3 +78,7 @@ for useexpand in ${clst_HOSTUSEEXPAND}; do
sed -i "/${useexpand}=\"${!x}\"/d" \
${clst_make_conf}
done
+
+# Clear USE
+[ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE}//" ${clst_make_conf}
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-04-08 0:25 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-04-08 0:25 UTC (permalink / raw
To: gentoo-commits
commit: 3e49cf88bc4e8fdf96e29af901fabacd6e973fe7
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 7 22:53:38 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 7 22:57:58 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3e49cf88
targets: Use ${clst_root_path} instead of hardcoding it
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 0caf49ee..d409de39 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -49,7 +49,7 @@ fi
# Clear USE
[ -e ${clst_make_conf} ] && ${clst_sed} -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf}
-make_destpath /tmp/stage1root
+make_destpath "${clst_root_path}"
## START BUILD
# First, we drop in a known-good baselayout
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-04-08 0:25 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-04-08 0:25 UTC (permalink / raw
To: gentoo-commits
commit: f0e772bd3905d02d691d0e41b3a8e3bd3c10e2fe
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:28:11 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 7 23:23:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f0e772bd
targets: Set LANG=C.UTF8
Stable glibc now always provides a UTF-8 capable locale, which many
packages require. Set this as the default LANG.
Running locale-gen in stage1 should also solve bug #536938.
Bug: https://bugs.gentoo.org/536938
Bug: https://bugs.gentoo.org/710762
Bug: https://bugs.gentoo.org/714906
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index d409de39..60e32c60 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -57,6 +57,11 @@ make_destpath "${clst_root_path}"
run_merge "--oneshot --nodeps sys-apps/baselayout"
${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
+for etc in /etc "${clst_root_path}"/etc; do
+ echo "LANG=C.UTF8" > ${etc}/env.d/02locale
+done
+update_env_settings
+
# Now, we install our packages
if [ -e ${clst_make_conf} ]; then
echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf}
@@ -71,6 +76,13 @@ fi
run_merge "--oneshot ${clst_buildpkgs}"
+# TODO: Drop this when locale-gen in stable glibc supports ROOT.
+#
+# locale-gen does not support the ROOT variable, and as such glibc simply does
+# not run locale-gen when ROOT is set. Since we've set LANG, we need to run
+# locale-gen explicitly.
+locale-gen --destdir "${clst_root_path}"/ || die "locale-gen failed"
+
# Why are we removing these? Don't we need them for final make.conf?
for useexpand in ${clst_HOSTUSEEXPAND}; do
x="clst_${useexpand}"
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-04-10 21:04 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-04-10 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 220df6a5d255b308e7d912ba1a358ac891e2becb
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 17:10:40 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 17:45:28 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=220df6a5
catalyst: Drop ancient portage support
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/build.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index 4373126b..069d8d32 100755
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
@@ -3,19 +3,14 @@
import os
import sys
import portage
+from portage.util import grabfile_package, stack_lists
# this loads files from the profiles ...
# wrap it here to take care of the different
# ways portage handles stacked profiles
# last case is for portage-2.1_pre*
def scan_profile(path):
- if "grab_stacked" in dir(portage):
- return portage.grab_stacked(path, portage.settings.profiles, portage.grabfile, incremental_lines=1)
- else:
- if "grab_multiple" in dir(portage):
- return portage.stack_lists(portage.grab_multiple(path, portage.settings.profiles, portage.grabfile), incremental=1)
- else:
- return portage.stack_lists([portage.grabfile_package(os.path.join(x, path)) for x in portage.settings.profiles], incremental=1)
+ return stack_lists([grabfile_package(os.path.join(x, path)) for x in portage.settings.profiles], incremental=1)
# loaded the stacked packages / packages.build files
pkgs = scan_profile("packages")
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-04-10 21:04 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-04-10 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 0b5a340f40fb6d273fdb6fa66f17b0af13df8fc2
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 17:45:52 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 21:03:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0b5a340f
catalyst: Fix import for portage.dep.dep_getkey
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/build.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index b95b4182..b01eb9cd 100755
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
@@ -3,6 +3,7 @@
import os
import sys
import portage
+from portage.dep import dep_getkey
from portage.util import grabfile_package, stack_lists
# this loads files from the profiles ...
@@ -24,7 +25,7 @@ buildpkgs = scan_profile("packages.build")
# and version numbers)
for pkg in pkgs:
try:
- bidx = buildpkgs.index(portage.dep_getkey(pkg))
+ bidx = buildpkgs.index(dep_getkey(pkg))
buildpkgs[bidx] = pkg
if buildpkgs[bidx][0:1] == "*":
buildpkgs[bidx] = buildpkgs[bidx][1:]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-05-16 6:43 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-05-16 6:43 UTC (permalink / raw
To: gentoo-commits
commit: bfb2731f7200e9a1f19b65d928586c209b1bf4a2
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 03:36:19 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 15 03:39:56 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bfb2731f
targets: Test for locale-gen
locale-gen is only provided by glibc and not by others.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index ac9d68ea..b48fda65 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -82,7 +82,9 @@ run_merge "--oneshot ${clst_buildpkgs}"
# locale-gen does not support the ROOT variable, and as such glibc simply does
# not run locale-gen when ROOT is set. Since we've set LANG, we need to run
# locale-gen explicitly.
-locale-gen --destdir "${clst_root_path}"/ || die "locale-gen failed"
+if [ -x "$(command -v locale-gen)" ]; then
+ locale-gen --destdir "${clst_root_path}"/ || die "locale-gen failed"
+fi
# Why are we removing these? Don't we need them for final make.conf?
for useexpand in ${clst_HOSTUSEEXPAND}; do
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
@ 2020-12-16 16:00 ` Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-16 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 0a0efebb7834f00cea0bb35d708a56ad635627a8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:51:53 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 03:51:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0a0efebb
targets: Make ${buildpkgs} an array
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index dac52dfc..7e8d5b4e 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -3,7 +3,7 @@
source /tmp/chroot-functions.sh
# We do this first, so we know our package list for --debug
-buildpkgs="$(/tmp/build.py)"
+buildpkgs=($(/tmp/build.py))
# Setup our environment
[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
@@ -12,8 +12,7 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${FEATURES} nodoc noman noinfo"
## Sanity check profile
-if [ -z "${buildpkgs}" ]
-then
+if [[ ${#buildpkgs[@]} -eq 0 ]]; then
echo "Your profile seems to be broken."
echo "Could not build a list of build packages."
echo "Double check your ${clst_port_conf}/make.profile link and the 'packages' files."
@@ -72,7 +71,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge "--oneshot ${buildpkgs}"
+run_merge "--oneshot ${buildpkgs[@]}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-12-16 16:00 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-16 16:00 UTC (permalink / raw
To: gentoo-commits
commit: d1ce4b31637d143eda05472d2216db40d001169c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:42:52 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 03:42:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d1ce4b31
targets: Rename clst_buildpkgs -> buildpkgs
And remove the unnecessary export.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 2a8dc59b..dac52dfc 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -3,7 +3,7 @@
source /tmp/chroot-functions.sh
# We do this first, so we know our package list for --debug
-export clst_buildpkgs="$(/tmp/build.py)"
+buildpkgs="$(/tmp/build.py)"
# Setup our environment
[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
@@ -12,7 +12,7 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${FEATURES} nodoc noman noinfo"
## Sanity check profile
-if [ -z "${clst_buildpkgs}" ]
+if [ -z "${buildpkgs}" ]
then
echo "Your profile seems to be broken."
echo "Could not build a list of build packages."
@@ -72,7 +72,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge "--oneshot ${clst_buildpkgs}"
+run_merge "--oneshot ${buildpkgs}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
@ 2020-12-16 16:00 ` Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-16 16:00 UTC (permalink / raw
To: gentoo-commits
commit: c27fd976e4dc4fd1ce269a002a9d00c979e53287
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 03:00:25 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 03:01:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c27fd976
catalyst: Remove dead comment
Fixes: 220df6a5d255 ("catalyst: Drop ancient portage support")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/build.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index fec1162c..85675511 100755
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
@@ -9,7 +9,6 @@ from portage.util import grabfile_package, stack_lists
# this loads files from the profiles ...
# wrap it here to take care of the different
# ways portage handles stacked profiles
-# last case is for portage-2.1_pre*
def scan_profile(path):
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
@ 2020-12-16 16:00 ` Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-16 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 37cabf5c536fe8eef16532f18790c1da566aae15
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:29:56 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 03:01:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=37cabf5c
targets: Use interpreter with portage module for build.py
Closes: https://bugs.gentoo.org/759685
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 83cd084d..6b9bfb3e 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -2,8 +2,13 @@
source /tmp/chroot-functions.sh
-# We do this first, so we know our package list for --debug
-buildpkgs=($(/tmp/build.py))
+for module_path in /usr/lib/*/site-packages/portage/__init__.py; do
+ # Find the python interpreter
+ interpreter=$(echo $module_path | cut -d/ -f4)
+
+ buildpkgs=($($interpreter /tmp/build.py 2>/dev/null))
+ [[ $? == 0 ]] && break
+done
## Sanity check profile
if [[ ${#buildpkgs[@]} -eq 0 ]]; then
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
@ 2020-12-16 16:00 ` Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-16 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 5f62563f52a81b578703f140361a5fcec96e75e5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:52:40 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 03:52:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5f62563f
targets: Move ${buildpkgs} error checking closer
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 7e8d5b4e..83cd084d 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -5,12 +5,6 @@ source /tmp/chroot-functions.sh
# We do this first, so we know our package list for --debug
buildpkgs=($(/tmp/build.py))
-# Setup our environment
-[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
-BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-
-FEATURES="${FEATURES} nodoc noman noinfo"
-
## Sanity check profile
if [[ ${#buildpkgs[@]} -eq 0 ]]; then
echo "Your profile seems to be broken."
@@ -19,6 +13,12 @@ if [[ ${#buildpkgs[@]} -eq 0 ]]; then
exit 1
fi
+# Setup our environment
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
+
+FEATURES="${FEATURES} nodoc noman noinfo"
+
# We need to ensure the base stage3 has USE="bindist"
# if BINDIST is set to avoid issues with openssl / openssh
[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
2020-12-27 23:15 [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ Matt Turner
@ 2020-12-19 19:56 ` Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
1 sibling, 0 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-19 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 421c65f9cba4745ee75b21461141eead9078b714
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 02:52:57 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 19:29:09 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421c65f9
targets: Emerge stage1 with --implicit-system-deps=n
Since we're emerging into a separate ROOT, we can use
--implicit-system-deps=n to gain some additional parallelism.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index b733fc57..50afef4a 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -78,7 +78,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge --oneshot "${buildpkgs[@]}"
+run_merge --implicit-system-deps=n --oneshot "${buildpkgs[@]}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-12-27 23:15 Matt Turner
2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
0 siblings, 2 replies; 44+ messages in thread
From: Matt Turner @ 2020-12-27 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 421c65f9cba4745ee75b21461141eead9078b714
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 02:52:57 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 19:29:09 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421c65f9
targets: Emerge stage1 with --implicit-system-deps=n
Since we're emerging into a separate ROOT, we can use
--implicit-system-deps=n to gain some additional parallelism.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index b733fc57..50afef4a 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -78,7 +78,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge --oneshot "${buildpkgs[@]}"
+run_merge --implicit-system-deps=n --oneshot "${buildpkgs[@]}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage1/
2020-12-27 23:15 [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ Matt Turner
2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
@ 2021-01-18 19:53 ` Matt Turner
1 sibling, 0 replies; 44+ messages in thread
From: Matt Turner @ 2021-01-18 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 421c65f9cba4745ee75b21461141eead9078b714
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 02:52:57 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 19:29:09 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421c65f9
targets: Emerge stage1 with --implicit-system-deps=n
Since we're emerging into a separate ROOT, we can use
--implicit-system-deps=n to gain some additional parallelism.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index b733fc57..50afef4a 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -78,7 +78,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge --oneshot "${buildpkgs[@]}"
+run_merge --implicit-system-deps=n --oneshot "${buildpkgs[@]}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
@ 2021-01-23 16:22 ` Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2021-01-23 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 9d6a5c43a4a051be88a0af76fdd648f6d0f232b1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 18:23:34 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 16:19:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9d6a5c43
targets: Update BINPKG_COMPRESS to new zstd default
In portage commit 230595cf600c (Default BINPKG_COMPRESSION to zstd (bug
715108)) the default BINPKG_COMPRESSION setting was changed to zstd. But
to retain compatibility with binpkg consumers, the default is unchanged
for existing installations, so we need to update our BINPKG_COMPRESSION.
Bug: https://bugs.gentoo.org/715108
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 50afef4a..9b34ced8 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -24,6 +24,9 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${FEATURES} nodoc noman noinfo"
+sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \
+ /usr/share/portage/config/make.globals
+
# We need to ensure the base stage3 has USE="bindist"
# if BINDIST is set to avoid issues with openssl / openssh
[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
@ 2021-01-23 16:22 ` Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2021-01-23 16:22 UTC (permalink / raw
To: gentoo-commits
commit: b3f782a0725da0f4858cba3e887f973e324755c7
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 23:29:05 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 16:19:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b3f782a0
targets: Update the @changed-subslot set by default
In portage commit 1789fdf2ee81 (Add @changed-subslot package set) I
added this: the set of upgradable packages for which the highest visible
version has a different subslot than the currently installed version.
Updating the entire stage is expensive and unnecessary (since we're
going to build the latest packages in stage1 and then rebuild everything
in stage3).
What we definitely do need to update in the original stage3 however, is
any package that would trigger a subslot rebuild.
For example: gcc links with libmpfr.so from dev-libs/mpfr. mpfr's SONAME
changes from libmpfr.so.4 (SLOT="0/4") to libmpfr.so.6 (SLOT="0/6"). If
the seed stage's dev-libs/mpfr is not updated before emerging gcc, gcc
will link with libmpfr.so.4, but the latest version of dev-libs/mpfr
will be built and libmpfr.so.6 included into the stage1. Since the old
libmpfr.so.4 is not included in the stage1, gcc will not work, breaking
subsequent stage builds.
Our current options to update the seed are too large a hammer (e.g.,
"--update --deep --newuse @world" or "--update --deep --newuse
--complete-graph --rebuild-if-new-ver gcc") and spend too much time
updating seed stages for no gain beyond updating only packages for whom
the subslot has changed.
Bug: https://bugs.gentoo.org/739004
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 9b34ced8..08b9da46 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -37,6 +37,8 @@ if [ -n "${clst_update_seed}" ]; then
echo "Updating seed stage..."
if [ -n "${clst_update_seed_command}" ]; then
ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}"
+ elif grep -q '^\[changed-subslot\]' /usr/share/portage/config/sets/portage.conf; then
+ ROOT=/ run_merge --ignore-built-slot-operator-deps y @changed-subslot
else
ROOT=/ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc
fi
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2022-10-13 16:17 Matt Turner
0 siblings, 0 replies; 44+ messages in thread
From: Matt Turner @ 2022-10-13 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 2aceab45a9352f126ce5b7f8b04687fe1c28409d
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 16:30:25 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:17:10 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2aceab45
targets: build initial baselayout with USE=build
current flow is the following:
update seed
install baselayout with USE=-build (for reasons unknown)
install @system with USE=build
this leads to a problem on usrmerged systems, because
baselayout with USE=-build that's installed initially does not create
usrmerge symlinks at all, so /bin /sbin are missing.
anything that installs files to those locations will be lost.
after installing baselayout initially with USE=-build --nodeps
we install the following
bzip2
gzip
tar
xz-utils
baselayout[build]
so everything installed before line above ^ loses / files completely.
This commit will change initial baselayout to USE=build
Closes: https://github.com/gentoo/catalyst/pull/10
Thanks-to: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 08b9da46..e0587b59 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -61,9 +61,9 @@ mkdir -p "$ROOT"
## START BUILD
# First, we drop in a known-good baselayout
-[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo "USE=\"${USE} build\"" >> ${clst_make_conf}
run_merge --oneshot --nodeps sys-apps/baselayout
-sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
+sed -i "/USE=\"${USE} build\"/d" ${clst_make_conf}
echo "$locales" > /etc/locale.gen
for etc in /etc "$ROOT"/etc; do
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2024-10-10 1:07 Ben Kohler
0 siblings, 0 replies; 44+ messages in thread
From: Ben Kohler @ 2024-10-10 1:07 UTC (permalink / raw
To: gentoo-commits
commit: e574dbd24c74cedd7f59263859a6551b914410a4
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 01:06:11 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 01:06:11 2024 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e574dbd2
targets/stage1/preclean-chroot.sh: use symlink for /etc/localtime
This should be a symlink on modern systems.
Bug: https://bugs.gentoo.org/938309
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
targets/stage1/preclean-chroot.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/preclean-chroot.sh b/targets/stage1/preclean-chroot.sh
index 2dc761e9..193a12f9 100755
--- a/targets/stage1/preclean-chroot.sh
+++ b/targets/stage1/preclean-chroot.sh
@@ -15,7 +15,7 @@ setup_binutils
if [ -d "${ROOT}/usr/share/zoneinfo" ]
then
rm -f "${ROOT}/etc/localtime"
- cp "${ROOT}/usr/share/zoneinfo/Factory" "${ROOT}/etc/localtime"
+ ln -s ../usr/share/zoneinfo/Factory "${ROOT}/etc/localtime"
else
echo UTC > "${ROOT}/etc/TZ"
fi
^ permalink raw reply related [flat|nested] 44+ messages in thread
end of thread, other threads:[~2024-10-10 1:08 UTC | newest]
Thread overview: 44+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-27 23:15 [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ Matt Turner
2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2024-10-10 1:07 [gentoo-commits] proj/catalyst:master " Ben Kohler
2022-10-13 16:17 Matt Turner
2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-28 1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-16 16:00 Matt Turner
2020-05-16 6:43 Matt Turner
2020-04-10 21:04 Matt Turner
2020-04-10 21:04 Matt Turner
2020-04-08 0:25 Matt Turner
2020-04-08 0:25 Matt Turner
2017-11-29 17:20 Brian Dolbec
2016-09-15 0:57 Richard Farina
2016-09-15 0:57 Richard Farina
2016-09-14 22:12 [gentoo-commits] proj/catalyst:fix_stage1 " Richard Farina
2016-09-15 0:57 ` [gentoo-commits] proj/catalyst:master " Richard Farina
2015-09-08 2:58 Richard Farina
2015-09-03 1:51 Richard Farina
2015-08-30 19:28 Jorge Manuel B. S. Vicetto
2015-08-30 4:32 Jorge Manuel B. S. Vicetto
2015-08-30 3:51 Jorge Manuel B. S. Vicetto
2015-08-30 3:14 Jorge Manuel B. S. Vicetto
2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-24 0:08 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-09-02 5:54 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-09-11 3:26 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-02-07 23:24 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-02-07 23:24 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2013-01-31 4:00 Richard Farina
2013-01-25 2:46 Matt Turner
2012-12-07 1:49 Jorge Manuel B. S. Vicetto
2012-11-21 5:20 Matt Turner
2012-10-23 17:18 Richard Farina
2012-10-22 1:20 Richard Farina
2012-09-03 3:09 Jorge Manuel B. S. Vicetto
2012-08-31 1:57 Jorge Manuel B. S. Vicetto
2012-08-29 3:18 Jorge Manuel B. S. Vicetto
2012-08-23 5:55 Jorge Manuel B. S. Vicetto
2012-08-23 5:55 Jorge Manuel B. S. Vicetto
2011-11-19 19:43 Jorge Manuel B. S. Vicetto
2011-11-16 4:05 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox