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

build: add and use get_install_dir()

Browse Source 
Don't hardcode get_build_dir()/.install_pkg in multiple places.
This commit is contained in:
Andre Heider 2019-11-30 12:31:03 +01:00
parent 267d57d7f3
commit 3c8862a701
18 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/functions
View File

@ -796,6 +796,10 @@ get_build_dir() {
fi
}
get_install_dir() {
get_pkg_variable "$1" PKG_INSTALL
}
get_pkg_version() {
get_pkg_variable "$1" PKG_VERSION
}
@ -1133,7 +1137,7 @@ get_module_dir() {
if [ -n "${_CACHED_KERNEL_MODULE_DIR}" ]; then
echo "${_CACHED_KERNEL_MODULE_DIR}"
else
basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/kernel-overlays/base/lib/modules/*)
basename $(ls -d $(get_install_dir linux)/usr/lib/kernel-overlays/base/lib/modules/*)
fi
}

10
packages/addons/browser/chrome/package.mk
View File

@ -38,14 +38,14 @@ addon() {
cp -PL $(get_build_dir atk)/.$TARGET_NAME/atk/libatk-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
# cairo
cp -PL $(get_build_dir cairo)/.install_pkg/usr/lib/libcairo-gobject.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_build_dir cairo)/.install_pkg/usr/lib/libcairo.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_install_dir cairo)/usr/lib/libcairo-gobject.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_install_dir cairo)/usr/lib/libcairo.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
# gdk-pixbuf
cp -PL $(get_build_dir gdk-pixbuf)/.install_pkg/usr/lib/libgdk_pixbuf-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/libgdk_pixbuf-2.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
# gdk-pixbuf modules
cp -PL $(get_build_dir gdk-pixbuf)/.install_pkg/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
# gtk3 gdk3
cp -PL $(get_build_dir gtk3)/.$TARGET_NAME/gtk/.libs/libgtk-3.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
@ -97,7 +97,7 @@ addon() {
cp -PL $(get_build_dir pango)/.$TARGET_NAME/pango/libpangoft2-1.0.so.0 $ADDON_BUILD/$PKG_ADDON_ID/lib
# unclutter
cp -P $(get_build_dir unclutter)/.install_pkg/usr/bin/unclutter $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_install_dir unclutter)/usr/bin/unclutter $ADDON_BUILD/$PKG_ADDON_ID/bin
}
post_install_addon() {

2
packages/addons/driver/sapphire/package.mk
View File

@ -60,5 +60,5 @@ addon() {
cp $PKG_BUILD/sapphire_keymap.sh $ADDON_BUILD/$PKG_ADDON_ID/bin
# bash
cp $(get_build_dir bash)/.install_pkg/usr/bin/bash $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $(get_install_dir bash)/usr/bin/bash $ADDON_BUILD/$PKG_ADDON_ID/bin
}

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

@ -28,8 +28,8 @@ addon() {
-d $ADDON_BUILD/$PKG_ADDON_ID/emby
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q16HDRI.so.? \
cp -L $(get_install_dir imagemagick)/usr/lib/libMagickCore-7.Q16HDRI.so.? \
$ADDON_BUILD/$PKG_ADDON_ID/lib/
cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q16HDRI.so \
cp -L $(get_install_dir imagemagick)/usr/lib/libMagickWand-7.Q16HDRI.so \
$ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so
}

4
packages/addons/service/emby4/package.mk
View File

@ -28,8 +28,8 @@ addon() {
-d $ADDON_BUILD/$PKG_ADDON_ID/emby
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q16HDRI.so.? \
cp -L $(get_install_dir imagemagick)/usr/lib/libMagickCore-7.Q16HDRI.so.? \
$ADDON_BUILD/$PKG_ADDON_ID/lib/
cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q16HDRI.so \
cp -L $(get_install_dir imagemagick)/usr/lib/libMagickWand-7.Q16HDRI.so \
$ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so
}

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

@ -44,7 +44,7 @@ addon() {
cp -PR $PKG_INSTALL/usr/lib $ADDON_BUILD/$PKG_ADDON_ID/lib/
cp -PR $PKG_INSTALL/usr/sbin $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -L $(get_build_dir serdisplib)/.install_pkg/usr/lib/libserdisp.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib/
cp -L $(get_install_dir serdisplib)/usr/lib/libserdisp.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib/
sed -e "s|^DriverPath=.*$|DriverPath=/storage/.kodi/addons/service.lcdd/lib/lcdproc/|" \
-e "s|^#Foreground=.*$|Foreground=no|" \

4
packages/addons/service/minidlna/package.mk
View File

@ -29,7 +29,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-static \
--with-os-url="https://libreelec.tv""
pre_configure_target() {
export LDFLAGS="$LDFLAGS -L$(get_build_dir ffmpeg)/.install_pkg/usr/lib"
export LDFLAGS="$LDFLAGS -L$(get_install_dir ffmpeg)/usr/lib"
export LIBS="$LIBS -lid3tag -lFLAC -logg -lz -lpthread -ldl -lm"
}
@ -38,5 +38,5 @@ addon() {
cp -P $PKG_INSTALL/usr/sbin/minidlnad $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_build_dir libexif)/.install_pkg/usr/lib/libexif.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_install_dir libexif)/usr/lib/libexif.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
}

4
packages/addons/service/mpd/package.mk
View File

@ -104,6 +104,6 @@ addon() {
cp -P $(get_build_dir mpd-mpc)/.$TARGET_NAME/mpc $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_build_dir libmpdclient)/.install_pkg/usr/lib/libmpdclient.so $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_build_dir libmpdclient)/.install_pkg/usr/lib/libmpdclient.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
}

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

@ -22,7 +22,7 @@ PKG_ADDON_TYPE="xbmc.service"
addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $(get_build_dir pcsc-lite)/.install_pkg/usr/sbin/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin
cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
cp -Pa $(get_build_dir ccid)/.$TARGET_NAME/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial

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

@ -23,6 +23,6 @@ addon() {
"$ADDON_BUILD/$PKG_ADDON_ID/bin"
mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/lib"
cp "$(get_build_dir alsa-plugins)/.install_pkg/usr/lib/alsa"/*.so \
cp "$(get_install_dir alsa-plugins)/usr/lib/alsa"/*.so \
"$ADDON_BUILD/$PKG_ADDON_ID/lib"
}

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

@ -30,6 +30,6 @@ addon() {
sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
cp $(get_build_dir tslib)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $(get_install_dir tslib)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $(get_build_dir evtest)/.$TARGET_NAME/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
}

4
packages/addons/service/ttyd/package.mk
View File

@ -23,6 +23,6 @@ addon() {
cp -P $PKG_INSTALL/usr/bin/ttyd $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_build_dir json-c)/.install_pkg/usr/lib/libjson-c.so $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_build_dir libwebsockets)/.install_pkg/usr/lib/libwebsockets.so.14 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.14 $ADDON_BUILD/$PKG_ADDON_ID/lib
}

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

@ -112,7 +112,7 @@ addon() {
cp -P $PKG_BUILD/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $PKG_BUILD/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_build_dir comskip)/.install_pkg/usr/bin/comskip $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_install_dir comskip)/usr/bin/comskip $ADDON_BUILD/$PKG_ADDON_ID/bin
# dvb-scan files
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan

2
packages/addons/service/vdr-addon/package.mk
View File

@ -80,7 +80,7 @@ addon() {
cp -P $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_build_dir tntnet)/.install_pkg/usr/lib/libtntnet.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server

16
packages/addons/tools/dotnet-runtime/package.mk
View File

@ -42,13 +42,13 @@ addon() {
$ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/libs
cp -L $(get_build_dir curl3)/.install_pkg/usr/lib/libcurl.so.? \
$(get_build_dir krb5)/.install_pkg/usr/lib/libcom_err.so.? \
$(get_build_dir krb5)/.install_pkg/usr/lib/libgssapi_krb5.so.? \
$(get_build_dir krb5)/.install_pkg/usr/lib/libk5crypto.so.? \
$(get_build_dir krb5)/.install_pkg/usr/lib/libkrb5.so.? \
$(get_build_dir krb5)/.install_pkg/usr/lib/libkrb5support.so.? \
$(get_build_dir lttng-ust)/.install_pkg/usr/lib/liblttng-ust.so.? \
$(get_build_dir lttng-ust)/.install_pkg/usr/lib/liblttng-ust-tracepoint.so.? \
cp -L $(get_install_dir curl3)/usr/lib/libcurl.so.? \
$(get_install_dir krb5)/usr/lib/libcom_err.so.? \
$(get_install_dir krb5)/usr/lib/libgssapi_krb5.so.? \
$(get_install_dir krb5)/usr/lib/libk5crypto.so.? \
$(get_install_dir krb5)/usr/lib/libkrb5.so.? \
$(get_install_dir krb5)/usr/lib/libkrb5support.so.? \
$(get_install_dir lttng-ust)/usr/lib/liblttng-ust.so.? \
$(get_install_dir lttng-ust)/usr/lib/liblttng-ust-tracepoint.so.? \
$ADDON_BUILD/$PKG_ADDON_ID/libs
}

4
packages/addons/tools/multimedia-tools/package.mk
View File

@ -36,10 +36,10 @@ addon() {
cp -P $(get_build_dir mediainfo)/Project/GNU/CLI/mediainfo $ADDON_BUILD/$PKG_ADDON_ID/bin
# mpg123
cp -P $(get_build_dir mpg123)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -P $(get_install_dir mpg123)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
# opencaster
cp -P $(get_build_dir opencaster)/.install_pkg/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -P $(get_install_dir opencaster)/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
# squeezelite
cp -P $(get_build_dir squeezelite)/squeezelite $ADDON_BUILD/$PKG_ADDON_ID/bin/

14
packages/addons/tools/system-tools/package.mk
View File

@ -104,7 +104,7 @@ addon() {
cp -P $(get_build_dir hid_mapper)/hid_mapper $ADDON_BUILD/$PKG_ADDON_ID/bin
# htop
cp -P $(get_build_dir htop)/.install_pkg/usr/bin/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_install_dir htop)/usr/bin/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
# i2c-tools
cp -P $(get_build_dir i2c-tools)/tools/i2cdetect $ADDON_BUILD/$PKG_ADDON_ID/bin
@ -119,7 +119,7 @@ addon() {
# jq
cp -P $(get_build_dir jq)/.$TARGET_NAME/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_build_dir oniguruma)/.install_pkg/usr/lib/libonig.so $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -P $(get_install_dir oniguruma)/usr/lib/libonig.so $ADDON_BUILD/$PKG_ADDON_ID/lib
# lm_sensors
cp -P $(get_build_dir lm_sensors)/prog/sensors/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
@ -128,8 +128,8 @@ addon() {
cp -P $(get_build_dir lshw)/src/lshw $ADDON_BUILD/$PKG_ADDON_ID/bin
# mc
cp -Pa $(get_build_dir mc)/.install_pkg/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $(get_build_dir mc)/.install_pkg/storage/.kodi/addons/virtual.system-tools/* $ADDON_BUILD/$PKG_ADDON_ID
cp -Pa $(get_install_dir mc)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* $ADDON_BUILD/$PKG_ADDON_ID
# mrxvt
cp -P $(get_build_dir mrxvt)/.$TARGET_NAME/src/mrxvt $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
@ -162,7 +162,7 @@ addon() {
cp -P $(get_build_dir strace)/.$TARGET_NAME/strace $ADDON_BUILD/$PKG_ADDON_ID/bin
# stress-ng
cp -P $(get_build_dir stress-ng)/.install_pkg/usr/bin/stress-ng $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng $ADDON_BUILD/$PKG_ADDON_ID/bin
# unrar
cp -P $(get_build_dir unrar)/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
@ -171,6 +171,6 @@ addon() {
cp -P $(get_build_dir usb-modeswitch)/usb_modeswitch $ADDON_BUILD/$PKG_ADDON_ID/bin
# vim
cp -P $(get_build_dir vim)/.install_pkg/usr/bin/vim $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -Pa $(get_build_dir vim)/.install_pkg/storage/.kodi/addons/virtual.system-tools/data/vim/ $ADDON_BUILD/$PKG_ADDON_ID/data
cp -P $(get_install_dir vim)/usr/bin/vim $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -Pa $(get_install_dir vim)/storage/.kodi/addons/virtual.system-tools/data/vim/ $ADDON_BUILD/$PKG_ADDON_ID/data
}

2
packages/sysutils/dosfstools/package.mk
View File

@ -23,7 +23,7 @@ make_init() {
makeinstall_init() {
mkdir -p $INSTALL/usr/sbin
cp ../.install_pkg/usr/sbin/fsck.fat $INSTALL/usr/sbin
cp $(get_install_dir dosfstools:target)/usr/sbin/fsck.fat $INSTALL/usr/sbin
ln -sf fsck.fat $INSTALL/usr/sbin/fsck.msdos
ln -sf fsck.fat $INSTALL/usr/sbin/fsck.vfat
}