From 8d5c4b91f9b4c03855bad079d4f125fa6e805e72 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Dec 2013 13:18:38 +0200 Subject: [PATCH 1/3] config/functions: add get_build_dir() --- config/functions | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/config/functions b/config/functions index f6964b08d8..a87c9ac35e 100644 --- a/config/functions +++ b/config/functions @@ -65,6 +65,20 @@ kernel_path() { echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION} } +# get package's build dir +get_build_dir() { + if [ ! -z $1 ] ; then + local _PKG_DIR=$(find $ROOT/packages -name $1) + if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then + . $_PKG_DIR/package.mk + # TODO: remove + elif [ -d $_PKG_DIR -a -f $_PKG_DIR/meta ] ; then + . $_PKG_DIR/meta + fi + echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION} + fi +} + tolower(){ echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz } From 315bfbe49b31d9c11740ddbeb74fe9d3c2581bb5 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Dec 2013 13:18:55 +0200 Subject: [PATCH 2/3] vdr*: use get_build_dir() --- .../3rdparty/multimedia/vdr-control/package.mk | 12 +++++++----- .../3rdparty/multimedia/vdr-epgsearch/package.mk | 12 +++++++----- packages/3rdparty/multimedia/vdr-iptv/package.mk | 12 +++++++----- packages/3rdparty/multimedia/vdr-live/package.mk | 12 +++++++----- .../multimedia/vdr-plugin-dvbapi/package.mk | 16 +++++++++------- .../multimedia/vdr-plugin-streamdev/package.mk | 12 +++++++----- .../multimedia/vdr-plugin-vnsiserver/package.mk | 11 +++++++---- .../multimedia/vdr-plugin-xmltv2vdr/package.mk | 12 +++++++----- .../multimedia/vdr-plugin-xvdr/package.mk | 10 ++++++---- packages/3rdparty/multimedia/vdr-sc/package.mk | 12 +++++++----- .../multimedia/vdr-wirbelscan/package.mk | 12 +++++++----- .../multimedia/vdr-wirbelscancontrol/package.mk | 15 +++++++++------ 12 files changed, 87 insertions(+), 61 deletions(-) diff --git a/packages/3rdparty/multimedia/vdr-control/package.mk b/packages/3rdparty/multimedia/vdr-control/package.mk index a8ee16f2ba..39b005bc22 100644 --- a/packages/3rdparty/multimedia/vdr-control/package.mk +++ b/packages/3rdparty/multimedia/vdr-control/package.mk @@ -36,17 +36,19 @@ PKG_LONGDESC="vdr control plugin" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" export LDFLAGS="$LDFLAGS -fPIC" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk index 75145b3a91..9870e24c17 100644 --- a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk +++ b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk @@ -36,17 +36,19 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-iptv/package.mk b/packages/3rdparty/multimedia/vdr-iptv/package.mk index c058b96e6a..065215a52f 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/package.mk +++ b/packages/3rdparty/multimedia/vdr-iptv/package.mk @@ -36,17 +36,19 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" export LDFLAGS="$LDFLAGS -fPIC" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-live/package.mk b/packages/3rdparty/multimedia/vdr-live/package.mk index 82af8f2cb9..a2fdc7de46 100644 --- a/packages/3rdparty/multimedia/vdr-live/package.mk +++ b/packages/3rdparty/multimedia/vdr-live/package.mk @@ -36,11 +36,6 @@ PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plu PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" @@ -52,6 +47,13 @@ pre_make_target() { MAKEFLAGS=-j1 } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk index aad7542bb9..d8c225953c 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk @@ -36,13 +36,6 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - VDRSRC=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\" \ - LIBDVBCSA=1" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" @@ -55,6 +48,15 @@ pre_make_target() { MAKEFLAGS=-j1 } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + VDRSRC=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" \ + LIBDVBCSA=1 +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk index 5e986d1c05..638695fe0c 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk @@ -36,17 +36,19 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" export LDFLAGS="$LDFLAGS -fPIC" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk index d86da0243f..2afda97f69 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk @@ -36,16 +36,19 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" export LDFLAGS="$LDFLAGS -fPIC" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk index e777cff437..f3f1ce5c44 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk @@ -36,17 +36,19 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" export LDFLAGS="$LDFLAGS -fPIC" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + post_make_target() { cd dist/epgdata2xmltv make -j1 diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk index aca1ceb0eb..51a45ba7fa 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk +++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk @@ -36,10 +36,12 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} makeinstall_target() { : # installation not needed, done by create-addon script diff --git a/packages/3rdparty/multimedia/vdr-sc/package.mk b/packages/3rdparty/multimedia/vdr-sc/package.mk index c9be34e33c..885eb75349 100644 --- a/packages/3rdparty/multimedia/vdr-sc/package.mk +++ b/packages/3rdparty/multimedia/vdr-sc/package.mk @@ -36,11 +36,6 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_make_target() { # dont build parallel MAKEFLAGS=-j1 @@ -55,6 +50,13 @@ pre_configure_target() { export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk index 21a7dabd3c..fbda828796 100644 --- a/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk +++ b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk @@ -36,17 +36,19 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" export LDFLAGS="$LDFLAGS -fPIC" } +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + makeinstall_target() { : # installation not needed, done by create-addon script } diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk index 29a5efecb6..6e4c47b005 100644 --- a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk +++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk @@ -37,11 +37,6 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -VDR_DIR=$(basename $BUILD/vdr-[0-9]*) -PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ - LIBDIR=\".\" \ - LOCALEDIR=\"./locale\"" - pre_configure_target() { export CFLAGS="$CFLAGS -fPIC" export CXXFLAGS="$CXXFLAGS -fPIC" @@ -49,7 +44,15 @@ pre_configure_target() { } pre_build_target() { - ln -sf $ROOT/$BUILD/vdr-wirbelscan-[0-9]*/wirbelscan_services.h $PKG_BUILD + WIRBELSCAN_DIR=$(get_build_dir vdr-wirbelscan) + ln -sf $WIRBELSCAN_DIR/wirbelscan_services.h $PKG_BUILD +} + +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" } makeinstall_target() { From debacf21aea9ec7b79710d0e8271e815d394119a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 13 Dec 2013 14:07:31 +0200 Subject: [PATCH 3/3] buildsystem: clean up and cosmetics --- config/path | 12 +-------- scripts/build | 72 +++++++++++++++---------------------------------- scripts/install | 26 ------------------ scripts/unpack | 1 - 4 files changed, 23 insertions(+), 88 deletions(-) diff --git a/config/path b/config/path index 913a60282b..1e6dc1ae4f 100644 --- a/config/path +++ b/config/path @@ -91,17 +91,7 @@ SED="sed -i" [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME" fi - if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}" - fi + PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}" XORG_PATH_DRI=/usr/lib/dri XORG_PATH_XKB=/usr/share/X11/xkb diff --git a/scripts/build b/scripts/build index cac6e261d1..70086ed0e8 100755 --- a/scripts/build +++ b/scripts/build @@ -50,10 +50,6 @@ STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET $SCRIPTS/unpack $PACKAGE_NAME -if [ -f $STAMP -a -f $PKG_DIR/need_build ]; then - $PKG_DIR/need_build $PACKAGE_NAME -fi - if [ -f $PKG_DIR/package.mk ]; then if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then rm -f $STAMP @@ -236,20 +232,6 @@ if [ ! -f $STAMP ]; then # virtual packages dont must be build, they only contains dependencies, so dont go further here if [ ! "$PKG_SECTION" = "virtual" ]; then - if [ -z "$PKG_BUILD" ]; then - if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}" - fi - fi - # configure other variables if [ "$TARGET" = "target" ]; then INSTALL=$ROOT/$PKG_BUILD/.install_pkg @@ -382,27 +364,29 @@ if [ ! -f $STAMP ]; then fi if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then - rm -rf $INSTALL/usr/include - rm -rf $INSTALL/usr/lib/pkgconfig - rm -rf $INSTALL/usr/share/aclocal - rm -rf $INSTALL/usr/share/bash-completion - rm -rf $INSTALL/usr/share/doc - rm -rf $INSTALL/usr/share/gtk-doc - rm -rf $INSTALL/usr/share/info - rm -rf $INSTALL/usr/share/locale - rm -rf $INSTALL/usr/share/man - rm -rf $INSTALL/usr/share/pkgconfig - find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true - find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true - find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true - find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true - find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true - find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true - find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true + if [ -d $INSTALL ] ; then + rm -rf $INSTALL/usr/include + rm -rf $INSTALL/usr/lib/pkgconfig + rm -rf $INSTALL/usr/share/aclocal + rm -rf $INSTALL/usr/share/bash-completion + rm -rf $INSTALL/usr/share/doc + rm -rf $INSTALL/usr/share/gtk-doc + rm -rf $INSTALL/usr/share/info + rm -rf $INSTALL/usr/share/locale + rm -rf $INSTALL/usr/share/man + rm -rf $INSTALL/usr/share/pkgconfig + find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true + find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true + find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true + find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true + find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true + find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true + find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true - if [ ! "$DEBUG" = yes ]; then - $STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found" - $STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found" + if [ ! "$DEBUG" = yes ]; then + $STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found" + $STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found" + fi fi fi @@ -420,18 +404,6 @@ if [ ! -f $STAMP ]; then $SCRIPTS/autoreconf $PACKAGE_NAME fi - if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}" - fi - if [ -f $PKG_DIR/build ]; then $PKG_DIR/build $@ >&$VERBOSE_OUT diff --git a/scripts/install b/scripts/install index 526ea4f56c..4a1d5b5ccc 100755 --- a/scripts/install +++ b/scripts/install @@ -114,21 +114,6 @@ if [ -f $PKG_DIR/package.mk ]; then # include buildfile . $PKG_DIR/package.mk - # set PKG_BUILD variable - if [ -z "$PKG_BUILD" ]; then - if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}" - fi - fi - # install if [ "$(type -t pre_install)" = "function" ]; then pre_install @@ -141,17 +126,6 @@ if [ -f $PKG_DIR/package.mk ]; then post_install fi elif [ -f $PKG_DIR/install ]; then - if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}" - elif [ -d "$BUILD/${PKG_NAME}" ]; then - PKG_BUILD="$BUILD/${PKG_NAME}" - fi $PKG_DIR/install $@ >&$VERBOSE_OUT fi diff --git a/scripts/unpack b/scripts/unpack index 2039499534..e604589eeb 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -29,7 +29,6 @@ fi $SCRIPTS/get $1 -PKG_BUILD="$BUILD/$PKG_NAME-$PKG_VERSION" STAMP=$PKG_BUILD/.openelec-unpack mkdir -p $BUILD