From 9e96117b552c19b78cc4f15922a124d1f3edc0c3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Jan 2010 11:20:55 +0100 Subject: remove unneeded directory after executing postinst scripts --- scripts/tarpkg | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/tarpkg b/scripts/tarpkg index f2e5def9e..bbb242a5e 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -29,6 +29,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 -- cgit v1.2.3 From 5df306b0c9d713021edd9d81ff8f37b5d7f01db5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Jan 2010 18:35:58 +0100 Subject: use target-libc combination for all builddirs IMPORTANT: do a make distclean before compiling after this commit. The directories for all build and bin directories changed, so that toolchains for different target-libc combinations can coexist. This might be usefule in the future for continous compiling after git commit, without rebuilding the toolchain. Rework busybox rebuild, when config changes. Not optimal, but at least working after this change to the directory structure. --- scripts/cpio | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 scripts/cpio (limited to 'scripts') diff --git a/scripts/cpio b/scripts/cpio new file mode 100755 index 000000000..2a12d4ffe --- /dev/null +++ b/scripts/cpio @@ -0,0 +1,5 @@ +#!/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. + +/bin/cpio --quiet "$@" -- cgit v1.2.3 From 74b82b8b841c83dd370d2109cb7d2ce2e2f8e00b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Jan 2010 22:03:39 +0100 Subject: fix eglibc dev package and group alix/wrap devices --- scripts/scan-pkgs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scripts') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 3e8478244..b96a92e8f 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -94,6 +94,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 -- cgit v1.2.3 From f991debebbd17225a6302b7bcd51101b0f41a621 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Feb 2010 00:27:07 +0100 Subject: finetune make bulk add bulk targets for allmodconfig/allconfig. add more targets to the bulk list. use a separate .cfg directory for target-libc combinations. --- scripts/split-cfg.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index 07cdd5838..297d42beb 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=: @@ -66,7 +68,7 @@ print -nu2 '\r' # 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 +cd $TOPDIR/.cfg_${TARGET}_${LIBC} rm -f $TOPDIR/package/*/info.mk for option in *; do pbar="$option ..." @@ -78,7 +80,7 @@ for option in *; do done | while read fname; do [[ $ao = *:$fname:* ]] && continue ao=$ao$fname: - echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg/$option" >>$fname + echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname done done pbar=done -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- scripts/create-image.sh | 8 +++----- scripts/tarpkg | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/create-image.sh b/scripts/create-image.sh index 96a96ced8..ce3873792 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -72,8 +72,8 @@ else fi -printf "Generate qemu image\n" -$qimg create -f raw $1 512M >/dev/null +printf "Generate qemu image (2 GB)\n" +$qimg create -f raw $1 2048M >/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/tarpkg b/scripts/tarpkg index bbb242a5e..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 -- cgit v1.2.3 From a619c16fa72c3c15a198b452e512a08f18251930 Mon Sep 17 00:00:00 2001 From: wbx Date: Tue, 9 Feb 2010 00:17:46 +0100 Subject: add support for netbsd. just minor fixes needed. --- scripts/cpio | 12 +++++++++++- scripts/rstrip.sh | 1 + scripts/scan-tools.sh | 20 +++++++------------- 3 files changed, 19 insertions(+), 14 deletions(-) (limited to 'scripts') diff --git a/scripts/cpio b/scripts/cpio index 2a12d4ffe..85c12ed18 100755 --- a/scripts/cpio +++ b/scripts/cpio @@ -2,4 +2,14 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -/bin/cpio --quiet "$@" +os=$(uname) +case $os in + NetBSD|MirBSD) + quiet="" + ;; + *) + quiet="--quiet" + ;; +esac + +/bin/cpio $quiet "$@" diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index d897c0ef3..591c5bb07 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -58,3 +58,4 @@ find $TARGETS -type f -a -exec file {} \; | \ echo "-> $T $F" eval "$T $F" done +exit 0 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 -- cgit v1.2.3 From 91e7244abc54001dc7b1063cd1b9818d46128bba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 9 Feb 2010 00:25:56 +0100 Subject: freebsd cpio is in /usr/bin --- scripts/cpio | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cpio b/scripts/cpio index 2a12d4ffe..fc671ca48 100755 --- a/scripts/cpio +++ b/scripts/cpio @@ -2,4 +2,8 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -/bin/cpio --quiet "$@" +if [ -x /usr/bin/cpio ];then + /usr/bin/cpio --quiet "$@" +else + /bin/cpio --quiet "$@" +fi -- cgit v1.2.3 From 7fab693c5c07f094a50f3686ad1fae6353f1161b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 10 Feb 2010 19:08:45 +0100 Subject: disable debug --- scripts/tarpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/tarpkg b/scripts/tarpkg index 6eca63a6f..37c0b2079 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -1,6 +1,6 @@ #!/usr/bin/env bash # create/install compressed tar balls -set -x +#set -x if [ "$1" = "build" ];then if [ ! -d $2 ];then -- cgit v1.2.3 From a8c382023711b7662665cfbcb9167b7d6f191d9c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Feb 2010 21:04:38 +0100 Subject: fix compile on NetBSD --- scripts/scan-pkgs.sh | 4 ---- 1 file changed, 4 deletions(-) (limited to 'scripts') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b96a92e8f..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 -- cgit v1.2.3 From 990c7eddcdf768a9d63b407d177738b1271d633b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 12 Feb 2010 20:08:52 +0100 Subject: enable usb sound support add mpg123 console mp3 player. A terratec usb soundadapter works fine on alix2d device. (0ccd:0077 TerraTec Electronic GmbH) --- scripts/create-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/create-image.sh b/scripts/create-image.sh index ce3873792..b4824aea7 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -72,8 +72,8 @@ else fi -printf "Generate qemu image (2 GB)\n" -$qimg create -f raw $1 2048M >/dev/null +printf "Generate qemu image (512 MB)\n" +$qimg create -f raw $1 512M >/dev/null printf "Creating filesystem $filesystem\n" -- cgit v1.2.3 From 69ed32e297a10a4d690abe842fdd8a78843d7f28 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 Feb 2010 20:18:52 +0100 Subject: add cvs package, add half-ready bzr package --- scripts/ipkg-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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` -- cgit v1.2.3 From 42675af37cb5ce735452311734cc5b88a66d6d9d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Feb 2010 00:38:14 +0100 Subject: complete allmodconfig build on NetBSD --- scripts/cpio | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cpio b/scripts/cpio index 1c481221e..0b406f712 100755 --- a/scripts/cpio +++ b/scripts/cpio @@ -16,4 +16,3 @@ if [ -x /usr/bin/cpio ];then else /bin/cpio $quiet "$@" fi - -- cgit v1.2.3 From 55c0efbdbd7d1e1673fed1b036997a8bed52e704 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Feb 2010 16:03:51 +0100 Subject: fix recompile BUG of PKG_MULTI packages --- scripts/rstrip.sh | 2 -- scripts/split-cfg.sh | 16 +++++----------- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 591c5bb07..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 diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index 297d42beb..f5d2db07f 100644 --- a/scripts/split-cfg.sh +++ b/scripts/split-cfg.sh @@ -62,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 +# 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_${TARGET}_${LIBC}/$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 -- cgit v1.2.3