diff --git a/Makefile b/Makefile index 08ee298371..5ca3295dfd 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ system: release: ./scripts/install image release +addons: + ./scripts/install image addons + qemu: ./scripts/install image qemu diff --git a/config/options b/config/options index cbd448f3ff..e162d8f767 100644 --- a/config/options +++ b/config/options @@ -17,6 +17,16 @@ fi ROOT=`pwd` PROJECT_DIR=$ROOT/projects +OPENELEC_VERSION=`cat VERSION` + +if [ "$OPENELEC_VERSION" = "devel" ]; then + OS_VERSION="0.90" +else + OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."` + OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."` + OS_VERSION="$OS_MAJOR_VERSION.$OS_MINOR_VERSION" +fi + # read project options if available if [ -f $PROJECT_DIR/$PROJECT/options ]; then . $PROJECT_DIR/$PROJECT/options diff --git a/config/path b/config/path index 2d9361d539..424dc9944b 100644 --- a/config/path +++ b/config/path @@ -28,7 +28,7 @@ fi TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu -OPENELEC_VERSION=`cat VERSION` +OPENELEC_SRC=http://sources.openelec.tv/src/$OPENELEC_VERSION CONFIG=config SCRIPTS=scripts PACKAGES=packages @@ -40,7 +40,7 @@ BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM PKG_BUILD=$BUILD/$1\[-_][0-9]* TARGET_IMG=$ROOT/$TARGET -TARGET_ADDONS=$TARGET_IMG/$ADDONS/$PROJECT/$TARGET_ARCH +TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH" STAMPS_NOARCH=.stamps STAMPS=$BUILD/.stamps DOCS=DOCS @@ -231,8 +231,6 @@ else fi INDENT_SIZE=4 -OPENELEC_SRC=http://sources.openelec.tv/src/$OPENELEC_VERSION - VERSION_SUFFIX=$TARGET_ARCH [ -n "$TARGET_PLATFORM" ] && VERSION_SUFFIX=$TARGET_PLATFORM diff --git a/packages/image/install b/packages/image/install index 7c80ec3133..e7ed8aaefc 100755 --- a/packages/image/install +++ b/packages/image/install @@ -155,6 +155,14 @@ case "$2" in tar cjf $TARGET_IMG/OpenELEC-$TARGET_VERSION.tar.bz2 -C $BUILD/$2 OpenELEC-$TARGET_VERSION ;; + addons) + + export INSTALL=$BUILD/$1/$2 + + $SCRIPTS/install emulators addons + $SCRIPTS/install games addons + ;; + qemu) $SCRIPTS/install image system