public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18 19:38 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5b127fba156041694d9678d5c34e572f6cfc2724
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: Mon Jan 18 18:49:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5b127fba

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 1085641e..34d2057e 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -37,6 +37,8 @@ if [ -n "${clst_update_seed}" ]; then
 
 		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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2022-10-13 16:17 Matt Turner
  2022-11-20  0:21 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
  0 siblings, 1 reply; 16+ 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage1/
@ 2021-01-28  1:54 Matt Turner
  2021-01-29 23:50 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
  0 siblings, 1 reply; 16+ messages in thread
From: Matt Turner @ 2021-01-28  1:54 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage1/
@ 2021-01-28  1:54 Matt Turner
  2021-01-29 23:50 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
  0 siblings, 1 reply; 16+ messages in thread
From: Matt Turner @ 2021-01-28  1:54 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage1/
@ 2021-01-18 19:53 Matt Turner
  2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
  0 siblings, 1 reply; 16+ messages in thread
From: Matt Turner @ 2021-01-18 19:53 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage1/
@ 2021-01-18 19:53 Matt Turner
  2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
  0 siblings, 1 reply; 16+ messages in thread
From: Matt Turner @ 2021-01-18 19:53 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18 19:38 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     7ab6b342861c493a45296a41f19ce739d0707aa3
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: Mon Jan 18 19:37:56 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7ab6b342

targets: Update BINPKG_COMPRESS to new zstd default

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 957ab362..76a30941 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
+
 # Update seed stage
 echo "Updating seed stage"
 (


^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18 19:38 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18 19:38 UTC (permalink / raw
  To: gentoo-commits

commit:     82319bbbaa94a3c519765b2744ba45a4b0241a4f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 17:47:20 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 18:49:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=82319bbb

targets: Update seed stage's sys-apps/portage

We'll want to use some new features that have been added specifically
for catalyst.

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..1085641e 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -32,6 +32,9 @@ FEATURES="${FEATURES} nodoc noman noinfo"
 if [ -n "${clst_update_seed}" ]; then
 	if [ "${clst_update_seed}" == "yes" ]; then
 		echo "Updating seed stage..."
+
+		ROOT=/ USE=-rsync-verify run_merge --oneshot --update sys-apps/portage
+
 		if [ -n "${clst_update_seed_command}" ]; then
 			ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}"
 		else


^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18 18:24 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3a5bba37ec9a3942ad16591bf10bd2cc4d50fac3
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: Mon Jan 18 18:23:59 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3a5bba37

targets: Update BINPKG_COMPRESS to new zstd default

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 ec4a3eff..3c79e3ce 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
+
 # Update seed stage
 echo "Updating seed stage"
 (


^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18 18:24 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     87159ab2f5c74709bfbd64db90fe9a71779fafbd
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: Mon Jan 18 18:01:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=87159ab2

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 f5c68e2c..ba6bc387 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -37,6 +37,8 @@ if [ -n "${clst_update_seed}" ]; then
 
 		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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18 18:24 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     fe3d98d5cc836381008026249fc82bc9996f0f8c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 17:47:20 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 17:47:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fe3d98d5

targets: Update seed stage's sys-apps/portage

We'll want to use some new features that have been added specifically
for catalyst.

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..f5c68e2c 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -32,6 +32,9 @@ FEATURES="${FEATURES} nodoc noman noinfo"
 if [ -n "${clst_update_seed}" ]; then
 	if [ "${clst_update_seed}" == "yes" ]; then
 		echo "Updating seed stage..."
+
+		ROOT=/ USE=-rsync-verify run_merge --update sys-apps/portage
+
 		if [ -n "${clst_update_seed_command}" ]; then
 			ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}"
 		else


^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2021-01-18  3:38 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2021-01-18  3:38 UTC (permalink / raw
  To: gentoo-commits

commit:     70386eefc69376babaeb965395ec43e6f6996399
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: Mon Jan 18 03:27:41 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=70386eef

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, 1 insertion(+), 1 deletion(-)

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 50afef4a..f5002d75 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -35,7 +35,7 @@ if [ -n "${clst_update_seed}" ]; then
 		if [ -n "${clst_update_seed_command}" ]; then
 			ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}"
 		else
-			ROOT=/ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc
+			ROOT=/ run_merge --buildpkg=n --ignore-built-slot-operator-deps y @changed-subslot
 		fi
 	elif [ "${clst_update_seed}" != "no" ]; then
 		echo "Invalid setting for update_seed: ${clst_update_seed}"


^ permalink raw reply related	[flat|nested] 16+ 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
  0 siblings, 1 reply; 16+ 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2020-12-19 19:56 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2020-12-19 19:56 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
@ 2020-12-19 19:56 Matt Turner
  0 siblings, 0 replies; 16+ messages in thread
From: Matt Turner @ 2020-12-19 19:56 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] 16+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
@ 2020-12-16 16:00 Matt Turner
  2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
  0 siblings, 1 reply; 16+ 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] 16+ messages in thread
end of thread, other threads:[~2022-11-20  0:21 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-18 19:38 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2022-10-13 16:17 [gentoo-commits] proj/catalyst:master " Matt Turner
2022-11-20  0:21 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-01-28  1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-29 23:50 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-01-28  1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-29 23:50 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " 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
2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2021-01-18 19:38 Matt Turner
2021-01-18 19:38 Matt Turner
2021-01-18 18:24 Matt Turner
2021-01-18 18:24 Matt Turner
2021-01-18 18:24 Matt Turner
2021-01-18  3:38 Matt Turner
2020-12-27 23:15 [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-19 19:56 ` [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-12-19 19:56 Matt Turner
2020-12-19 19:56 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox