summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot2010-08-25 18:26:07 +0200
committerroot2010-08-25 18:26:07 +0200
commit156b3ecb7df4f1ef9be7c10a011b1ae1186ac082 (patch)
tree0174d1600b0c7b6cfd7a82c7c4a8c97e6feaf2f0
parentbugfix (diff)
downloadbroot-156b3ecb7df4f1ef9be7c10a011b1ae1186ac082.tar.gz
broot-156b3ecb7df4f1ef9be7c10a011b1ae1186ac082.tar.xz
broot-156b3ecb7df4f1ef9be7c10a011b1ae1186ac082.zip
update broot scripts
-rw-r--r--chroot-scripts/build-core.sh2
-rw-r--r--chroot-scripts/packages/dialog.pkg.sh2
-rw-r--r--chroot-scripts/packages/dropbear.pkg.sh2
-rw-r--r--chroot-scripts/packages/eglibc.pkg.sh2
-rw-r--r--chroot-scripts/packages/hwinfo.pkg.sh2
-rw-r--r--chroot-scripts/packages/iw.pkg.sh2
-rw-r--r--chroot-scripts/packages/kexec.pkg.sh2
-rw-r--r--chroot-scripts/packages/mksquashfs.pkg.sh3
-rw-r--r--chroot-scripts/packages/nbd-client.pkg.sh2
-rw-r--r--chroot-scripts/packages/splashy.pkg.sh2
-rw-r--r--chroot-scripts/packages/strace.pkg.sh2
-rwxr-xr-xchroot-scripts/pkg-builder.sh1
12 files changed, 14 insertions, 10 deletions
diff --git a/chroot-scripts/build-core.sh b/chroot-scripts/build-core.sh
index 3ddfec5..de64da5 100644
--- a/chroot-scripts/build-core.sh
+++ b/chroot-scripts/build-core.sh
@@ -4,7 +4,7 @@ cd /root/bin
. ./pkg-builder.sh
-PACKAGES="eglibc kexec dialog nbd-client iw splashy hwinfo strace"
+PACKAGES="eglibc kexec mksquashfs dialog nbd-client iw splashy hwinfo strace"
mkdir -p /root/packages
[ -d /root/packages/indices/ ] && rm /root/packages/indices/*
diff --git a/chroot-scripts/packages/dialog.pkg.sh b/chroot-scripts/packages/dialog.pkg.sh
index 67706e5..66d79bd 100644
--- a/chroot-scripts/packages/dialog.pkg.sh
+++ b/chroot-scripts/packages/dialog.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="dialog"
APT_PACKAGES="dialog"
-REQUIRED_BINARIES="$(which dialog)"
+REQUIRED_BINARIES="dialog"
diff --git a/chroot-scripts/packages/dropbear.pkg.sh b/chroot-scripts/packages/dropbear.pkg.sh
index 18fdff8..8b0587a 100644
--- a/chroot-scripts/packages/dropbear.pkg.sh
+++ b/chroot-scripts/packages/dropbear.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="dropbear"
APT_PACKAGES="dropbear"
-REQUIRED_BINARIES="$(which dropbear)"
+REQUIRED_BINARIES="dropbear"
diff --git a/chroot-scripts/packages/eglibc.pkg.sh b/chroot-scripts/packages/eglibc.pkg.sh
index 3c83414..63ba668 100644
--- a/chroot-scripts/packages/eglibc.pkg.sh
+++ b/chroot-scripts/packages/eglibc.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="eglibc"
APT_PACKAGES=""
-REQUIRED_BINARIES="$(which ldd) $(which ld) $(which ldconfig)"
+REQUIRED_BINARIES="ldd ld ldconfig"
diff --git a/chroot-scripts/packages/hwinfo.pkg.sh b/chroot-scripts/packages/hwinfo.pkg.sh
index b86f0fd..793f54f 100644
--- a/chroot-scripts/packages/hwinfo.pkg.sh
+++ b/chroot-scripts/packages/hwinfo.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="hwinfo"
APT_PACKAGES="hwinfo"
-REQUIRED_BINARIES="$(which hwinfo)"
+REQUIRED_BINARIES="hwinfo"
diff --git a/chroot-scripts/packages/iw.pkg.sh b/chroot-scripts/packages/iw.pkg.sh
index efc48ca..e1185a7 100644
--- a/chroot-scripts/packages/iw.pkg.sh
+++ b/chroot-scripts/packages/iw.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="iw"
APT_PACKAGES="iw"
-REQUIRED_BINARIES="$(which iw)"
+REQUIRED_BINARIES="iw"
diff --git a/chroot-scripts/packages/kexec.pkg.sh b/chroot-scripts/packages/kexec.pkg.sh
index 827bc76..3019e2d 100644
--- a/chroot-scripts/packages/kexec.pkg.sh
+++ b/chroot-scripts/packages/kexec.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="kexec"
APT_PACKAGES="kexec-tools"
-REQUIRED_BINARIES="$(which kexec)"
+REQUIRED_BINARIES="kexec"
diff --git a/chroot-scripts/packages/mksquashfs.pkg.sh b/chroot-scripts/packages/mksquashfs.pkg.sh
new file mode 100644
index 0000000..3dc3591
--- /dev/null
+++ b/chroot-scripts/packages/mksquashfs.pkg.sh
@@ -0,0 +1,3 @@
+PKG_NAME="mksquashfs"
+APT_PACKAGES="squashfs-tools"
+REQUIRED_BINARIES="mksquashfs"
diff --git a/chroot-scripts/packages/nbd-client.pkg.sh b/chroot-scripts/packages/nbd-client.pkg.sh
index 79584af..122139d 100644
--- a/chroot-scripts/packages/nbd-client.pkg.sh
+++ b/chroot-scripts/packages/nbd-client.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="nbd-client"
APT_PACKAGES="nbd-client"
-REQUIRED_BINARIES="$(which nbd-client)"
+REQUIRED_BINARIES="nbd-client"
diff --git a/chroot-scripts/packages/splashy.pkg.sh b/chroot-scripts/packages/splashy.pkg.sh
index 701b413..8c639c3 100644
--- a/chroot-scripts/packages/splashy.pkg.sh
+++ b/chroot-scripts/packages/splashy.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="splashy"
APT_PACKAGES="splashy"
-REQUIRED_BINARIES="$(which splashy)"
+REQUIRED_BINARIES="splashy splashy_update"
diff --git a/chroot-scripts/packages/strace.pkg.sh b/chroot-scripts/packages/strace.pkg.sh
index 917f20e..031f205 100644
--- a/chroot-scripts/packages/strace.pkg.sh
+++ b/chroot-scripts/packages/strace.pkg.sh
@@ -1,3 +1,3 @@
PKG_NAME="strace"
APT_PACKAGES="strace"
-REQUIRED_BINARIES="$(which strace)"
+REQUIRED_BINARIES="strace"
diff --git a/chroot-scripts/pkg-builder.sh b/chroot-scripts/pkg-builder.sh
index ec97343..56728d8 100755
--- a/chroot-scripts/pkg-builder.sh
+++ b/chroot-scripts/pkg-builder.sh
@@ -22,6 +22,7 @@ copyfileswithdependencies () {
for FILE in $REQUIRED_BINARIES
do
+ FILE=$(which $FILE)
DIR=`dirname $FILE | cut -c2-`
echo $DIR
[ ! -d "$DIR" ] && mkdir -p "$DIR"