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