diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-10-19 15:50:40 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-10-20 16:26:35 -0700 |
| commit | 6696fd9e370c27f3bf62385aca0a5940f8246efd (patch) | |
| tree | 1cedde66a33b65dd436b6b0cf603ba4b848ed1eb | |
| parent | targets: Drop warning about no cdtar (diff) | |
| download | catalyst-6696fd9e.tar.gz catalyst-6696fd9e.tar.bz2 catalyst-6696fd9e.zip | |
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 <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 4 | ||||
| -rwxr-xr-x | targets/embedded/controller.sh | 5 | ||||
| -rwxr-xr-x | targets/livecd-stage2/controller.sh | 5 | ||||
| -rwxr-xr-x | targets/netboot/controller.sh | 5 | ||||
| -rwxr-xr-x | targets/stage4/controller.sh | 5 | ||||
| -rwxr-xr-x | targets/support/post-kmerge.sh | 11 |
6 files changed, 0 insertions, 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 |