Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 01/11] targets: Remove unused 'enter' command
Date: Mon, 18 Jan 2021 20:22:00
Message-Id: 20210118202152.374078-1-mattst88@gentoo.org
1 Doesn't appear to have ever been wired up. I'm going to add something
2 like what I think this was, but without the duplication.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 targets/embedded/controller.sh | 3 ---
7 targets/stage1/controller.sh | 3 ---
8 targets/stage2/controller.sh | 4 ----
9 targets/stage3/controller.sh | 4 ----
10 targets/stage4/controller.sh | 4 ----
11 5 files changed, 18 deletions(-)
12
13 diff --git a/targets/embedded/controller.sh b/targets/embedded/controller.sh
14 index 48867897..c2e5994c 100755
15 --- a/targets/embedded/controller.sh
16 +++ b/targets/embedded/controller.sh
17 @@ -3,9 +3,6 @@
18 source ${clst_shdir}/support/functions.sh
19
20 case ${1} in
21 - enter)
22 - ;;
23 -
24 build_packages)
25 shift
26 export clst_packages="$*"
27 diff --git a/targets/stage1/controller.sh b/targets/stage1/controller.sh
28 index ab127114..0db1614d 100755
29 --- a/targets/stage1/controller.sh
30 +++ b/targets/stage1/controller.sh
31 @@ -3,9 +3,6 @@
32 source "${clst_shdir}/support/functions.sh"
33
34 case "$1" in
35 - enter)
36 - ;;
37 -
38 run)
39 cp "${clst_shdir}/stage1/build.py" "${clst_chroot_path}/tmp"
40
41 diff --git a/targets/stage2/controller.sh b/targets/stage2/controller.sh
42 index efa57648..fa5592e1 100755
43 --- a/targets/stage2/controller.sh
44 +++ b/targets/stage2/controller.sh
45 @@ -5,10 +5,6 @@ source ${clst_shdir}/support/functions.sh
46 # Only put commands in this section that you want every target to execute.
47 # This is a global default file and will affect every target
48 case $1 in
49 - enter)
50 - ${clst_CHROOT} ${clst_chroot_path}
51 - ;;
52 -
53 run)
54 shift
55 export clst_packages="$*"
56 diff --git a/targets/stage3/controller.sh b/targets/stage3/controller.sh
57 index f1ca6883..f4a3c7a1 100755
58 --- a/targets/stage3/controller.sh
59 +++ b/targets/stage3/controller.sh
60 @@ -5,10 +5,6 @@ source ${clst_shdir}/support/functions.sh
61 # Only put commands in this section that you want every target to execute.
62 # This is a global default file and will affect every target
63 case $1 in
64 - enter)
65 - ${clst_CHROOT} ${clst_chroot_path}
66 - ;;
67 -
68 run)
69 shift
70 export clst_packages="$*"
71 diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh
72 index ba0774d1..ee078f60 100755
73 --- a/targets/stage4/controller.sh
74 +++ b/targets/stage4/controller.sh
75 @@ -5,10 +5,6 @@ source ${clst_shdir}/support/functions.sh
76 # Only put commands in this section that you want every target to execute.
77 # This is a global default file and will affect every target
78 case $1 in
79 - enter)
80 - ${clst_CHROOT} ${clst_chroot_path}
81 - ;;
82 -
83 pre-kmerge)
84 # Sets up the build environment before any kernels are compiled
85 exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
86 --
87 2.26.2

Replies