cleanup packages: addons/

This commit is contained in:
CvH 2024-07-27 20:03:19 +02:00
parent 6352bca894
commit 6a18b03a92
10 changed files with 13 additions and 16 deletions

View File

@ -53,7 +53,7 @@ pre_build_target() {
}
pre_configure_target() {
echo "" > ../cmake/FindGitVersion.cmake
echo "" >../cmake/FindGitVersion.cmake
}
addon() {

View File

@ -37,4 +37,3 @@ addon() {
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
cp -P ${PKG_BUILD}/bin/prometheus-node-exporter ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
}

View File

@ -43,8 +43,7 @@ addon() {
${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog
for l in $(find ${PKG_INSTALL}/usr/lib -name *.so)
do
for l in $(find ${PKG_INSTALL}/usr/lib -name *.so); do
cp ${l} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog/
done
}

View File

@ -33,8 +33,8 @@ _pkg_copy_lib() {
addon() {
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig \
${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd \
cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig \
${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd \
${PKG_BUILD}/.${TARGET_NAME}/unix/x0vncserver/x0vncserver \
${ADDON_BUILD}/${PKG_ADDON_ID}/bin/

View File

@ -86,15 +86,15 @@ pre_configure_target() {
--disable-bintray_cache \
--python=${TOOLCHAIN}/bin/python"
# fails to build in subdirs
# fails to build in subdirs
cd ${PKG_BUILD}
rm -rf .${TARGET_NAME}
# pass ffmpegx to build
# pass ffmpegx to build
CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include"
LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib"
# pass libhdhomerun to build
# pass libhdhomerun to build
CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/hdhomerun"
export CROSS_COMPILE="${TARGET_PREFIX}"

View File

@ -86,15 +86,15 @@ pre_configure_target() {
--disable-bintray_cache \
--python=${TOOLCHAIN}/bin/python"
# fails to build in subdirs
# fails to build in subdirs
cd ${PKG_BUILD}
rm -rf .${TARGET_NAME}
# pass ffmpegx to build
# pass ffmpegx to build
CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include"
LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib"
# pass libhdhomerun to build
# pass libhdhomerun to build
CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/hdhomerun"
export CROSS_COMPILE="${TARGET_PREFIX}"

View File

@ -37,7 +37,7 @@ addon() {
cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/vnsiserver
touch ${ADDON_BUILD}/${PKG_ADDON_ID}/config/channels.conf
echo '0.0.0.0/0' >> ${ADDON_BUILD}/${PKG_ADDON_ID}/config/svdrphosts.conf
echo '0.0.0.0/0' >>${ADDON_BUILD}/${PKG_ADDON_ID}/config/svdrphosts.conf
# copy static files
cp -PR $(get_build_dir vdr-plugin-restfulapi)/web/* \

View File

@ -101,6 +101,6 @@ addon() {
ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwspy
ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwpriv
find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f | \
find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f |
xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
}

View File

@ -19,7 +19,6 @@ PKG_ADDON_NAME="Raspberry Pi Tools"
PKG_ADDON_TYPE="xbmc.python.module"
PKG_ADDON_PROJECTS="RPi ARM"
addon() {
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
cp -PR $(get_build_dir lg-gpio)/liblgpio.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/

View File

@ -191,6 +191,6 @@ addon() {
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
scanelf -EET_EXEC -RBF %F ${ADDON_BUILD}/${PKG_ADDON_ID}/bin | \
scanelf -EET_EXEC -RBF %F ${ADDON_BUILD}/${PKG_ADDON_ID}/bin |
xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
}