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 3E0F4138359 for ; Tue, 20 Oct 2020 08:30:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E146DE0863; Tue, 20 Oct 2020 08:30:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 BDB0EE0863 for ; Tue, 20 Oct 2020 08:30:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EE82E340CE7 for ; Tue, 20 Oct 2020 08:30:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BCA63BD for ; Tue, 20 Oct 2020 08:30:28 +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: <1603177803.6e4e6d6e53bde30efd470e10e367a3d4f41e775e.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/, targets/stage4/, targets/livecd-stage2/, catalyst/base/, ... X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/embedded/controller.sh targets/livecd-stage2/controller.sh targets/netboot/controller.sh targets/stage4/controller.sh targets/support/post-kmerge.sh X-VCS-Directories: targets/support/ targets/livecd-stage2/ targets/stage4/ targets/embedded/ targets/netboot/ catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6e4e6d6e53bde30efd470e10e367a3d4f41e775e X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 08:30:28 +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: 051e04e0-fbc9-4b68-a61e-13d015017c19 X-Archives-Hash: 03127679cae63c83130436ed366e9edb commit: 6e4e6d6e53bde30efd470e10e367a3d4f41e775e Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 22:50:40 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 07:10:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6e4e6d6e targets: Remove post-kmerge 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 gentoo.org> 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(-) 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