diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cpio | 18 | ||||
| -rwxr-xr-x | scripts/create-image.sh | 6 | ||||
| -rw-r--r-- | scripts/ipkg-build | 2 | ||||
| -rw-r--r-- | scripts/rstrip.sh | 3 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 12 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 20 | ||||
| -rw-r--r-- | scripts/split-cfg.sh | 24 | ||||
| -rwxr-xr-x | scripts/tarpkg | 6 |
8 files changed, 50 insertions, 41 deletions
diff --git a/scripts/cpio b/scripts/cpio new file mode 100755 index 000000000..0b406f712 --- /dev/null +++ b/scripts/cpio @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +os=$(uname) +case $os in + NetBSD|MirBSD) + quiet="" + ;; + *) + quiet="--quiet" + ;; +esac +if [ -x /usr/bin/cpio ];then + /usr/bin/cpio $quiet "$@" +else + /bin/cpio $quiet "$@" +fi diff --git a/scripts/create-image.sh b/scripts/create-image.sh index 96a96ced8..b4824aea7 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -72,7 +72,7 @@ else fi -printf "Generate qemu image\n" +printf "Generate qemu image (512 MB)\n" $qimg create -f raw $1 512M >/dev/null printf "Creating filesystem $filesystem\n" @@ -120,14 +120,12 @@ else cp $2-initramfs $tmp/boot/initramfs fi -printf "Creating device nodes\n" +#printf "Creating device nodes\n" mknod -m 666 $tmp/dev/zero c 1 5 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 mknod -m 666 $tmp/dev/tty0 c 4 0 -#mknod -m 660 $tmp/dev/hda b 3 0 -#mknod -m 660 $tmp/dev/hda1 b 3 1 mknod -m 666 $tmp/dev/ttyS0 c 4 64 umount $tmp diff --git a/scripts/ipkg-build b/scripts/ipkg-build index ec0e0cdef..a94593944 100644 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -98,7 +98,7 @@ You probably want to remove them: " >&2 [ "$?" -ne 0 ] && PKG_ERROR=1 if [ -z "$section" ]; then echo "The Section field should have one of the following values:" >&2 - echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, text, web, x11" >&2 + echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2 fi priority=`required_field Priority` diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index d897c0ef3..0c7550d8e 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -33,10 +33,8 @@ find $TARGETS -type f -a -exec file {} \; | \ T=$T$stripcomm case $line in *ELF*executable*statically\ linked*) - echo >&2 "$SELF: *WARNING* '$V' is not dynamically linked!" ;; *ELF*relocatable*,\ not\ stripped*) - echo >&2 "$SELF: *WARNING* '$V' is a relocatable!" ;; esac case $line in @@ -58,3 +56,4 @@ find $TARGETS -type f -a -exec file {} \; | \ echo "-> $T $F" eval "$T $F" done +exit 0 diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 3e8478244..a1e9e9440 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -33,10 +33,6 @@ if [[ -n $ADK_NATIVE ]];then fi fi -if [[ -n $ADK_PACKAGE_RUBY ]]; then - NEED_RUBY="$NEED_RUBY ruby" -fi - if [[ -n $ADK_PACKAGE_LIBUSB ]]; then NEED_BISON="$NEED_BISON libusb" fi @@ -94,6 +90,14 @@ if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_75DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-75dpi" fi +if [[ -n $ADK_PACKAGE_FONT_ADOBE_100DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-100dpi" +fi + +if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi" +fi + if [[ -n $NEED_GETTEXT ]]; then if ! which xgettext >/dev/null 2>&1; then echo >&2 You need gettext to build $NEED_GETTEXT diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 743f316b0..56b79663d 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -47,12 +47,7 @@ CYG*) echo 'See http://www.cygwin.com/1.7/cygwin-ug-net/using-specialnames.html' ;; NetBSD) - echo "Building OpenADK on $os is currently unsupported." - echo "Sorry." - echo - echo There are unresolved issues relating to ncurses not - echo being included in NetBSD®, and these provided by pkgsrc® - echo lack important header files. + # supported with no extra quirks at the moment ;; OpenBSD) # supported with no extra quirks at the moment @@ -191,13 +186,12 @@ if [[ $X != *@(Native compiler works)* ]]; then out=1 fi -[[ -s /usr/include/ncurses.h ]] || if [[ -s /usr/pkg/include/ncurses.h ]]; then - echo 'HOSTCFLAGS+= -isystem /usr/pkg/include' >>$topdir/prereq.mk - echo 'HOSTLDFLAGS+=-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib' >>$topdir/prereq.mk -else - echo Install ncurses header files, please. - echo - out=1 +if [[ ! -s /usr/include/ncurses.h ]]; then + if [[ ! -s /usr/include/curses.h ]]; then + echo Install ncurses header files, please. + echo + out=1 + fi fi if ! which gawk >/dev/null 2>&1; then diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index 07cdd5838..f5d2db07f 100644 --- a/scripts/split-cfg.sh +++ b/scripts/split-cfg.sh @@ -4,13 +4,15 @@ # ses the slow-down. TOPDIR=$1 +TARGET=$2 +LIBC=$3 (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar grep -v '^BUSYBOX\|^# BUSYBOX' $TOPDIR/.config > $TOPDIR/.config.split -mkdir -p $TOPDIR/.cfg -cd $TOPDIR/.cfg +mkdir -p $TOPDIR/.cfg_${TARGET}_${LIBC} +cd $TOPDIR/.cfg_${TARGET}_${LIBC} oldfiles=$(print -r -- *) newfiles=: @@ -60,28 +62,22 @@ for oldfile in $oldfiles; do done print -nu2 '\r' -# now scan for dependencies of packages; the information -# should probably be in build_mipsel because it's generated -# at build time, but OTOH, soon enough, parts of Makefile -# and the entire Config.in will be auto-generated anyway, -# so we're better off placing it here -#XXX this is too slow @868 configure options -cd $TOPDIR/.cfg +# now handle package dependencies +cd $TOPDIR/.cfg_${TARGET}_${LIBC} rm -f $TOPDIR/package/*/info.mk for option in *; do pbar="$option ..." print -nu2 "$pbar\r" ao=: - fgrep -l $option $TOPDIR/package/*/{Makefile,Config.*} 2>&- | \ + fgrep -l $option $TOPDIR/package/*/Config.* 2>&- | \ while read line; do print -r -- ${line%/*}/info.mk done | while read fname; do [[ $ao = *:$fname:* ]] && continue ao=$ao$fname: - echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg/$option" >>$fname + if [ "$option" != "ADK_HAVE_DOT_CONFIG" ];then + echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname + fi done done -pbar=done -print -u2 "$pbar" - exit 0 diff --git a/scripts/tarpkg b/scripts/tarpkg index f2e5def9e..37c0b2079 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -10,10 +10,9 @@ if [ "$1" = "build" ];then pkgname=$(grep "^Package:" $2/CONTROL/control | sed -e "s/^[^:]*:[[:space:]]*//") version=$(grep "^Version:" $2/CONTROL/control | sed -e "s/^[^:]*:[[:space:]]*//") arch=$(grep "^Architecture:" $2/CONTROL/control | sed -e "s/^[^:]*:[[:space:]]*//") - mkdir -p ${2}/usr/lib/pkg for file in preinst postinst prerm postrm; do - [ ! -f $2/CONTROL/$file ] || ( cp $2/CONTROL/$file \ - ${2}/usr/lib/pkg/${pkgname}.$file && \ + [ ! -f $2/CONTROL/$file ] || ( mkdir -p ${2}/usr/lib/pkg && \ + cp $2/CONTROL/$file ${2}/usr/lib/pkg/${pkgname}.$file && \ chmod +x ${2}/usr/lib/pkg/${pkgname}.$file ) done rm -rf $2/CONTROL @@ -29,6 +28,7 @@ elif [ "$1" = "install" ];then IPKG_INSTROOT="$PKG_INSTROOT" ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst rm ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst fi + rm -rf ${PKG_INSTROOT}/usr/lib/pkg else echo "unknown command" exit 1 |