From 85fd40c78633c7928434ce1ba9887fe7ed5f6c04 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sun, 22 Dec 2019 13:02:02 +0100 Subject: [PATCH] dvb-tools: cleanup and use the "sysroot" build flag --- .../dvb-tools-depends/blindscan-s2/package.mk | 4 +- .../dvb-tools-depends/dvb-apps/package.mk | 5 +-- .../dvb-tools-depends/dvblast/package.mk | 6 +-- .../dvb-tools-depends/dvbsnoop/package.mk | 5 +-- .../dvb-tools-depends/mumudvb/package.mk | 5 +-- .../dvb-tools-depends/szap-s2/package.mk | 4 +- .../dvb-tools-depends/t2scan/package.mk | 5 +-- .../dvb-tools-depends/tune-s2/package.mk | 4 +- .../dvb-tools-depends/w_scan/package.mk | 5 +-- packages/addons/tools/dvb-tools/package.mk | 38 +++++++++---------- 10 files changed, 35 insertions(+), 46 deletions(-) diff --git a/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk index 75ab60d588..7a7936530f 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk @@ -9,7 +9,9 @@ PKG_SITE="https://bitbucket.org/majortom/blindscan-s2" PKG_URL="https://github.com/PLi-metas/blindscan-s2/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals" +PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - : + mkdir -p $INSTALL/usr/bin + make install BIND=$INSTALL/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk index 71d7f0cb30..dffd6096a5 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk @@ -10,11 +10,8 @@ PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps" PKG_URL="http://linuxtv.org/hg/dvb-apps/archive/${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Applications for initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC." +PKG_BUILD_FLAGS="-sysroot" pre_make_target() { export PERL_USE_UNSAFE_INC=1 } - -makeinstall_target() { - : -} diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk index 2f66627e85..f7983c8d4a 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk @@ -10,11 +10,9 @@ PKG_SITE="https://www.videolan.org/projects/dvblast.html" PKG_URL="http://repo.or.cz/dvblast.git/snapshot/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain bitstream libev" PKG_LONGDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming application" +PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { export LDFLAGS="$LDFLAGS -lm" -} - -makeinstall_target() { - : + export PREFIX="/usr" } diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk index bc8b04cdd9..b06bc25474 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk @@ -10,7 +10,4 @@ PKG_URL="https://github.com/persianpros/dvbsnoop/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program" PKG_TOOLCHAIN="autotools" - -makeinstall_target() { - : -} +PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk index 6c0d8d7324..6211a9e50b 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk @@ -10,7 +10,4 @@ PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain libdvbcsa" PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast" PKG_TOOLCHAIN="autotools" - -makeinstall_target() { - : -} +PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk index 1f242c58f4..2b85330403 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk @@ -9,7 +9,9 @@ PKG_SITE="https://bitbucket.org/updatelee/tune-s2" PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API" +PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - : + mkdir -p $INSTALL/usr/bin + make install BIND=$INSTALL/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk index e36f790212..d1f0634941 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk @@ -9,7 +9,4 @@ PKG_SITE="https://github.com/mighty-p/t2scan" PKG_URL="https://github.com/mighty-p/t2scan/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files." - -makeinstall_target() { - : -} +PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk index fe81785611..c84bcaad78 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk @@ -9,7 +9,9 @@ PKG_SITE="https://bitbucket.org/updatelee/tune-s2" PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices" +PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - : + mkdir -p $INSTALL/usr/bin + make install BIND=$INSTALL/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk index 67d5e08923..16fd7a9a28 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk @@ -10,7 +10,4 @@ PKG_URL="http://wirbel.htpc-forum.de/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files." PKG_TOOLCHAIN="autotools" - -makeinstall_target() { - : -} +PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/tools/dvb-tools/package.mk b/packages/addons/tools/dvb-tools/package.mk index 2bcab7dedb..d4100d63f1 100644 --- a/packages/addons/tools/dvb-tools/package.mk +++ b/packages/addons/tools/dvb-tools/package.mk @@ -32,39 +32,39 @@ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ # blindscan-s2 - cp -P $(get_build_dir blindscan-s2)/blindscan-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir blindscan-s2)/usr/bin/blindscan-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin # dvb-apps - cp -P $(get_build_dir dvb-apps)/util/dvbdate/dvbdate $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/dvbnet/dvbnet $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/dvbscan/dvbscan $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/dvbtraffic/dvbtraffic $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/femon/femon $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/scan/scan $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/szap/azap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/szap/czap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/szap/szap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/szap/tzap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_build_dir dvb-apps)/util/zap/zap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbdate $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbnet $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbscan $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbtraffic $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/femon $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/scan $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/azap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/czap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/szap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/tzap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/zap $ADDON_BUILD/$PKG_ADDON_ID/bin # dvblast - cp -P $(get_build_dir dvblast)/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvblast)/usr/bin/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin # dvbsnoop - cp -P $(get_build_dir dvbsnoop)/.$TARGET_NAME/src/dvbsnoop $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvbsnoop)/usr/bin/dvbsnoop $ADDON_BUILD/$PKG_ADDON_ID/bin # mumudvb - cp -P $(get_build_dir mumudvb)/.$TARGET_NAME/src/mumudvb $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir mumudvb)/usr/bin/mumudvb $ADDON_BUILD/$PKG_ADDON_ID/bin # szap-s2 - cp -P $(get_build_dir szap-s2)/szap-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir szap-s2)/usr/bin/szap-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin # tune-s2 - cp -P $(get_build_dir tune-s2)/tune-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir tune-s2)/usr/bin/tune-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin # t2scan - cp -P $(get_build_dir t2scan)/.$TARGET_NAME/t2scan $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir t2scan)/usr/bin/t2scan $ADDON_BUILD/$PKG_ADDON_ID/bin # w_scan - cp -P $(get_build_dir w_scan)/.$TARGET_NAME/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir w_scan)/usr/bin/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin }