diff options
| -rwxr-xr-x | scripts/adkprepare.sh | 57 | ||||
| -rw-r--r-- | tools/cpio/src/cpio.c | 1 | ||||
| -rw-r--r-- | tools/cpio/src/ib_alloc.c | 1 |
3 files changed, 48 insertions, 11 deletions
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index a8a90f84f..5faaed56e 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -1,5 +1,10 @@ #!/bin/sh +os=$(uname) +ver=$(uname -r) +arch=$(uname -m) + +ext=0 while getopts "e" option do case $option in @@ -19,10 +24,44 @@ darwin() { openbsd() { echo "Preparing OpenBSD for OpenADK" + PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/" + export PKG_PATH + pkg_add -v gmake + pkg_add -v git + pkg_add -v bash + pkg_add -v unzip + pkg_add -v wget + pkg_add -v gtar-- + pkg_add -v gawk + pkg_add -v gsed + pkg_add -v xz } netbsd() { echo "Preparing NetBSD for OpenADK" + PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/" + export PKG_PATH + pkg_add -vu xz + pkg_add -vu scmgit + pkg_add -vu gmake + pkg_add -vu mksh + pkg_add -vu bash + pkg_add -vu wget + pkg_add -vu unzip + pkg_add -vu gtar + pkg_add -vu gsed + pkg_add -vu gawk +} + +netbsd_full() { + echo "Preparing NetBSD for full OpenADK package builds" + pkg_add -vu intltool + pkg_add -vu lynx + pkg_add -vu pkg-config + pkg_add -vu zip + pkg_add -vu bison + pkg_add -vu libIDL + pkg_add -vu xkbcomp } freebsd() { @@ -35,28 +74,28 @@ freebsd_full() { pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL } -os=$(uname) - case $os in Linux) linux - [[ $ext -eq 1 ]] && linux_full + [ $ext -eq 1 ] && linux_full ;; FreeBSD) freebsd - [[ $ext -eq 1 ]] && freebsd_full + [ $ext -eq 1 ] && freebsd_full ;; OpenBSD) openbsd - [[ $ext -eq 1 ]] && openbsd_full + [ $ext -eq 1 ] && openbsd_full ;; NetBSD) netbsd - [[ $ext -eq 1 ]] && netbsd_full + [ $ext -eq 1 ] && netbsd_full ;; Darwin) darwin - [[ $ext -eq 1 ]] && darwin_full - ;; + [ $ext -eq 1 ] && darwin_full + ;; + *) + echo "OS not supported" + ;; esac - diff --git a/tools/cpio/src/cpio.c b/tools/cpio/src/cpio.c index 1300d2d70..00f4a16b7 100644 --- a/tools/cpio/src/cpio.c +++ b/tools/cpio/src/cpio.c @@ -49,7 +49,6 @@ #include <sys/wait.h> #include <fcntl.h> #include <stdlib.h> -#include <malloc.h> #include <string.h> #include <unistd.h> #include <signal.h> diff --git a/tools/cpio/src/ib_alloc.c b/tools/cpio/src/ib_alloc.c index 338d0622b..4020940ce 100644 --- a/tools/cpio/src/ib_alloc.c +++ b/tools/cpio/src/ib_alloc.c @@ -28,7 +28,6 @@ #include <string.h> #include <errno.h> #include <stdlib.h> -#include <malloc.h> #include "memalign.h" #include "iblok.h" |