* [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/
@ 2020-05-18 20:02 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-05-18 20:02 UTC (permalink / raw
To: gentoo-commits
commit: bfca870ed50208dd42bb181390c384f96624d12d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:33:31 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 18 20:01:00 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bfca870e
targets: Build with FEATURES=binpkg-multi-instance
Allows stage3+ builds (e.g., netboot, ISOs, stage4) to share binpkg
directories easily.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit b08a8fabf0c8e6c279848286f74a0c223c82947b)
targets/support/chroot-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index c08dbaa0..1dfd3277 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,7 +78,7 @@ get_libdir() {
setup_myfeatures(){
setup_myemergeopts
- export FEATURES="-news clean-logs"
+ export FEATURES="-news binpkg-multi-instance clean-logs"
if [ -n "${clst_CCACHE}" ]
then
export clst_myfeatures="${clst_myfeatures} ccache"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/
@ 2020-05-19 15:49 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-05-19 15:49 UTC (permalink / raw
To: gentoo-commits
commit: c3e84cd89ea58fce3fc757e7f5718a2abb157c2f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 15:40:20 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 19 15:40:20 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c3e84cd8
targets: Build with FEATURES=binpkg-multi-instance
My cherry-pick of the fixed patch failed to handle the difference
between master and the catalyst-3.0-branch in that FEATURES is exported
multiple times.
Fixes: bfca870ed502 (targets: Build with FEATURES=binpkg-multi-instance)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/support/chroot-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 1dfd3277..c2fec616 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -132,7 +132,7 @@ setup_myfeatures(){
export PATH="/usr/lib/icecc/bin:${PATH}"
export PREROOTPATH="/usr/lib/icecc/bin"
fi
- export FEATURES="${clst_myfeatures} -news"
+ export FEATURES="${clst_myfeatures} -news binpkg-multi-instance"
}
setup_myemergeopts(){
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/
@ 2020-05-19 16:20 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-05-19 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 59372814daeb98cda5099a90571c61202b90dce6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:30:10 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 19 16:01:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=59372814
targets: Fix setting FEATURES="clean-logs"
This likely fixes a bug in 8ca52570aa2d ("keep logs outside of chroot")
that would have prevented any logs (except for those from
dev-util/ccache, sys-devel/distcc, and sys-devel/icecream) from being
kept, since "clean-logs" was added to FEATURES in the wrong place.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit 92706a41fadbccf0a39af08ea2a52a2696c68603)
targets/support/chroot-functions.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 1dfd3277..f3727d06 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,7 +78,8 @@ get_libdir() {
setup_myfeatures(){
setup_myemergeopts
- export FEATURES="-news binpkg-multi-instance clean-logs"
+ export clst_myfeatures="-news binpkg-multi-instance clean-logs"
+ export FEATURES="${clst_myfeatures}"
if [ -n "${clst_CCACHE}" ]
then
export clst_myfeatures="${clst_myfeatures} ccache"
@@ -132,7 +133,7 @@ setup_myfeatures(){
export PATH="/usr/lib/icecc/bin:${PATH}"
export PREROOTPATH="/usr/lib/icecc/bin"
fi
- export FEATURES="${clst_myfeatures} -news"
+ export FEATURES="${clst_myfeatures}"
}
setup_myemergeopts(){
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/
@ 2020-10-03 16:05 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2020-10-03 16:05 UTC (permalink / raw
To: gentoo-commits
commit: 711dd4642bfc85871754a360318429be1a992884
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 03:20:58 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 16:04:04 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=711dd464
targets: Remove ancient locale-deleting code
This block of code was added in commit ef648688ce8b ("Forward port the
changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without
any further explanation. Since locale-gen was first committed to our
glibc package in 2006, we think that locales were handled differently
before (and not packed into /usr/${libdir}/locale/locale-archive).
Not only is this code unneeded, it can actually cause the locale-archive
to be deleted if the livecd is using a multilib profile! E.g. on a
multilib amd64 profile, where /usr/lib/locale is a symlink to
/usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches
/usr/lib64/locale/locale-archive.
Because the minimal livecd uses a non-multilib profile, this explains
why it still contained the expected set of locales, while the multilib
admincd did not.
Thanks go to Ben Kohler, Thomas Deutschmann, and Andreas Hüttel for
figuring out this mystery!
Bug: https://bugs.gentoo.org/710762
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit 234286ffae459764e2dfaf55c94e44ec3ad4e9cd)
targets/support/livecdfs-update.sh | 7 -------
1 file changed, 7 deletions(-)
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 023bb0f0..836dcdcd 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -211,13 +211,6 @@ then
fi
fi
-# Clear out locales
-case ${clst_livecd_type} in
- gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd)
- rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}*
- ;;
-esac
-
# Post configuration
case ${clst_livecd_type} in
gentoo-gamecd )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/
@ 2021-02-25 23:14 Ben Kohler
0 siblings, 0 replies; 6+ messages in thread
From: Ben Kohler @ 2021-02-25 23:14 UTC (permalink / raw
To: gentoo-commits
commit: 545fac34b731215ebeb1aa58b65dc22134d732ca
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 22:50:07 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 22:50:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=545fac34
create-iso.sh: don't force FAT16
Newer dosfstools has a problem with FAT16 and certain volume sizes.
Let's just let it autodetect the FAT size.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
targets/support/create-iso.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 6e71cbc4..bcfa20a6 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -229,11 +229,11 @@ case ${clst_hostarch} in
echo "Creating loopback file of size ${iaSize}kB"
dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
count=${iaSize}
- echo "Formatting loopback file with FAT16 FS"
- mkfs.vfat -F 16 -n GENTOOLIVE "${clst_target_path}/gentoo.efimg"
+ echo "Formatting loopback file with FAT FS"
+ mkfs.vfat -n GENTOOLIVE "${clst_target_path}/gentoo.efimg"
mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
- echo "Mounting FAT16 loopback file"
+ echo "Mounting FAT loopback file"
mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
"${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to mount EFI image file"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/
@ 2022-03-15 14:35 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2022-03-15 14:35 UTC (permalink / raw
To: gentoo-commits
commit: ecfd5bc648e102887625afc714c1356a512fa1dd
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 09:16:36 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 10:15:47 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ecfd5bc6
livedc: Use ISO level 3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
targets/support/create-iso.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index bcfa20a6..a7494799 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -122,8 +122,8 @@ run_mkisofs() {
isoroot_checksum
fi
fi
- echo "Running \"mkisofs ${@}\""
- mkisofs "${@}" || die "Cannot make ISO image"
+ echo "Running \"mkisofs -iso-level 3 ${@}\""
+ mkisofs -iso-level 3 "${@}" || die "Cannot make ISO image"
}
# Here we actually create the ISO images for each architecture
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-15 14:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-18 20:02 [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2020-05-19 15:49 Matt Turner
2020-05-19 16:20 Matt Turner
2020-10-03 16:05 Matt Turner
2021-02-25 23:14 Ben Kohler
2022-03-15 14:35 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox