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 EEC9C138359 for ; Wed, 21 Oct 2020 00:24:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F034E0AB8; Wed, 21 Oct 2020 00:24:50 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) (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 490ACE0AB8 for ; Wed, 21 Oct 2020 00:24:50 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id t14so384484pgg.1 for ; Tue, 20 Oct 2020 17:24:50 -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=c5q2DwfOSqkKLifIZrLGSOTEB8dz6wsx0ZVb6msUITE=; b=OMIctP9TgZC9l/LxsypK2ZUZZMDtX/kHQXS9wmO5iZOhGKkwUK4y7n4qKFTp0o44ra x4leZrsbKeLQ8YEdPNri95LIk7QSwZZzPQAZb3WtI2zCENOdn3nk4KtfpFSI8FAo2Mp1 WjsWv9wMEeEH1WNa3QwcCTG3lsmBF0pW+mMUwPvctqa1+V9MmSu2GzdNvENnpMnGE6G4 q0c3vlWgFIvtVNxaD3XRa59SB0yu/4hDNf3ByfO8SZx62/uqKudoxjp096eO0fTc/RWb zUf3741V1xUgZWwWUB1BtEzA+F5PVc4p+qa+mFXFUFW3ZTd+QY/uHgLh9N8e67Gv0kUf tEfg== X-Gm-Message-State: AOAM5339ZWu2/B/qistoZ/rgcXPYqnRV+zv8Pcq0HsHGqAFBWtA3C8j0 uI0zbhwhW2kpPgR2/pOiHM7tVQqWAV1O8w== X-Google-Smtp-Source: ABdhPJz9yPwru1IVevsSNhYh6BCNpL+h+u+4Ws2SaG65RDAPJYaACiu/mhTQ0jTn+YVC9l6xQQXVeA== X-Received: by 2002:a05:6a00:1693:b029:155:abe5:caa2 with SMTP id k19-20020a056a001693b0290155abe5caa2mr590437pfc.39.1603239888960; Tue, 20 Oct 2020 17:24:48 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id lb13sm247780pjb.5.2020.10.20.17.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:48 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 30/37] targets: Remove post-kmerge Date: Tue, 20 Oct 2020 17:23:37 -0700 Message-Id: <20201021002344.378131-30-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: af6174a5-747e-4f2a-afe0-9a516b1ee120 X-Archives-Hash: 52bac7f0189d518210644e2e73d02975 The find ... touch modules.dep command doesn't seem necessary anymore, and this is all the script still does. Additionally confusing, pre-kmerge runs only once while post-kmerge runs once for each kernel. Signed-off-by: Matt Turner --- catalyst/base/stagebase.py | 4 ---- targets/embedded/controller.sh | 5 ----- targets/livecd-stage2/controller.sh | 5 ----- targets/netboot/controller.sh | 5 ----- targets/stage4/controller.sh | 5 ----- targets/support/post-kmerge.sh | 11 ----------- 6 files changed, 35 deletions(-) delete mode 100755 targets/support/post-kmerge.sh diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ffcc211c..99d638d8 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1548,10 +1548,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.resume.is_enabled("build_kernel_" + kname) - # Execute the script that cleans up the kernel build environment - cmd([self.settings['controller_file'], 'post-kmerge'], - env=self.env) - def _copy_kernel_config(self, kname): key = 'boot/kernel/' + kname + '/config' if key in self.settings: diff --git a/targets/embedded/controller.sh b/targets/embedded/controller.sh index d0bf331d..48867897 100755 --- a/targets/embedded/controller.sh +++ b/targets/embedded/controller.sh @@ -33,11 +33,6 @@ case ${1} in exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_shdir}/support/post-kmerge.sh - ;; - kernel) shift export kname="${1}" diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh index fe078eed..30b522e3 100755 --- a/targets/livecd-stage2/controller.sh +++ b/targets/livecd-stage2/controller.sh @@ -8,11 +8,6 @@ case $1 in exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_shdir}/support/post-kmerge.sh - ;; - kernel) shift export kname="$1" diff --git a/targets/netboot/controller.sh b/targets/netboot/controller.sh index b8d8ec23..9a6e14d2 100755 --- a/targets/netboot/controller.sh +++ b/targets/netboot/controller.sh @@ -17,11 +17,6 @@ case ${1} in exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_shdir}/support/post-kmerge.sh - ;; - kernel) shift export kname="$1" diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh index 7825f800..ba0774d1 100755 --- a/targets/stage4/controller.sh +++ b/targets/stage4/controller.sh @@ -14,11 +14,6 @@ case $1 in exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh ;; - post-kmerge) - # Cleans up the build environment after the kernels are compiled - exec_in_chroot ${clst_shdir}/support/post-kmerge.sh - ;; - kernel) shift export kname="$1" diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh deleted file mode 100755 index 58b2e08d..00000000 --- a/targets/support/post-kmerge.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -RUN_DEFAULT_FUNCS="no" - -source /tmp/chroot-functions.sh - -# Only run depscan.sh if modules exist -if [ -n "$(ls /lib/modules)" ] -then - find /lib/modules -name modules.dep -exec touch {} \; -fi -- 2.26.2