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 E6984138359 for ; Wed, 21 Oct 2020 00:24:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F0E0E0AC6; Wed, 21 Oct 2020 00:24:55 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) (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 469AAE0AC6 for ; Wed, 21 Oct 2020 00:24:55 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id l18so385809pgg.0 for ; Tue, 20 Oct 2020 17:24:55 -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=OcGghaYobg8BJ+MhPJalOnvNwrcS673FWLUnrHhLxas=; b=B62xrGJXTy2Xg+rEdHSDjxoOF5uv35wN/dNVUHmfNWWki8yWyJ34Chwm82V+rVay2E 14s84qw5OLzuWXzglq2tQBDP5HvP1Pd8Y1v5/2M00cX2jlpmOgkwJ+yUHAq78fLuscri P2R43TWYd6Wmo1TPPgrAkNouYt/jqPevHmjD9AkI2Pv3PGu9DiYkKUjCH5iCPT2VzLSz pKGFkW/sP/ChBKqfKg4C7r2ZL1r33S0PL6dh9srhJ+u6EZUzmXMII72F3kaMvRu6Rj/d GKUSt3MJayl7AJ+us+db+y57J/BMtg02w8YBTbgF9LyK9om0a8O5yxj8O0Ax4u/GC++S UOQQ== X-Gm-Message-State: AOAM531zAf+KeInfDHl/clbeji8ppL+cSOfCEgmPkx6Aq36O8HoeQ2Pw XvUyKYejhyWvbpGf/T8cRjBLEMpFTZfCEg== X-Google-Smtp-Source: ABdhPJx7KL6R/FySj1ilKmjLh/+7DJi7877kT6Cf4PH9obZLYsqWYsxRwnV0w3NxHztoyh4GhxkGQg== X-Received: by 2002:a05:6a00:15d2:b029:152:9990:e003 with SMTP id o18-20020a056a0015d2b02901529990e003mr652923pfu.27.1603239893951; Tue, 20 Oct 2020 17:24:53 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id 78sm162106pfz.211.2020.10.20.17.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:53 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 33/37] targets: Remove kernelpkgs.txt generation Date: Tue, 20 Oct 2020 17:23:40 -0700 Message-Id: <20201021002344.378131-33-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-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: c02f8df3-0b08-4fad-bdf7-dad0324b42f3 X-Archives-Hash: 14c21be8416dd5cd2f72e8e46cd829b3 Evidently this was to be consumed by the Gentoo Linux Installer, which saw its last commit in 2008. Signed-off-by: Matt Turner --- 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 -- 2.26.2