1 |
commit: 8c938576aea142b2c4a26ca0471e541c388aead5 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 1 06:50:24 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 3 22:04:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8c938576 |
7 |
|
8 |
targets: Remove unused extract_kernel() |
9 |
|
10 |
Evidently the answer to "Do we need this one?" is... not at least since |
11 |
2006. |
12 |
|
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
targets/stage4/controller.sh | 2 -- |
16 |
targets/support/functions.sh | 32 -------------------------------- |
17 |
2 files changed, 34 deletions(-) |
18 |
|
19 |
diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh |
20 |
index 85db8c1b..7ca3e9bc 100755 |
21 |
--- a/targets/stage4/controller.sh |
22 |
+++ b/targets/stage4/controller.sh |
23 |
@@ -30,8 +30,6 @@ case $1 in |
24 |
delete_from_chroot /tmp/linuxrc |
25 |
|
26 |
extract_modules ${clst_chroot_path} ${clst_kname} |
27 |
- # Do we need this one? |
28 |
-# extract_kernel ${clst_chroot_path}/boot ${clst_kname} |
29 |
;; |
30 |
|
31 |
build_packages) |
32 |
|
33 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
34 |
index ac6710ad..dd9e6b12 100755 |
35 |
--- a/targets/support/functions.sh |
36 |
+++ b/targets/support/functions.sh |
37 |
@@ -184,35 +184,3 @@ extract_modules() { |
38 |
echo "Can't find kernel modules tarball at ${kmodules}. Skipping...." |
39 |
fi |
40 |
} |
41 |
-extract_kernel() { |
42 |
- # $1 = Destination |
43 |
- # $2 = kname |
44 |
- |
45 |
- kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2" |
46 |
- [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" |
47 |
- mkdir -p ${1}/ |
48 |
- tar -I lbzip2 -xf ${kbinary} -C ${1}/ |
49 |
- # change config name from "config-*" to "gentoo", for example |
50 |
- #mv ${1}/config-* ${1}/${2}-config |
51 |
- rm ${1}/config-* |
52 |
- |
53 |
- # change kernel name from "kernel" to "gentoo", for example |
54 |
- if [ -e ${1}/kernel-* ] |
55 |
- then |
56 |
- mv ${1}/kernel-* ${1}/${2} |
57 |
- fi |
58 |
- if [ -e ${1}/vmlinuz-* ] |
59 |
- then |
60 |
- mv ${1}/vmlinuz-* ${1}/${2} |
61 |
- fi |
62 |
- |
63 |
- # change initrd name from "initrd" to "gentoo.igz", for example |
64 |
- if [ -e ${1}/initrd-* ] |
65 |
- then |
66 |
- mv ${1}/initrd-* ${1}/${2}.igz |
67 |
- fi |
68 |
- if [ -e ${1}/initramfs-* ] |
69 |
- then |
70 |
- mv ${1}/initramfs-* ${1}/${2}.igz |
71 |
- fi |
72 |
-} |