| 1 |
commit: be1d8297fc2261f430a52cef8a444deb96555c43 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 29 04:53:45 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 05:09:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=be1d8297 |
| 7 |
|
| 8 |
targets/*: Add shebangs for any scripts without one |
| 9 |
|
| 10 |
This is to prevent errors like: |
| 11 |
|
| 12 |
27 Jun 2016 21:29:02 EDT: ERROR : Exception running action sequence build_kernel |
| 13 |
Traceback (most recent call last): |
| 14 |
File "/usr/lib64/python3.4/site-packages/catalyst/base/stagebase.py", line 1393, in run |
| 15 |
getattr(self, x)() |
| 16 |
File "/usr/lib64/python3.4/site-packages/catalyst/base/stagebase.py", line 1508, in build_kernel |
| 17 |
env=self.env) |
| 18 |
File "/usr/lib64/python3.4/site-packages/catalyst/support.py", line 47, in cmd |
| 19 |
proc = Popen(args, env=env) |
| 20 |
File "/usr/lib64/python3.4/subprocess.py", line 859, in __init__ |
| 21 |
restore_signals, start_new_session) |
| 22 |
File "/usr/lib64/python3.4/subprocess.py", line 1457, in _execute_child |
| 23 |
raise child_exception_type(errno_num, err_msg) |
| 24 |
OSError: [Errno 8] Exec format error |
| 25 |
|
| 26 |
targets/embedded/unmerge.sh | 1 + |
| 27 |
targets/livecd-stage1/livecd-stage1-controller.sh | 1 + |
| 28 |
targets/livecd-stage2/livecd-stage2-controller.sh | 1 + |
| 29 |
targets/support/filesystem-functions.sh | 2 ++ |
| 30 |
targets/support/functions.sh | 2 ++ |
| 31 |
targets/support/target_image_setup.sh | 1 + |
| 32 |
6 files changed, 8 insertions(+) |
| 33 |
|
| 34 |
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh |
| 35 |
index 9611c0a..6c55801 100755 |
| 36 |
--- a/targets/embedded/unmerge.sh |
| 37 |
+++ b/targets/embedded/unmerge.sh |
| 38 |
@@ -1,3 +1,4 @@ |
| 39 |
+#!/bin/bash |
| 40 |
|
| 41 |
${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF |
| 42 |
ROOT=/tmp/mergeroot emerge -C $* || exit 1 |
| 43 |
|
| 44 |
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh |
| 45 |
index 19b8dd1..7bf3bce 100755 |
| 46 |
--- a/targets/livecd-stage1/livecd-stage1-controller.sh |
| 47 |
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh |
| 48 |
@@ -1,3 +1,4 @@ |
| 49 |
+#!/bin/bash |
| 50 |
|
| 51 |
source ${clst_shdir}/support/functions.sh |
| 52 |
|
| 53 |
|
| 54 |
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh |
| 55 |
index a98cb47..10ee98e 100755 |
| 56 |
--- a/targets/livecd-stage2/livecd-stage2-controller.sh |
| 57 |
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh |
| 58 |
@@ -1,3 +1,4 @@ |
| 59 |
+#!/bin/bash |
| 60 |
|
| 61 |
source ${clst_shdir}/support/functions.sh |
| 62 |
source ${clst_shdir}/support/filesystem-functions.sh |
| 63 |
|
| 64 |
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh |
| 65 |
index 98fd5fe..0c144ba 100755 |
| 66 |
--- a/targets/support/filesystem-functions.sh |
| 67 |
+++ b/targets/support/filesystem-functions.sh |
| 68 |
@@ -1,3 +1,5 @@ |
| 69 |
+#!/bin/bash |
| 70 |
+ |
| 71 |
# Dont forget to update functions.sh check_looptype |
| 72 |
# $1 is the target directory for the filesystem |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
| 76 |
index f6faa61..cca2fd8 100755 |
| 77 |
--- a/targets/support/functions.sh |
| 78 |
+++ b/targets/support/functions.sh |
| 79 |
@@ -1,3 +1,5 @@ |
| 80 |
+#!/bin/bash |
| 81 |
+ |
| 82 |
copy_to_chroot() { |
| 83 |
local src_file=$1 |
| 84 |
local dest_dir=${clst_chroot_path}${2:-/tmp} |
| 85 |
|
| 86 |
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh |
| 87 |
index b428d4e..559bc56 100755 |
| 88 |
--- a/targets/support/target_image_setup.sh |
| 89 |
+++ b/targets/support/target_image_setup.sh |
| 90 |
@@ -1,3 +1,4 @@ |
| 91 |
+#!/bin/bash |
| 92 |
|
| 93 |
source ${clst_shdir}/support/functions.sh |
| 94 |
source ${clst_shdir}/support/filesystem-functions.sh |
Archives