summaryrefslogtreecommitdiffstats
path: root/remote/modules/busybox
diff options
context:
space:
mode:
authorSimon Rettberg2014-07-04 14:46:20 +0200
committerSimon Rettberg2014-07-04 14:46:20 +0200
commitd1f5aedd76df437a08f3283fa00bc8a9dab7fa2b (patch)
tree8c046eeaf8e874b479b95964b2bf410365cff438 /remote/modules/busybox
parentremove hardcoded /bin/rm call. Relative calls work in services files (diff)
downloadtm-scripts-d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b.tar.gz
tm-scripts-d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b.tar.xz
tm-scripts-d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b.zip
"Fedora Support", step 1 ->
Several changes: 1) Make sure /bin /sbin /lib and /lib64 are ALWAYS symlinks to /usr/XXX, no matter what the current distribution does. 2) Make sure nobody and nogroup exist. 3) Fix various modules making assumptions that are not true on every distro. 4) Add symlinks to kdm module since fedora is looking for kdmrc in yet another spot. 5) Add detection of fedora, support its package manager What still breaks: dnbd3 Other distros might not work now, they need adaption to changed logic in some modules.
Diffstat (limited to 'remote/modules/busybox')
-rw-r--r--remote/modules/busybox/module.build3
-rw-r--r--remote/modules/busybox/module.conf4
2 files changed, 3 insertions, 4 deletions
diff --git a/remote/modules/busybox/module.build b/remote/modules/busybox/module.build
index 727a334c..135ba8a1 100644
--- a/remote/modules/busybox/module.build
+++ b/remote/modules/busybox/module.build
@@ -1,8 +1,7 @@
fetch_source() {
- git clone "${REQUIRED_GIT}" src || perror "Could not clone busybox git"
+ git clone --depth 1 "${REQUIRED_GIT}" --branch "$REQUIRED_BRANCH" src || perror "Could not clone busybox git"
cd src || perror "Could not cd to src"
- git checkout "$REQUIRED_BRANCH" || perror "Could not checkout requested branch"
# Patch image centering if not patched yet
if ! grep -q "bcenter_image" "miscutils/fbsplash.c"; then
git apply "../fbsplash-center.patch" || perror "Could not apply busybox patch for fbsplash image centering"
diff --git a/remote/modules/busybox/module.conf b/remote/modules/busybox/module.conf
index 6acfa16c..82d1731e 100644
--- a/remote/modules/busybox/module.conf
+++ b/remote/modules/busybox/module.conf
@@ -2,6 +2,6 @@ REQUIRED_GIT="git://git.busybox.net/busybox"
REQUIRED_BRANCH="1_22_1"
REQUIRED_BINARIES="busybox"
REQUIRED_DIRECTORIES="
- /bin
- /sbin
+ /usr/bin
+ /usr/sbin
"