jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 23:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/unpack: move $BUILD/.stamps/unpack to $PKG_BUILD/.openelec-unpack. Add support for PKG_SOURCE_DIR: if set this automatically rename extracted sourcefolders to the $PKG_NAME-$PKG_VERSION format. Remove support for the already deprecated and not more used $PKG_DIR/rename scripts. Deprecate post_unpack() function. Cleanup.

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-12-05 01:02:48 +01:00
parent 5afca2377d
commit 8c6667b5fb
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/unpack
View File

@ -29,13 +29,13 @@ fi
$SCRIPTS/get $1 $SCRIPTS/get $1
PKG_BUILD="$BUILD/$PKG_NAME-$PKG_VERSION"
STAMP=$PKG_BUILD/.openelec-unpack
mkdir -p $BUILD mkdir -p $BUILD
[ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0 [ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
mkdir -p $STAMPS/$1
STAMP=$STAMPS/$1/unpack
[ -f "$STAMP" -a -f "$PKG_DIR/need_unpack" ] && $PKG_DIR/need_unpack $@ [ -f "$STAMP" -a -f "$PKG_DIR/need_unpack" ] && $PKG_DIR/need_unpack $@
# trigger unpack / full rebuild on any package.mk change # trigger unpack / full rebuild on any package.mk change
@ -57,11 +57,7 @@ done
printf "%${BUILD_INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT printf "%${BUILD_INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
rm -rf $BUILD/$1[-_][0-9]* rm -rf $BUILD/$PKG_NAME-$PKG_VERSION
rm -rf $BUILD/$1[-_]r[0-9]*
rm -rf $BUILD/$1[-_]cvs*
rm -rf $BUILD/$1[-_]svn*
rm -rf $BUILD/$1[-_]git*
if [ -n "$PKG_URL" ]; then if [ -n "$PKG_URL" ]; then
$SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
@ -73,37 +69,28 @@ if [ -n "$PKG_URL" ]; then
$SCRIPTS/extract $1 "$1*.7z" $BUILD $SCRIPTS/extract $1 "$1*.7z" $BUILD
fi fi
if [ -n "$PKG_SOURCE_DIR" ]; then
mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
fi
# post_unpack() : Formerly used to replace $PKG_DIR/rename, now replaced by
# $PKG_SOURCE_DIR . Keep this here for other usage or remove later
if [ -f $PKG_DIR/package.mk ]; then if [ -f $PKG_DIR/package.mk ]; then
# unset functions # unset functions
unset -f post_unpack unset -f post_unpack
. $PKG_DIR/package.mk . $PKG_DIR/package.mk
# post_unpack (replaces PKG_DIR/rename)
if [ "$(type -t post_unpack)" = "function" ]; then if [ "$(type -t post_unpack)" = "function" ]; then
post_unpack post_unpack
fi fi
fi fi
[ -f "$PKG_DIR/rename" ] && $PKG_DIR/rename $@ >&$VERBOSE_OUT
if [ -d "$PKG_DIR/sources" ]; then if [ -d "$PKG_DIR/sources" ]; then
[ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION} [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION} cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
fi 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
for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do
if [ -f "$i" ]; then if [ -f "$i" ]; then
PATCH=`basename $i` PATCH=`basename $i`