diff options
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/setup-tools.sh | 2 | ||||
| -rw-r--r-- | remote/tools/busybox/build.busybox | 4 | ||||
| -rw-r--r-- | remote/tools/busybox/busybox.conf | 3 | ||||
| -rw-r--r-- | remote/tools/plymouth/build.plymouth | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/remote/setup-tools.sh b/remote/setup-tools.sh index 54713683..f9867048 100755 --- a/remote/setup-tools.sh +++ b/remote/setup-tools.sh @@ -18,7 +18,7 @@ fi #Create tools directory if not exists TOOL_DIR=$ROOT_DIR/tools -INIT_DIR=$ROOT_DIR/initramfs +INIT_DIR=$ROOT_DIR/stage3.2 setup_git () { diff --git a/remote/tools/busybox/build.busybox b/remote/tools/busybox/build.busybox index 2c42a930..23d67a55 100644 --- a/remote/tools/busybox/build.busybox +++ b/remote/tools/busybox/build.busybox @@ -19,8 +19,8 @@ build() if [ ! -e .built ]; then cd src make - [ ! -d ../build ] && mkdir ../build - make CONFIG_PREFIX=$TOOL_DIR/$TOOL/build install + [ ! -d ../build/$TARGET_DIR ] && mkdir -p ../build/$TARGET_DIR + make CONFIG_PREFIX=$TOOL_DIR/$TOOL/build/$TARGET_DIR install cd - touch .built fi diff --git a/remote/tools/busybox/busybox.conf b/remote/tools/busybox/busybox.conf index 2e9d51f5..d4a8cccf 100644 --- a/remote/tools/busybox/busybox.conf +++ b/remote/tools/busybox/busybox.conf @@ -1,4 +1,5 @@ GIT=git://git.openslx.org/openslx/tools/busybox -DEPS="" +DEPS="" +TARGET_DIR="openslx" REQUIRED_BINARIES="busybox" REQUIRED_FILES="addgroup cp echo ip login mt rm sync adduser cpio egrep ipaddr ls mv rmdir tar ash date false iplink lsattr netstat run-parts touch dd fdflush iproute lsblk nice sed true cat delgroup fgrep iprule mkdir pidof setarch umount catv deluser getopt iptunnel mknod ping setserial uname chattr df grep kill mktemp pipe_progress sh usleep chgrp dmesg gunzip linux32 more printenv sleep vi chmod gzip mount ps linux64 stty watch chown dnsdomainname dumpkmap hostname ln mountpoint pwd su zcat [ [[ ar arping awk basename chrt chsum clear cmp crontab cut dc diff dirname dos2unix du eject env expr ether-wake fdformat find fold free fuser head hostid id install killall killall5 last less logname lsof lspci md5sum mesg microcom mkfifo nohup nslookup od passwd patch printf readlink realpath reset resize seq sha1sum sha256sum sha512sum sort strings tail tee telnet test tftp time top tr traceroute tty uniq unix2dos unzip uptime uudecode uuencode vlock wc wget which who whoami xargs yes pivot_root rtstat runlevel udhcpc insmod halt getty devmem fsck hdparm ifconfig ifdown ifup klogd loadkmap losetup lsmod makedevs mdev modprobe nameif rmmod route setconsole start-stop-daemon sulogin swapoff swapon switch_root sysctl syslogd vconfig watchdog loadfont rdate setlogcons chroot crond dnsd inetd dnbd3" diff --git a/remote/tools/plymouth/build.plymouth b/remote/tools/plymouth/build.plymouth index 7cc7ea1b..082db46f 100644 --- a/remote/tools/plymouth/build.plymouth +++ b/remote/tools/plymouth/build.plymouth @@ -1,7 +1,7 @@ #!/bin/bash install_dependencies() { - apt-get install --force-yes $DEPS + apt-get install --yes $DEPS } fetch_source() { |