From 2456e366fc984baea4376bce138c43ef63f8e6fc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 1/7] unpack: alter logic so that packages without sources have a stamp --- scripts/unpack | 256 +++++++++++++++++++++++++------------------------ 1 file changed, 130 insertions(+), 126 deletions(-) diff --git a/scripts/unpack b/scripts/unpack index 088f728eee..3967cc5384 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -36,8 +36,6 @@ STAMP=$PKG_BUILD/.libreelec-unpack mkdir -p $BUILD -[ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0 - STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME" [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" @@ -60,145 +58,151 @@ fi [ -f "$STAMP" ] && exit 0 -printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor} $1\n" ' '>&$SILENT_OUT -export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) +if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then + printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor} $1\n" ' '>&$SILENT_OUT + export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) -# unset functions -unset -f pre_unpack -unset -f unpack -unset -f post_unpack -unset -f pre_patch -unset -f post_patch + # unset functions + unset -f pre_unpack + unset -f unpack + unset -f post_unpack + unset -f pre_patch + unset -f post_patch -. $PKG_DIR/package.mk + . $PKG_DIR/package.mk -if [ "$(type -t pre_unpack)" = "function" ]; then - pre_unpack -fi - -if [ "$(type -t unpack)" = "function" ]; then - unpack -else - if [ -n "$PKG_URL" ]; then - $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD - $SCRIPTS/extract $1 "$1*.tbz" $BUILD - $SCRIPTS/extract $1 "$1*.tar.gz" $BUILD - $SCRIPTS/extract $1 "$1*.tar.xz" $BUILD - $SCRIPTS/extract $1 "$1*.txz" $BUILD - $SCRIPTS/extract $1 "$1*.tgz" $BUILD - $SCRIPTS/extract $1 "$1*.7z" $BUILD - $SCRIPTS/extract $1 "$1*.zip" $BUILD + if [ "$(type -t pre_unpack)" = "function" ]; then + pre_unpack fi -fi -if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then - if [ -n "$PKG_SOURCE_DIR" ]; then - mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION - elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then - mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION + if [ "$(type -t unpack)" = "function" ]; then + unpack + else + if [ -n "$PKG_URL" ]; then + $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD + $SCRIPTS/extract $1 "$1*.tbz" $BUILD + $SCRIPTS/extract $1 "$1*.tar.gz" $BUILD + $SCRIPTS/extract $1 "$1*.tar.xz" $BUILD + $SCRIPTS/extract $1 "$1*.txz" $BUILD + $SCRIPTS/extract $1 "$1*.tgz" $BUILD + $SCRIPTS/extract $1 "$1*.7z" $BUILD + $SCRIPTS/extract $1 "$1*.zip" $BUILD + fi fi -fi -if [ -d "$PKG_DIR/sources" ]; then - [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION} - cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION} -fi + if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then + if [ -n "$PKG_SOURCE_DIR" ]; then + mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION + elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then + mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION + fi + fi -if [ -z "$PKG_URL" ]; then - mkdir -p "${BUILD}/${PKG_NAME}-${PKG_VERSION}" -fi + if [ -d "$PKG_DIR/sources" ]; then + [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION} + cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION} + fi -if [ "$(type -t post_unpack)" = "function" ]; then - post_unpack -fi + if [ -z "$PKG_URL" ]; then + mkdir -p "${BUILD}/${PKG_NAME}-${PKG_VERSION}" + fi -if [ "$(type -t pre_patch)" = "function" ]; then - pre_patch -fi + if [ "$(type -t post_unpack)" = "function" ]; then + post_unpack + fi -if [ "$TARGET_ARCH" = "x86_64" ]; then - PATCH_ARCH="x86" -else - PATCH_ARCH="$TARGET_ARCH" -fi + if [ "$(type -t pre_patch)" = "function" ]; then + pre_patch + fi -PATCH_DIRS_PKG="" -PATCH_DIRS_PRJ="" -if [ -n "$PKG_PATCH_DIRS" ]; then - for patch_dir in $PKG_PATCH_DIRS; do - [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch" - [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch" + if [ "$TARGET_ARCH" = "x86_64" ]; then + PATCH_ARCH="x86" + else + PATCH_ARCH="$TARGET_ARCH" + fi + + PATCH_DIRS_PKG="" + PATCH_DIRS_PRJ="" + if [ -n "$PKG_PATCH_DIRS" ]; then + for patch_dir in $PKG_PATCH_DIRS; do + [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch" + [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch" + done + fi + + for i in $PKG_DIR/patches/$PKG_NAME-*.patch \ + $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \ + $PATCH_DIRS_PKG \ + $PKG_DIR/patches/$PKG_VERSION/*.patch \ + $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \ + $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \ + $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \ + $PATCH_DIRS_PRJ \ + $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \ + $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do + + thisdir="$(dirname "$i")" + + if [ "$thisdir" = "$PKG_DIR/patches" ]; then + PATCH_DESC="(common)" + elif [ "$thisdir" = "$PKG_DIR/patches/$PATCH_ARCH" ]; then + PATCH_DESC="(common - $PATCH_ARCH)" + elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION" ]; then + PATCH_DESC="(common - $PKG_VERSION)" + elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then + PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)" + elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then + PATCH_DESC="(project)" + elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then + PATCH_DESC="(project - $PATCH_ARCH)" + elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then + PATCH_DESC="(project - $PKG_VERSION)" + elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then + PATCH_DESC="(device)" + else + if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then + PATCH_DESC="(common - $(basename "$thisdir"))" + elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then + PATCH_DESC="(project - $(basename "$thisdir"))" + else + PATCH_DESC="(unknown - $(basename "$thisdir"))" + fi + fi + + if [ -f "$i" ]; then + printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor} ${i#$ROOT/}\n" ' '>&$SILENT_OUT + if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then + cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn --unsafe-paths >&$VERBOSE_OUT + else + cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT + fi + fi + done + + if [ "$(type -t post_patch)" = "function" ]; then + post_patch + fi + + for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do + if [ ! "$PKG_NAME" == "configtools" ] ; then + printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor} $config\n" ' ' + + [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \ + cp -f $TOOLCHAIN/configtools/config.guess $config + [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \ + cp -f $TOOLCHAIN/configtools/config.sub $config + fi done fi -for i in $PKG_DIR/patches/$PKG_NAME-*.patch \ - $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \ - $PATCH_DIRS_PKG \ - $PKG_DIR/patches/$PKG_VERSION/*.patch \ - $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \ - $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \ - $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \ - $PATCH_DIRS_PRJ \ - $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \ - $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do +if [ "$PKG_SECTION" != "virtual" ]; then + mkdir -p $PKG_BUILD - thisdir="$(dirname "$i")" + rm -f $STAMPS/$1/build_* - if [ "$thisdir" = "$PKG_DIR/patches" ]; then - PATCH_DESC="(common)" - elif [ "$thisdir" = "$PKG_DIR/patches/$PATCH_ARCH" ]; then - PATCH_DESC="(common - $PATCH_ARCH)" - elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION" ]; then - PATCH_DESC="(common - $PKG_VERSION)" - elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then - PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)" - elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then - PATCH_DESC="(project)" - elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then - PATCH_DESC="(project - $PATCH_ARCH)" - elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then - PATCH_DESC="(project - $PKG_VERSION)" - elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then - PATCH_DESC="(device)" - else - if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then - PATCH_DESC="(common - $(basename "$thisdir"))" - elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then - PATCH_DESC="(project - $(basename "$thisdir"))" - else - PATCH_DESC="(unknown - $(basename "$thisdir"))" - fi - fi - - if [ -f "$i" ]; then - printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor} ${i#$ROOT/}\n" ' '>&$SILENT_OUT - if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then - cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn --unsafe-paths >&$VERBOSE_OUT - else - cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT - fi - fi -done - -if [ "$(type -t post_patch)" = "function" ]; then - post_patch + PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1) + for i in PKG_NAME PKG_DEEPMD5; do + eval val=\$$i + echo "STAMP_$i=\"$val\"" >> $STAMP + done fi - -for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do - if [ ! "$PKG_NAME" == "configtools" ] ; then - printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor} $config\n" ' ' - - [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \ - cp -f $TOOLCHAIN/configtools/config.guess $config - [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \ - cp -f $TOOLCHAIN/configtools/config.sub $config - fi -done - -rm -f $STAMPS/$1/build_* - -PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1) -for i in PKG_NAME PKG_DEEPMD5; do - eval val=\$$i - echo "STAMP_$i=\"$val\"" >> $STAMP -done From e32fdc8cbff94c6b13b1c3b03dd534fdb038ee6e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 2/7] TexturePacker/JsonSchemaBuilder: we have stamps, don't clean unless required --- packages/mediacenter/JsonSchemaBuilder/package.mk | 4 ---- packages/mediacenter/TexturePacker/package.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk index 2640d0be1e..017d47621d 100644 --- a/packages/mediacenter/JsonSchemaBuilder/package.mk +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk @@ -34,10 +34,6 @@ PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/JsonSchemaB PKG_CMAKE_OPTS_HOST="-Wno-dev" -pre_build_host() { - $SCRIPTS/clean $PKG_NAME -} - makeinstall_host() { mkdir -p $TOOLCHAIN/bin cp JsonSchemaBuilder $TOOLCHAIN/bin diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk index d9b725f4f4..fa044ccbf8 100644 --- a/packages/mediacenter/TexturePacker/package.mk +++ b/packages/mediacenter/TexturePacker/package.mk @@ -35,10 +35,6 @@ PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/TexturePack PKG_CMAKE_OPTS_HOST="-Wno-dev" -pre_build_host() { - $SCRIPTS/clean $PKG_NAME -} - pre_configure_host() { export CXXFLAGS="$CXXFLAGS -std=c++11 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir $MEDIACENTER)/xbmc/linux" } From 0c95a0bc26f8e4ae4454b7155eee1e13fc15f731 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 3/7] kodi-theme-Estuary: add missing PKG_NEED_UNPACK --- packages/mediacenter/kodi-theme-Estuary/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk index 10a17d9b71..e2a1e405dd 100644 --- a/packages/mediacenter/kodi-theme-Estuary/package.mk +++ b/packages/mediacenter/kodi-theme-Estuary/package.mk @@ -23,6 +23,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="" PKG_DEPENDS_TARGET="toolchain kodi" +PKG_NEED_UNPACK="$ROOT/packages/mediacenter/$MEDIACENTER/package.mk" PKG_SECTION="mediacenter" PKG_SHORTDESC="kodi-theme-Estuary: Kodi Mediacenter default theme" PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center and XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." From bdcd5bc4056573983858c4301cff1da3cc936f26 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 4/7] build/unpack: eliminate eval --- scripts/build | 3 +-- scripts/unpack | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/build b/scripts/build index fd6050a8ff..ae818a63e6 100755 --- a/scripts/build +++ b/scripts/build @@ -388,7 +388,6 @@ if [ ! -f $STAMP ]; then PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1) for i in PKG_NAME PKG_DEEPMD5; do - eval val=\$$i - echo "STAMP_$i=\"$val\"" >> $STAMP + echo "STAMP_$i=\"${!i}\"" >> $STAMP done fi diff --git a/scripts/unpack b/scripts/unpack index 3967cc5384..88b8160c6b 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -202,7 +202,6 @@ if [ "$PKG_SECTION" != "virtual" ]; then PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1) for i in PKG_NAME PKG_DEEPMD5; do - eval val=\$$i - echo "STAMP_$i=\"$val\"" >> $STAMP + echo "STAMP_$i=\"${!i}\"" >> $STAMP done fi From 895122eb66e19c073f4aa5663856d7f07b19b914 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 5/7] unpack: avoid unecessary disk io --- scripts/unpack | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/unpack b/scripts/unpack index 88b8160c6b..4c34d7738f 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -39,9 +39,9 @@ mkdir -p $BUILD STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME" [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" -for i in $BUILD/$1-*; do - if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then - . "$i/.libreelec-unpack" +if [ -d "$PKG_BUILD" ]; then + if [ -f "$STAMP" ] ; then + . "$STAMP" if [ "$STAMP_PKG_NAME" = "$1" ]; then PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1) if [ ! "$PKG_DEEPMD5" = "$STAMP_PKG_DEEPMD5" ] ; then @@ -49,7 +49,7 @@ for i in $BUILD/$1-*; do fi fi fi -done +fi if [ -d "$PKG_BUILD" -a ! -f "$STAMP" ]; then # stale pkg build dir From 7bc2ed47020213ff2db0cead266040f33286d159 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 6/7] clean: avoid unecessary disk io --- scripts/clean | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/clean b/scripts/clean index ac72cf1752..6187f61597 100755 --- a/scripts/clean +++ b/scripts/clean @@ -29,19 +29,21 @@ clean_package() { return fi - for i in $BUILD/$1-*; do - if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then - . "$i/.libreelec-unpack" + STAMP=$PKG_BUILD/.libreelec-unpack + + if [ -d "$PKG_BUILD" ]; then + if [ -f "$STAMP" ] ; then + . "$STAMP" if [ "$STAMP_PKG_NAME" = "$1" ]; then - printf "%${BUILD_INDENT}c ${boldred}*${endcolor} ${red}Removing $i ...${endcolor}\n" ' '>&$SILENT_OUT - rm -rf $i + printf "%${BUILD_INDENT}c ${boldred}*${endcolor} ${red}Removing $PKG_BUILD ...${endcolor}\n" ' '>&$SILENT_OUT + rm -rf "$PKG_BUILD" fi else # force clean if no stamp found (previous unpack failed) - printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT - rm -rf $i + printf "%${BUILD_INDENT}c * Removing $PKG_BUILD ...\n" ' '>&$SILENT_OUT + rm -rf "$PKG_BUILD" fi - done + fi rm -f $STAMPS/$1/build_* } From d94dace814d15ff5f91dc6251af4c22e7487f5fe Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 Feb 2017 11:42:08 +0000 Subject: [PATCH 7/7] unpack: avoid yet more wildcard io --- scripts/unpack | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/unpack b/scripts/unpack index 4c34d7738f..28bd13bf37 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -183,16 +183,16 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then post_patch fi - for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do - if [ ! "$PKG_NAME" == "configtools" ] ; then + if [ ! "$PKG_NAME" == "configtools" ] ; then + for config in `find $PKG_BUILD -name config.guess | sed 's/config.guess//'`; do printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor} $config\n" ' ' [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \ cp -f $TOOLCHAIN/configtools/config.guess $config [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \ cp -f $TOOLCHAIN/configtools/config.sub $config - fi - done + done + fi fi if [ "$PKG_SECTION" != "virtual" ]; then