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 5A5B313835A for ; Tue, 20 Oct 2020 04:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C320DE0855; Tue, 20 Oct 2020 04:31:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 71DB0E086E for ; Tue, 20 Oct 2020 04:31:54 +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 76650340D02 for ; Tue, 20 Oct 2020 04:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0495D3BA for ; Tue, 20 Oct 2020 04:31:51 +0000 (UTC) From: "Matt Turner" 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" Message-ID: <1603166105.d221236a8b9d6ac165f11114ecd83934bb3903d0.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 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: d221236a8b9d6ac165f11114ecd83934bb3903d0 X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 04:31:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a541c806-be4a-4947-9b0e-e2db47e852e6 X-Archives-Hash: eb4087849cfda8d3d85bc786a5813ed1 commit: d221236a8b9d6ac165f11114ecd83934bb3903d0 Author: Matt Turner gentoo org> AuthorDate: Tue Oct 20 01:27:17 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 03:55:05 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d221236a 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 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 c241440a..b8cc0ce6 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