| 1 |
commit: 6696fd9e370c27f3bf62385aca0a5940f8246efd |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 19 22:50:40 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 20 23:26:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6696fd9e |
| 7 |
|
| 8 |
targets: Remove post-kmerge |
| 9 |
|
| 10 |
The find ... touch modules.dep command doesn't seem necessary anymore, |
| 11 |
and this is all the script still does. Additionally confusing, |
| 12 |
pre-kmerge runs only once while post-kmerge runs once for each kernel. |
| 13 |
|
| 14 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 15 |
|
| 16 |
catalyst/base/stagebase.py | 4 ---- |
| 17 |
targets/embedded/controller.sh | 5 ----- |
| 18 |
targets/livecd-stage2/controller.sh | 5 ----- |
| 19 |
targets/netboot/controller.sh | 5 ----- |
| 20 |
targets/stage4/controller.sh | 5 ----- |
| 21 |
targets/support/post-kmerge.sh | 11 ----------- |
| 22 |
6 files changed, 35 deletions(-) |
| 23 |
|
| 24 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 25 |
index ffcc211c..99d638d8 100644 |
| 26 |
--- a/catalyst/base/stagebase.py |
| 27 |
+++ b/catalyst/base/stagebase.py |
| 28 |
@@ -1548,10 +1548,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 29 |
|
| 30 |
self.resume.is_enabled("build_kernel_" + kname) |
| 31 |
|
| 32 |
- # Execute the script that cleans up the kernel build environment |
| 33 |
- cmd([self.settings['controller_file'], 'post-kmerge'], |
| 34 |
- env=self.env) |
| 35 |
- |
| 36 |
def _copy_kernel_config(self, kname): |
| 37 |
key = 'boot/kernel/' + kname + '/config' |
| 38 |
if key in self.settings: |
| 39 |
|
| 40 |
diff --git a/targets/embedded/controller.sh b/targets/embedded/controller.sh |
| 41 |
index d0bf331d..48867897 100755 |
| 42 |
--- a/targets/embedded/controller.sh |
| 43 |
+++ b/targets/embedded/controller.sh |
| 44 |
@@ -33,11 +33,6 @@ case ${1} in |
| 45 |
exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
| 46 |
;; |
| 47 |
|
| 48 |
- post-kmerge) |
| 49 |
- # Cleans up the build environment after the kernels are compiled |
| 50 |
- exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
| 51 |
- ;; |
| 52 |
- |
| 53 |
kernel) |
| 54 |
shift |
| 55 |
export kname="${1}" |
| 56 |
|
| 57 |
diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh |
| 58 |
index fe078eed..30b522e3 100755 |
| 59 |
--- a/targets/livecd-stage2/controller.sh |
| 60 |
+++ b/targets/livecd-stage2/controller.sh |
| 61 |
@@ -8,11 +8,6 @@ case $1 in |
| 62 |
exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
| 63 |
;; |
| 64 |
|
| 65 |
- post-kmerge) |
| 66 |
- # Cleans up the build environment after the kernels are compiled |
| 67 |
- exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
| 68 |
- ;; |
| 69 |
- |
| 70 |
kernel) |
| 71 |
shift |
| 72 |
export kname="$1" |
| 73 |
|
| 74 |
diff --git a/targets/netboot/controller.sh b/targets/netboot/controller.sh |
| 75 |
index b8d8ec23..9a6e14d2 100755 |
| 76 |
--- a/targets/netboot/controller.sh |
| 77 |
+++ b/targets/netboot/controller.sh |
| 78 |
@@ -17,11 +17,6 @@ case ${1} in |
| 79 |
exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
| 80 |
;; |
| 81 |
|
| 82 |
- post-kmerge) |
| 83 |
- # Cleans up the build environment after the kernels are compiled |
| 84 |
- exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
| 85 |
- ;; |
| 86 |
- |
| 87 |
kernel) |
| 88 |
shift |
| 89 |
export kname="$1" |
| 90 |
|
| 91 |
diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh |
| 92 |
index 7825f800..ba0774d1 100755 |
| 93 |
--- a/targets/stage4/controller.sh |
| 94 |
+++ b/targets/stage4/controller.sh |
| 95 |
@@ -14,11 +14,6 @@ case $1 in |
| 96 |
exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh |
| 97 |
;; |
| 98 |
|
| 99 |
- post-kmerge) |
| 100 |
- # Cleans up the build environment after the kernels are compiled |
| 101 |
- exec_in_chroot ${clst_shdir}/support/post-kmerge.sh |
| 102 |
- ;; |
| 103 |
- |
| 104 |
kernel) |
| 105 |
shift |
| 106 |
export kname="$1" |
| 107 |
|
| 108 |
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh |
| 109 |
deleted file mode 100755 |
| 110 |
index 58b2e08d..00000000 |
| 111 |
--- a/targets/support/post-kmerge.sh |
| 112 |
+++ /dev/null |
| 113 |
@@ -1,11 +0,0 @@ |
| 114 |
-#!/bin/bash |
| 115 |
- |
| 116 |
-RUN_DEFAULT_FUNCS="no" |
| 117 |
- |
| 118 |
-source /tmp/chroot-functions.sh |
| 119 |
- |
| 120 |
-# Only run depscan.sh if modules exist |
| 121 |
-if [ -n "$(ls /lib/modules)" ] |
| 122 |
-then |
| 123 |
- find /lib/modules -name modules.dep -exec touch {} \; |
| 124 |
-fi |
Archives