jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup path for SOURCES and allow SOURCES and TARGET to be defined by user

Browse Source
This commit is contained in:
James Millar 2017-12-21 09:12:40 -05:00
parent b3d50640fa
commit c3edfc6ee7
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/path
View File

@ -6,9 +6,9 @@ set -e
CONFIG=config CONFIG=config
SCRIPTS=scripts SCRIPTS=scripts
PACKAGES=packages PACKAGES=packages
SOURCES=sources SOURCES=${SOURCES_DIR:-$ROOT/sources}
BUILD_BASE=build BUILD_BASE=build
TARGET=target TARGET_IMG=${TARGET_DIR:-$ROOT/target}
ADDONS=addons ADDONS=addons
# include ARCH specific options # include ARCH specific options
@ -28,7 +28,6 @@ if [ -n "$BUILD_SUFFIX" ]; then
BUILD=$BUILD-$BUILD_SUFFIX BUILD=$BUILD-$BUILD_SUFFIX
fi fi
TARGET_IMG=$ROOT/$TARGET
TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH" TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
ADDON_BUILD="$BUILD/$ADDONS/$1" ADDON_BUILD="$BUILD/$ADDONS/$1"
STAMPS_NOARCH=.stamps STAMPS_NOARCH=.stamps

2
packages/addons/service/emby/package.mk
View File

@ -41,7 +41,7 @@ unpack() {
addon() { addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
unzip -q $ROOT/$SOURCES/$PKG_NAME/$PKG_SOURCE_NAME \ unzip -q $SOURCES/$PKG_NAME/$PKG_SOURCE_NAME \
-d $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono -d $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono
sed -i 's/libMagickWand-6./libMagickWand-7./g' \ sed -i 's/libMagickWand-6./libMagickWand-7./g' \

2
packages/linux-firmware/firmware-imx/package.mk
View File

@ -32,7 +32,7 @@ PKG_TOOLCHAIN="manual"
unpack() { unpack() {
mkdir -p $BUILD mkdir -p $BUILD
cd $BUILD cd $BUILD
sh $ROOT/$SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.bin --auto-accept sh $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.bin --auto-accept
} }
makeinstall_target() { makeinstall_target() {

6
packages/mediacenter/kodi/package.mk
View File

@ -90,7 +90,7 @@ fi
if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then
KODI_DVDCSS="-DENABLE_DVDCSS=ON \ KODI_DVDCSS="-DENABLE_DVDCSS=ON \
-DLIBDVDCSS_URL=$ROOT/$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz" -DLIBDVDCSS_URL=$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz"
else else
KODI_DVDCSS="-DENABLE_DVDCSS=OFF" KODI_DVDCSS="-DENABLE_DVDCSS=OFF"
fi fi
@ -202,8 +202,8 @@ if [ ! "$KODIPLAYER_DRIVER" = default ]; then
fi fi
KODI_LIBDVD="$KODI_DVDCSS \ KODI_LIBDVD="$KODI_DVDCSS \
-DLIBDVDNAV_URL=$ROOT/$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \ -DLIBDVDNAV_URL=$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
-DLIBDVDREAD_URL=$ROOT/$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz" -DLIBDVDREAD_URL=$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \ -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \

4
scripts/create_addon
View File

@ -46,7 +46,7 @@ pack_addon() {
scripts/install_addon $PKG_NAME $PKG_ADDON_ID || exit scripts/install_addon $PKG_NAME $PKG_ADDON_ID || exit
if [ "$2" != "-test" ] ; then if [ "$2" != "-test" ] ; then
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH/$PKG_ADDON_ID" ADDON_INSTALL_DIR="$TARGET_IMG/$ADDONS/$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH/$PKG_ADDON_ID"
ADDONVER="$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml)" ADDONVER="$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml)"
if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then
@ -87,7 +87,7 @@ pack_addon() {
} }
if [ "$PKG_IS_ADDON" = "yes" ] ; then if [ "$PKG_IS_ADDON" = "yes" ] ; then
setup_toolchain $TARGET setup_toolchain target
$SCRIPTS/build $@ $SCRIPTS/build $@