Merge pull request #1450 from MilhouseVH/fix_addon_cleanup

create_addon: add device support
This commit is contained in:
Christian Hewitt 2017-03-17 09:15:23 +04:00 committed by GitHub
commit 1be2754a86

View File

@ -119,7 +119,11 @@ pack_addon() {
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
if [ "$2" != "-test" ] ; then if [ "$2" != "-test" ] ; then
if [ -n "${DEVICE}" ]; then
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$DEVICE/$TARGET_ARCH/$PKG_ADDON_ID"
else
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID" ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"
fi
if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then
echo "*** WARNING: $PKG_ADDON_ID-$ADDONVER.zip already exists. not overwriting it ***" echo "*** WARNING: $PKG_ADDON_ID-$ADDONVER.zip already exists. not overwriting it ***"
return 0 return 0
@ -162,7 +166,11 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
$SCRIPTS/build $@ $SCRIPTS/build $@
if [ -n "${DEVICE}" ]; then
printf "%${BUILD_INDENT}c CREATE ADDON ($DEVICE/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
else
printf "%${BUILD_INDENT}c CREATE ADDON ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT printf "%${BUILD_INDENT}c CREATE ADDON ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
fi
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
rm -rf $ADDON_BUILD rm -rf $ADDON_BUILD