From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C663B138350 for ; Sat, 2 May 2020 01:41:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C9FCE099B; Sat, 2 May 2020 01:40:59 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 562AEE099B for ; Sat, 2 May 2020 01:40:59 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id t16so4271235plo.7 for ; Fri, 01 May 2020 18:40:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FZ7506quzxgMcw91X7Cf9M8VVQNKidlK/KuGa92Gyuk=; b=hMCKoSPFfKDxY+UsZ9aB+nEwTpCQ8ZiPOQ+g/+2VKi6c/Peih2JOOukMRhYgtTXyW/ HSwqINv6gVVzYZrrRxgn6jlXrk9FH8ZD6gSm3iG/A6Z8OCxuXppw2feq9BvnuAT7UJaD vhvaeFJKomV3SKeqaFYDIE8O2gbNYqO1ni8O++vZYOXIWU2henPB3JZpVC6fVBsVwhs1 AOK15TZu1DoGbSKH5GwMBLSBBB9W5BXZpZ7YNYKcZgswqKu1w19EqS2v+C9WXhGNV72e Ek41ipQzh2XR5wYnb4VoLvQIVcRQtEiovgyZ4Rda2HlikCRrAgQ3adOUiIcpWE6RJbEU 6qEQ== X-Gm-Message-State: AGi0Pua66jDkq0e1RJjfwxQ6pk3PntcIdtMBZWZaQteRaZwOzIxYNL2m C3nfJoTTk+NNmIWNa82nv6yuJq1f X-Google-Smtp-Source: APiQypLt9mmY3GyCQRYP16AKuKdf1qVqyV8sWu88dM7bVlyhRfuH55VrhmtZ7aOjcW7weuztUZ7UVA== X-Received: by 2002:a17:90a:68c1:: with SMTP id q1mr2913496pjj.35.1588383657965; Fri, 01 May 2020 18:40:57 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id v7sm3260037pfm.146.2020.05.01.18.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2020 18:40:57 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 7/8] targets: Remove unused extract_kernel() Date: Fri, 1 May 2020 18:40:35 -0700 Message-Id: <20200502014036.1039317-7-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502014036.1039317-1-mattst88@gentoo.org> References: <20200502014036.1039317-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 2f4d5f71-0592-4e0f-956d-04c91373294a X-Archives-Hash: 89ad683b0cb459563d3717cc13dcce18 Evidently the answer to "Do we need this one?" is... not at least since 2006. Signed-off-by: Matt Turner --- 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