[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage4/, targets/support/

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage4/, targets/support/

[Matt Turner]

commit:     8c938576aea142b2c4a26ca0471e541c388aead5
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 06:50:24 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May  3 22:04:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8c938576

targets: Remove unused extract_kernel()

Evidently the answer to "Do we need this one?" is... not at least since
2006.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/stage4/controller.sh |  2 --
 targets/support/functions.sh | 32 --------------------------------
 2 files changed, 34 deletions(-)

diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh
index 85db8c1b..7ca3e9bc 100755
--- a/targets/stage4/controller.sh
+++ b/targets/stage4/controller.sh
@@ -30,8 +30,6 @@ case $1 in
 		delete_from_chroot /tmp/linuxrc
 
 		extract_modules ${clst_chroot_path} ${clst_kname}
-		# Do we need this one?
-#		extract_kernel ${clst_chroot_path}/boot ${clst_kname}
 	;;
 
 	build_packages)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index ac6710ad..dd9e6b12 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -184,35 +184,3 @@ extract_modules() {
 		echo "Can't find kernel modules tarball at ${kmodules}.  Skipping...."
 	fi
 }
-extract_kernel() {
-	# $1 = Destination
-	# $2 = kname
-
-	kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2"
-	[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
-	mkdir -p ${1}/
-	tar -I lbzip2 -xf ${kbinary} -C ${1}/
-	# change config name from "config-*" to "gentoo", for example
-	#mv ${1}/config-* ${1}/${2}-config
-	rm ${1}/config-*
-
-	# change kernel name from "kernel" to "gentoo", for example
-	if [ -e ${1}/kernel-* ]
-	then
-		mv ${1}/kernel-* ${1}/${2}
-	fi
-	if [ -e ${1}/vmlinuz-* ]
-	then
-		mv ${1}/vmlinuz-* ${1}/${2}
-	fi
-
-	# change initrd name from "initrd" to "gentoo.igz", for example
-	if [ -e ${1}/initrd-* ]
-	then
-		mv ${1}/initrd-* ${1}/${2}.igz
-	fi
-	if [ -e ${1}/initramfs-* ]
-	then
-		mv ${1}/initramfs-* ${1}/${2}.igz
-	fi
-}