Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 33/37] targets: Remove kernelpkgs.txt generation
Date: Wed, 21 Oct 2020 00:24:55
Message-Id: 20201021002344.378131-33-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 Evidently this was to be consumed by the Gentoo Linux Installer, which
2 saw its last commit in 2008.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 targets/support/kmerge.sh | 10 ----------
7 targets/support/livecdfs-update.sh | 11 -----------
8 2 files changed, 21 deletions(-)
9
10 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
11 index c4136dec..27584d51 100755
12 --- a/targets/support/kmerge.sh
13 +++ b/targets/support/kmerge.sh
14 @@ -66,16 +66,6 @@ setup_gk_args() {
15 genkernel_compile(){
16 setup_gk_args
17
18 - # Build our list of kernel packages
19 - case ${clst_livecd_type} in
20 - gentoo-release-live*)
21 - if [ -n "${kernel_merge}" ]
22 - then
23 - mkdir -p /usr/livecd
24 - echo "${kernel_merge}" > /usr/livecd/kernelpkgs.txt
25 - fi
26 - ;;
27 - esac
28 # Build with genkernel using the set options
29 # callback is put here to avoid escaping issues
30 if [ -n "${clst_VERBOSE}" ]
31 diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
32 index 47dbb5b3..b7ead552 100755
33 --- a/targets/support/livecdfs-update.sh
34 +++ b/targets/support/livecdfs-update.sh
35 @@ -296,19 +296,8 @@ case ${clst_livecd_type} in
36 ln -sf /usr/livecd/gconf /etc/gconf
37 fi
38
39 - if [ -e /usr/livecd/kernelpkgs.txt ]
40 - then
41 - rm -f /usr/livecd/kernelpkgs.txt
42 - fi
43 -
44 touch /etc/startx
45 ;;
46 - * )
47 - if [ -e /usr/livecd/kernelpkgs.txt ]
48 - then
49 - rm -f /usr/livecd/kernelpkgs.txt
50 - fi
51 - ;;
52 esac
53
54 # We want the first user to be used when auto-starting X
55 --
56 2.26.2