* [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/
@ 2017-11-29 17:33 Brian Dolbec
0 siblings, 0 replies; 4+ messages in thread
From: Brian Dolbec @ 2017-11-29 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 4295fce1791067d7589b8f7f12cb5270bb86bcca
Author: Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Wed Sep 20 13:13:59 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 17:31:44 2017 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4295fce1
introduce depclean.sh and add it to livecd-stage2 (first test)
targets/livecd-stage2/livecd-stage2-controller.sh | 11 ++++++-----
targets/support/depclean.sh | 9 +++++++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 10ee98e6..845d6d55 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -186,11 +186,12 @@ case $1 in
${clst_shdir}/support/bootloader-setup.sh $1
;;
- unmerge)
- shift
- export clst_packages="$*"
- exec_in_chroot ${clst_shdir}/support/unmerge.sh
- ;;
+ unmerge)
+ exec_in_chroot ${clst_shdir}/support/depclean.sh
+ shift
+ export clst_packages="$*"
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
+ ;;
target_image_setup)
shift
diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
new file mode 100755
index 00000000..aa66c9fd
--- /dev/null
+++ b/targets/support/depclean.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
+[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
+run_merge --depclean --with-bdeps=n
+
+exit 0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/
@ 2018-06-04 17:38 Richard Farina
0 siblings, 0 replies; 4+ messages in thread
From: Richard Farina @ 2018-06-04 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 1447a3491e8a5e88580692afc2a38e205e6efd2f
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 4 17:38:50 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 4 17:38:50 2018 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1447a349
missed the definition of depclean by a tiny bit
targets/livecd-stage2/livecd-stage2-controller.sh | 2 +-
targets/support/depclean.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 2f0af1f9..5834c837 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -187,7 +187,7 @@ case $1 in
;;
unmerge)
- [ "${clst_depclean}" != "no" ] && exec_in_chroot ${clst_shdir}/support/depclean.sh
+ [ "${clst_livecd_depclean}" != "no" ] && exec_in_chroot ${clst_shdir}/support/depclean.sh
shift
export clst_packages="$*"
exec_in_chroot ${clst_shdir}/support/unmerge.sh
diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index b3640958..56f9a669 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
-if [ "${clst_depclean}" = "keepbdeps" ]; then
+if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then
run_merge --depclean --with-bdeps=y
else
run_merge --depclean --with-bdeps=n
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/
@ 2020-03-31 18:38 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-03-31 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 858665d913d457ded107d01b132bf6af64cb3842
Author: Christos Kotsi <christo.kotsi <AT> gmail <DOT> com>
AuthorDate: Wed Apr 12 08:43:44 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:38:13 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=858665d9
targets: Combine some cp commands
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/livecd-stage2/controller.sh | 12 +++---------
targets/support/livecdfs-update.sh | 8 ++------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh
index 166d1b0f..463c37e7 100755
--- a/targets/livecd-stage2/controller.sh
+++ b/targets/livecd-stage2/controller.sh
@@ -42,11 +42,7 @@ case $1 in
echo "${clst_livecd_type}. You should switch to using"
echo "generic-livecd instead."
fi
- cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \
- ${clst_sharedir}/livecd/files/universal.motd.txt \
- ${clst_sharedir}/livecd/files/minimal.motd.txt \
- ${clst_sharedir}/livecd/files/livecd.motd.txt \
- ${clst_chroot_path}/etc
+ cp -pPR ${clst_sharedir}/livecd/files/*.motd.txt ${clst_chroot_path}/etc
;;
*)
if [ -n "${clst_livecd_motd}" ]
@@ -133,8 +129,7 @@ case $1 in
exit 1
fi
fi
- cp -f ${clst_snapshot_path} $1/snapshots
- cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
+ cp -f ${clst_snapshot_path}{,.DIGESTS} $1/snapshots
;;
gentoo-release-livedvd)
targets="distfiles snapshots stages"
@@ -157,8 +152,7 @@ case $1 in
continue
;;
snapshots)
- cp -f ${clst_snapshot_path} $1/snapshots
- cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
+ cp -f ${clst_snapshot_path}{,.DIGESTS} $1/snapshots
;;
stages)
### TODO: make this copy stages
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 2a0a1f72..0f39eab0 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -264,8 +264,7 @@ case ${clst_livecd_type} in
USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | ${clst_sed} -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
# This is my hack to reduce tmpfs usage
- cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd
- cp -r ${clst_repo_basedir}/${clst_repo_name}/eclass /usr/livecd
+ cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
ln -sf /usr/livecd/gconf /etc/gconf
@@ -292,10 +291,7 @@ case ${clst_livecd_type} in
# Copy our installer icons
if [ -e /usr/share/applications/installer-gtk.desktop ]
then
- cp -f /usr/share/applications/installer-gtk.desktop \
- /home/${username}/Desktop
- cp -f /usr/share/applications/installer-dialog.desktop \
- /home/${username}/Desktop
+ cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop
${clst_sed} -i -e \
's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
/home/${username}/Desktop/installer-dialog.desktop
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/
@ 2022-12-01 17:44 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2022-12-01 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 59b0932124c23e3088353d4992d5686b7d65ef82
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 17:43:35 2022 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 17:43:35 2022 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=59b09321
livecd-stage2: add memtest86+ detection for x86/amd64
When memtest86+ is detected, catalyst should now copy to the livecd and
add it to grub menus.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
targets/livecd-stage2/controller.sh | 4 ++++
targets/support/bootloader-setup.sh | 23 +++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh
index 2b8858c0..9aba8167 100755
--- a/targets/livecd-stage2/controller.sh
+++ b/targets/livecd-stage2/controller.sh
@@ -93,6 +93,10 @@ case $1 in
cp -f ${clst_sharedir}/livecd/files/README.txt $1
fi
+ if [ -e ${clst_chroot_path}/boot/memtest86plus/ ]; then
+ cp -rv ${clst_chroot_path}/boot/memtest86plus/* $1
+ fi
+
case ${clst_livecd_type} in
gentoo-release-livecd)
mkdir -p $1/snapshots
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 08d25b59..deff5609 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -30,6 +30,28 @@ case ${clst_fstype} in
;;
esac
+# Optional memtest setups
+memtest_grub() {
+ if [[ -e $1/memtest64.bios ]]; then
+ echo 'if [ "x$grub_platform" = xpc ]; then'
+ echo ' menuentry "Memtest86+ 64bit BIOS" {'
+ echo ' linux "/memtest64.bios"'
+ echo ' }'
+ echo 'fi'
+ fi
+ if [[ -e $1/memtest.efi64 ]]; then
+ echo 'if [ "x$grub_platform" = xefi ]; then'
+ echo ' menuentry "Memtest86+ 64bit UEFI" {'
+ echo ' chainloader "/memtest.efi64"'
+ echo ' }'
+ echo 'fi'
+ fi
+ if [[ -e $1/memtest32.bios ]]; then
+ echo 'menuentry "Memtest86+ 32bit BIOS" {'
+ echo ' linux "/memtest32.bios"'
+ echo '}'
+ fi
+}
default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} cdroot)
@@ -118,6 +140,7 @@ case ${clst_hostarch} in
fi
echo "" >> ${iacfg}
done
+ memtest_grub $1 >> ${iacfg}
;;
mips)
# NO SOFTLEVEL SUPPORT YET
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-01 17:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-31 18:38 [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-12-01 17:44 Ben Kohler
2018-06-04 17:38 Richard Farina
2017-11-29 17:33 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox