public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 7/8] targets: Remove unused extract_kernel()
Date: Fri,  1 May 2020 18:40:35 -0700	[thread overview]
Message-ID: <20200502014036.1039317-7-mattst88@gentoo.org> (raw)
In-Reply-To: <20200502014036.1039317-1-mattst88@gentoo.org>

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

Signed-off-by: Matt Turner <mattst88@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
-}
-- 
2.26.2



  parent reply	other threads:[~2020-05-02  1:41 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-02  1:40 [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Matt Turner
2020-05-02  1:40 ` [gentoo-catalyst] [PATCH 2/8] targets: Drop most fstypes Matt Turner
2020-05-02 23:00   ` Brian Dolbec
2020-05-02 23:17     ` Matt Turner
2020-05-02  1:40 ` [gentoo-catalyst] [PATCH 3/8] targets: Inline filesystem-functions.sh Matt Turner
2020-05-02 23:03   ` Brian Dolbec
2020-05-02 23:18     ` Matt Turner
2020-05-03  0:25       ` Brian Dolbec
2020-05-02  1:40 ` [gentoo-catalyst] [PATCH 4/8] targets: Remove unused source filesystem-functions.sh Matt Turner
2020-05-02 23:06   ` Brian Dolbec
2020-05-02 23:20     ` Matt Turner
2020-05-02 23:51       ` Brian Dolbec
2020-05-02  1:40 ` [gentoo-catalyst] [PATCH 5/8] targets: Remove run_crossdev() function Matt Turner
2020-05-02 23:06   ` Brian Dolbec
2020-05-02 23:22     ` Matt Turner
2020-05-02 23:45       ` Brian Dolbec
2020-05-02  1:40 ` [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller Matt Turner
2020-05-02 23:12   ` Brian Dolbec
2020-05-02  1:40 ` Matt Turner [this message]
2020-05-02 23:15   ` [gentoo-catalyst] [PATCH 7/8] targets: Remove unused extract_kernel() Brian Dolbec
2020-05-02  1:40 ` [gentoo-catalyst] [PATCH 8/8] catalyst: Replace target_portdir with repo_basedir+repo_name Matt Turner
2020-05-02 23:28   ` Brian Dolbec
2020-05-02 22:56 ` [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200502014036.1039317-7-mattst88@gentoo.org \
    --to=mattst88@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox