From 68bb17312be33ae09255737dde26a93663cfc2ba Mon Sep 17 00:00:00 2001 From: waldemar brodkorb Date: Wed, 20 Jan 2010 21:31:08 +0100 Subject: fix allmodconfig for foxboard --- scripts/scan-pkgs.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index fcc64ac94..9af693c08 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -31,9 +31,6 @@ if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then NEED_RPM="$NEED_RPM rpm" fi - if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_GXX="$NEED_GXX squid" - fi fi if [[ -n $ADK_PACKAGE_RUBY ]]; then @@ -58,6 +55,7 @@ fi if [[ -n $ADK_PACKAGE_SQUID ]]; then NEED_SSLDEV="$NEED_SSLDEV squid" + NEED_GXX="$NEED_GXX squid" fi if [[ -n $ADK_PACKAGE_DANSGUARDIAN ]]; then -- cgit v1.2.3 From 6901993922da7eaa5253316f295f71b3b0e5db27 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Jan 2010 20:04:39 +0100 Subject: add some font packages --- scripts/scan-pkgs.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'scripts') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 9af693c08..b546e5f8c 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -86,6 +86,10 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi +if [[ -n $ADK_PACKAGE_FONT-BITSTREAM-100DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" +fi + if [[ -n $NEED_GETTEXT ]]; then if ! which xgettext >/dev/null 2>&1; then echo >&2 You need gettext to build $NEED_GETTEXT @@ -114,6 +118,13 @@ if [[ -n $NEED_SSLDEV ]]; then fi fi +if [[ -n $NEED_MKFONTDIR ]]; then + if ! which mkfontdir >/dev/null 2>&1; then + echo >&2 You need mkfontdir to build $NEED_MKFONTDIR + out=1 + fi +fi + if [[ -n $NEED_INTL ]]; then if ! which intltool-update >/dev/null 2>&1; then echo >&2 You need intltool-update to build $NEED_INTL -- cgit v1.2.3 From 058a90c3d2c4ffcd92b1bc7d0e92330277e02442 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 26 Jan 2010 19:53:08 +0100 Subject: check for mkfs utils --- scripts/create-image.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'scripts') diff --git a/scripts/create-image.sh b/scripts/create-image.sh index 4a23b49cf..96a96ced8 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -24,6 +24,16 @@ if [ $(id -u) -ne 0 ];then exit 1 fi +printf "Checking if mkfs is installed" +mkfs=$(which mkfs.$filesystem) + +if [ ! -z $mkfs -a -x $mkfs ];then + printf "...okay\n" +else + printf "...failed\n" + exit 1 +fi + printf "Checking if parted is installed" parted=$(which parted) -- cgit v1.2.3 From 34cb56011259bc83ff5915954b65626084fe6b98 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 26 Jan 2010 19:53:24 +0100 Subject: fix package depends --- scripts/scan-pkgs.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b546e5f8c..3e8478244 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -86,10 +86,14 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi -if [[ -n $ADK_PACKAGE_FONT-BITSTREAM-100DPI ]]; then +if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" fi +if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_75DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-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 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