diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create.sh | 15 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 181 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 6 | ||||
| -rwxr-xr-x | scripts/update-sys | 11 |
4 files changed, 7 insertions, 206 deletions
diff --git a/scripts/create.sh b/scripts/create.sh index f5309f884..505549247 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -2,7 +2,7 @@ #- # Copyright © 2010, 2011, 2012 # Thorsten Glaser <tg@mirbsd.org> -# Copyright © 2010, 2011 +# Copyright © 2010-2014 # Waldemar Brodkorb <wbx@openadk.org> # # Provided that these terms and disclaimer and all copyright notices @@ -36,19 +36,6 @@ case :$PATH: in (*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;; esac -test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then - make package=mksh fetch || exit 1 - df=mksh-R48b.tgz - rm -rf build_mksh - mkdir -p build_mksh - gzip -dc dl/"$df" | (cd build_mksh; cpio -mid) - cd build_mksh/mksh - bash Build.sh -r -c lto || bash Build.sh -r || exit 1 - cp mksh "$TOPDIR"/bin - cd "$TOPDIR" - rm -rf build_mksh -fi - test -n "$KSH_VERSION" || exec mksh "$me" "$@" if test -z "$KSH_VERSION"; then echo >&2 Fatal error: could not run myself with mksh! diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 13f5deec7..8af04795b 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -23,44 +23,6 @@ out=0 . $topdir/.config -if [[ -n $ADK_NATIVE ]];then - if [[ -n $ADK_PACKAGE_NEON ]];then - NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon" - fi - if [[ -n $ADK_PACKAGE_LZOP ]];then - NEED_LZODEV="$NEED_LZODEV lzop" - fi - if [[ -n $ADK_PACKAGE_LIBIMAGEMAGICK ]];then - NEED_JPEGDEV="$NEED_JPEGDEV libimagemagick" - NEED_TIFFDEV="$NEED_TIFFDEV libimagemagick" - fi - if [[ -n $ADK_PACKAGE_DISPLAY ]];then - NEED_X11DEV="$NEED_X11DEV display" - NEED_XEXTDEV="$NEED_XEXTDEV display" - fi - if [[ -n $ADK_PACKAGE_GIT ]];then - NEED_CURLDEV="$NEED_CURLDEV git" - fi - if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then - NEED_RPM="$NEED_RPM rpm" - fi - if [[ -n $ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL ]]; then - NEED_LIBSSLDEV="$NEED_LIBSSLDEV wpa_supplicant" - fi - if [[ -n $ADK_COMPILE_BIND ]]; then - NEED_LIBSSLDEV="$NEED_LIBSSLDEV bind" - fi - if [[ -n $ADK_PACKAGE_IW ]]; then - NEED_LIBNLDEV="$NEED_LIBNLDEV iw" - fi - if [[ -n $ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS ]]; then - NEED_LIBKRB5DEV="$NEED_LIBKRB5DEV nfs-utils" - fi - if [[ -n $ADK_PACKAGE_NFS_UTILS_WITH_TIRPC ]]; then - NEED_LIBTIRPCDEV="$NEED_LIBTIRPCDEV nfs-utils" - fi -fi - if [[ -n $ADK_PACKAGE_XBMC ]]; then NEED_JAVA="$NEED_JAVA xbmc" fi @@ -73,10 +35,6 @@ if [[ -n $ADK_COMPILE_COROSYNC ]]; then NEED_GROFF="$NEED_GROFF corosync" fi -if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_GXX="$NEED_GXX squid" -fi - if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then NEED_XMLTO="$NEED_XMLTO libXfont" fi @@ -97,99 +55,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi" fi -if [[ -n $NEED_LIBTIRPCDEV ]];then - if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then - echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV - out=1 - fi -fi - -if [[ -n $NEED_LIBXML2_DEV ]];then - if ! test -f /usr/include/libxml2/libxml/xmlversion.h >/dev/null; then - echo >&2 You need libxml2 headers to build $NEED_LIBXML2_DEV - out=1 - fi -fi - -if [[ -n $NEED_LIBKRB5DEV ]];then - if ! test -f /usr/include/krb5.h >/dev/null; then - echo >&2 You need krb5 headers to build $NEED_LIBKRB5DEV - out=1 - fi -fi - -if [[ -n $NEED_CURLDEV ]];then - if ! test -f /usr/include/curl/curl.h >/dev/null; then - if ! test -f /usr/local/include/curl/curl.h >/dev/null; then - echo >&2 You need curl headers to build $NEED_CURLDEV - out=1 - fi - fi -fi - -if [[ -n $NEED_TIFFDEV ]];then - if ! test -f /usr/include/tiff.h >/dev/null; then - echo >&2 You need libtiff headers to build $NEED_TIFFDEV - out=1 - fi -fi - -if [[ -n $NEED_SDLDEV ]];then - if ! test -f /usr/include/SDL/SDL.h >/dev/null; then - echo >&2 You need libSDL headers to build $NEED_SDLDEV - out=1 - fi -fi - -if [[ -n $NEED_SDLIMAGEDEV ]];then - if ! test -f /usr/include/SDL/SDL_image.h >/dev/null; then - echo >&2 You need libSDL-image headers to build $NEED_SDLIMAGEDEV - out=1 - fi -fi - -if [[ -n $NEED_JPEGDEV ]];then - if ! test -f /usr/include/jpeglib.h >/dev/null; then - echo >&2 You need libjpeg headers to build $NEED_JPEGDEV - out=1 - fi -fi - -if [[ -n $NEED_LZODEV ]];then - if ! test -f /usr/include/lzo/lzo1.h >/dev/null; then - echo >&2 You need liblzo headers to build $NEED_LZODEV - out=1 - fi -fi - -if [[ -n $NEED_LIBNLDEV ]];then - if ! test -f /usr/include/netlink/netlink.h >/dev/null; then - echo >&2 You need libnl headers to build $NEED_LIBNLDEV - out=1 - fi -fi - -if [[ -n $NEED_X11DEV ]];then - if ! test -f /usr/include/X11/Xlib.h >/dev/null; then - echo >&2 You need X11 headers to build $NEED_X11DEV - out=1 - fi -fi - -if [[ -n $NEED_XEXTDEV ]];then - if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then - echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV - out=1 - fi -fi - -if [[ -n $NEED_LIBSSLDEV ]]; then - if ! test -f /usr/include/openssl/ssl.h >/dev/null; then - echo >&2 You need openssl headers to build $NEED_LIBSSLDEV - out=1 - fi -fi - if [[ -n $NEED_GROFF ]]; then if ! which groff >/dev/null 2>&1; then echo >&2 You need groff to build $NEED_GROFF @@ -204,24 +69,6 @@ if [[ -n $NEED_MKFONTDIR ]]; then fi fi -if [[ -n $NEED_WWW ]]; then - if ! which w3m >/dev/null 2>&1; then - if ! which lynx >/dev/null 2>&1; then - if ! which links >/dev/null 2>&1; then - echo >&2 You need w3m/links/lynx to build $NEED_WWW - out=1 - fi - fi - fi -fi - -if [[ -n $NEED_GXX ]]; then - if ! which g++ >/dev/null 2>&1; then - echo >&2 You need GNU c++ compiler to build $NEED_GXX - out=1 - fi -fi - if [[ -n $NEED_XKBCOMP ]]; then if ! which xkbcomp >/dev/null 2>&1; then echo >&2 You need xkbcomp to build $NEED_XKBCOMP @@ -229,27 +76,6 @@ if [[ -n $NEED_XKBCOMP ]]; then fi fi -if [[ -n $NEED_RPM ]]; then - if ! which rpmbuild >/dev/null 2>&1; then - echo >&2 You need rpmbuild to to use $NEED_RPM package backend - out=1 - fi -fi - -if [[ -n $NEED_XSLTPROC ]]; then - if ! which xsltproc >/dev/null 2>&1; then - echo >&2 You need xsltproc to build $NEED_XSLTPROC - out=1 - fi -fi - -if [[ -n $NEED_DBUSGLIB ]]; then - if ! which dbus-binding-tool >/dev/null 2>&1; then - echo >&2 You need dbus-binding-tool to build $NEED_DBUSGLIB - out=1 - fi -fi - if [[ -n $NEED_JAVA ]]; then if ! which java >/dev/null 2>&1; then echo >&2 You need java to build $NEED_JAVA @@ -257,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then fi fi -if [[ -n $ADK_USE_CCACHE ]]; then - if ! which ccache >/dev/null 2>&1; then - echo >&2 You have selected to build with ccache, but ccache could not be found. - out=1 - fi -fi - exit $out diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index af3223b0b..a7883cb24 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -201,6 +201,12 @@ if ! which xargs >/dev/null 2>&1; then out=1 fi +if ! which g++ >/dev/null 2>&1; then + echo "You need g++ (GNU C++ compiler) to continue." + echo + out=1 +fi + cd $topdir rm -rf tmp diff --git a/scripts/update-sys b/scripts/update-sys index 6c82dc626..47b73d52b 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -14,15 +14,6 @@ defaults() { exit 0 } -check_native() { - native=$(grep ^ADK_LINUX_NATIVE $topdir/.config) - if [ ! -z "$native" ];then - exit 0 - fi -} - -touch $topdir/target/config/Config.in.native - for i in $(ls $topdir/target/);do if [ -d "$topdir/target/$i/sys-enabled" ];then cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null @@ -30,8 +21,6 @@ for i in $(ls $topdir/target/);do done if [ -f $topdir/.config ];then -check_native - arch=$(grep ^ADK_TARGET_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') cpuarch=$(grep ^ADK_TARGET_CPU_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') systemsym=$(grep ^ADK_TARGET_SYSTEM_ $topdir/.config|cut -f 1 -d =) |