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 7/8] targets: Remove unused extract_kernel()
Date: Sat, 02 May 2020 01:41:01
Message-Id: 20200502014036.1039317-7-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs by Matt Turner
1 Evidently the answer to "Do we need this one?" is... not at least since
2 2006.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 targets/stage4/controller.sh | 2 --
7 targets/support/functions.sh | 32 --------------------------------
8 2 files changed, 34 deletions(-)
9
10 diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh
11 index 85db8c1b..7ca3e9bc 100755
12 --- a/targets/stage4/controller.sh
13 +++ b/targets/stage4/controller.sh
14 @@ -30,8 +30,6 @@ case $1 in
15 delete_from_chroot /tmp/linuxrc
16
17 extract_modules ${clst_chroot_path} ${clst_kname}
18 - # Do we need this one?
19 -# extract_kernel ${clst_chroot_path}/boot ${clst_kname}
20 ;;
21
22 build_packages)
23 diff --git a/targets/support/functions.sh b/targets/support/functions.sh
24 index ac6710ad..dd9e6b12 100755
25 --- a/targets/support/functions.sh
26 +++ b/targets/support/functions.sh
27 @@ -184,35 +184,3 @@ extract_modules() {
28 echo "Can't find kernel modules tarball at ${kmodules}. Skipping...."
29 fi
30 }
31 -extract_kernel() {
32 - # $1 = Destination
33 - # $2 = kname
34 -
35 - kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2"
36 - [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
37 - mkdir -p ${1}/
38 - tar -I lbzip2 -xf ${kbinary} -C ${1}/
39 - # change config name from "config-*" to "gentoo", for example
40 - #mv ${1}/config-* ${1}/${2}-config
41 - rm ${1}/config-*
42 -
43 - # change kernel name from "kernel" to "gentoo", for example
44 - if [ -e ${1}/kernel-* ]
45 - then
46 - mv ${1}/kernel-* ${1}/${2}
47 - fi
48 - if [ -e ${1}/vmlinuz-* ]
49 - then
50 - mv ${1}/vmlinuz-* ${1}/${2}
51 - fi
52 -
53 - # change initrd name from "initrd" to "gentoo.igz", for example
54 - if [ -e ${1}/initrd-* ]
55 - then
56 - mv ${1}/initrd-* ${1}/${2}.igz
57 - fi
58 - if [ -e ${1}/initramfs-* ]
59 - then
60 - mv ${1}/initramfs-* ${1}/${2}.igz
61 - fi
62 -}
63 --
64 2.26.2

Replies