From 702e216210d58f1301c80d4e55af5d29f813eb19 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Jun 2010 12:34:06 +0200 Subject: gnu tar fixes for MacOS X host --- scripts/scan-tools.sh | 14 +++++++++++--- scripts/tar | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 89e368d8b..16887e3dd 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -56,6 +56,12 @@ OpenBSD) # although some packages' autoconf scripts may # not properly recognise OpenBSD ;; +Darwin*) + echo "Building OpenADK on $os needs a case-sensitive disk partition." + echo "For Snow Leopard and above you can use diskutil to resize your existing disk." + echo "For older versions you might consider to use a disk image" + echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G" + ;; *) # unsupported echo "Building OpenADK on $os is currently unsupported." @@ -105,9 +111,11 @@ fi if ! (tar --version | grep GNU) >/dev/null 2>&1;then if ! which gtar >/dev/null 2>&1; then - echo You must install GNU tar to continue. - echo - out=1 + if ! which gnutar >/dev/null 2>&1; then + echo You must install GNU tar to continue. + echo + out=1 + fi fi fi diff --git a/scripts/tar b/scripts/tar index 5d6db28b4..6f63d74c1 100755 --- a/scripts/tar +++ b/scripts/tar @@ -3,11 +3,15 @@ # material, please see the LICENCE file in the top-level directory. if [ -z "$(which gtar 2>/dev/null)" ];then + if [ -z "$(which gnutar 2>/dev/null)" ];then if [ -x /usr/bin/tar ];then /usr/bin/tar "$@" else /bin/tar "$@" fi + else + gnutar "$@" + fi else gtar "$@" fi -- cgit v1.2.3 From 8edb1cd5a6a03b391003a1047e0b3ca6d22acd45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Jun 2010 18:06:45 +0200 Subject: bulk package update --- scripts/create-image.sh | 2 +- scripts/scan-pkgs.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/create-image.sh b/scripts/create-image.sh index b4824aea7..7536cd814 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -79,7 +79,7 @@ printf "Creating filesystem $filesystem\n" printf "Create partition and filesystem\n" $parted -s $1 mklabel msdos -$parted -s $1 mkpart primary ext2 0 100% +$parted -s $1 mkpart primary ext2 0 98% $parted -s $1 set 1 boot on dd if=$1 of=mbr bs=16384 count=1 2>/dev/null diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index c3724740f..20471ad57 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -123,14 +123,14 @@ if [[ -n $NEED_CURLDEV ]];then fi fi -if [[ -n $NEED_SSLDEV ]]; then - if ! test -f /usr/lib/pkgconfig/openssl.pc >/dev/null; then - if ! test -f /usr/include/openssl/ssl.h >/dev/null; then - echo >&2 You need openssl headers to build $NEED_SQUID - out=1 - fi - fi -fi +#if [[ -n $NEED_SSLDEV ]]; then +# if ! test -f /usr/lib/pkgconfig/openssl.pc >/dev/null; then +# if ! test -f /usr/include/openssl/ssl.h >/dev/null; then +# echo >&2 You need openssl headers to build $NEED_SSLDEV +# out=1 +# fi +# fi +#fi if [[ -n $NEED_MKFONTDIR ]]; then if ! which mkfontdir >/dev/null 2>&1; then -- cgit v1.2.3 From ebf1ffef54e96093d0ee20c8fe48f9818d300695 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Jun 2010 22:17:52 +0200 Subject: with devtmpfs, these devices nodes are obsolete --- scripts/install.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'scripts') diff --git a/scripts/install.sh b/scripts/install.sh index 79bfa36bf..b436767a5 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -236,11 +236,6 @@ EOF umount $tmp/dev fi -printf "Creating device nodes\n" -mknod -m 666 $tmp/dev/null c 1 3 -mknod -m 622 $tmp/dev/console c 5 1 -mknod -m 666 $tmp/dev/tty c 5 0 - umount $tmp printf "Successfully installed.\n" -- cgit v1.2.3 From 36c8c2eb53bf2fb400f138b2177bea2fe0651d12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Jun 2010 17:45:03 +0200 Subject: optimize ipkg package management ipkg will automatically mount the normal read-only rootfs as read-write and after the command back to read-only. ipkg install/remove/upgrades are only supported for compact disk or disk based systems. On flash systems better reflash completely. make a kernel package containing the real kernel. Adjust ipkg.conf to contain a configurable server adress. --- scripts/ipkg-make-index.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh index ec07dff59..927e67b93 100644 --- a/scripts/ipkg-make-index.sh +++ b/scripts/ipkg-make-index.sh @@ -9,7 +9,7 @@ fi find "$pkg_dir" -name '*.ipk' | sort | while IFS= read pkg; do dpkg=${pkg##*/} - echo "Generating index for package $dpkg" >&2 + #echo "Generating index for package $dpkg" >&2 file_size=$(ls -l $pkg | awk '{print $5}') md5sum=$(md5sum $pkg) tar -xzOf "$pkg" ./control.tar.gz | \ -- cgit v1.2.3