From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1216743-garchives=archives.gentoo.org@lists.gentoo.org>
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 CA603138359
for <garchives@archives.gentoo.org>; Wed, 21 Oct 2020 17:58:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5D853E0999;
Wed, 21 Oct 2020 17:58:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 1D33EE099B
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Oct 2020 17:58:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 267F7340D5A
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Oct 2020 17:58:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9673B3C3
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Oct 2020 17:58:48 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1603236395.07a8d208e1226d58efb8bc9416c030129dcae712.mattst88@gentoo>
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/support/kmerge.sh targets/support/livecdfs-update.sh
X-VCS-Directories: targets/support/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 07a8d208e1226d58efb8bc9416c030129dcae712
X-VCS-Branch: master
Date: Wed, 21 Oct 2020 17:58:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f23d35e7-90b3-48bf-900f-2edd14633ee3
X-Archives-Hash: 80ec8a79f52bf873adee4a09bd7d4794
Message-ID: <20201021175848.0rxMAYl1enL89U_M9Oh0nlrmBdLWVV0229uOUv8sK8U@z>
commit: 07a8d208e1226d58efb8bc9416c030129dcae712
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 01:27:17 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=07a8d208
targets: Remove kernelpkgs.txt generation
Evidently this was to be consumed by the Gentoo Linux Installer, which
saw its last commit in 2008.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/support/kmerge.sh | 10 ----------
targets/support/livecdfs-update.sh | 11 -----------
2 files changed, 21 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c4136dec..27584d51 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -66,16 +66,6 @@ setup_gk_args() {
genkernel_compile(){
setup_gk_args
- # Build our list of kernel packages
- case ${clst_livecd_type} in
- gentoo-release-live*)
- if [ -n "${kernel_merge}" ]
- then
- mkdir -p /usr/livecd
- echo "${kernel_merge}" > /usr/livecd/kernelpkgs.txt
- fi
- ;;
- esac
# Build with genkernel using the set options
# callback is put here to avoid escaping issues
if [ -n "${clst_VERBOSE}" ]
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 47dbb5b3..b7ead552 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -296,19 +296,8 @@ case ${clst_livecd_type} in
ln -sf /usr/livecd/gconf /etc/gconf
fi
- if [ -e /usr/livecd/kernelpkgs.txt ]
- then
- rm -f /usr/livecd/kernelpkgs.txt
- fi
-
touch /etc/startx
;;
- * )
- if [ -e /usr/livecd/kernelpkgs.txt ]
- then
- rm -f /usr/livecd/kernelpkgs.txt
- fi
- ;;
esac
# We want the first user to be used when auto-starting X