From 3ec2f5ce9afa26b17c0558c53ecbe8fedf534e85 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 1 Nov 2020 20:18:38 +0100 Subject: [PATCH] vdr-addon: package cleanup --- packages/addons/service/vdr-addon/package.mk | 81 +++++++------------- 1 file changed, 26 insertions(+), 55 deletions(-) diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index 5a27652310..e5bb6f2b1f 100644 --- a/packages/addons/service/vdr-addon/package.mk +++ b/packages/addons/service/vdr-addon/package.mk @@ -24,71 +24,42 @@ PKG_ADDON_TYPE="xbmc.service" PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0" addon() { - VDR_DIR="$(get_build_dir vdr)" - VDR_PLUGIN_LIVE_DIR="$(get_build_dir vdr-plugin-live)" - VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)" - VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)" - VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)" - VDR_PLUGIN_EPGFIXER_DIR="$(get_build_dir vdr-plugin-epgfixer)" - VDR_PLUGIN_RESTFULAPI_DIR="$(get_build_dir vdr-plugin-restfulapi)" + # create dirs + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,lib,plugin} + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver} + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/{live,restfulapi} + + # configs + cp -P $(get_build_dir vdr)/{diseqc.conf,keymacros.conf,scr.conf,sources.conf,svdrphosts.conf} $ADDON_BUILD/$PKG_ADDON_ID/config + cp -P $(get_build_dir vdr-plugin-epgfixer)/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer + cp -P $(get_build_dir vdr-plugin-streamdev)/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server + cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf - cp $VDR_DIR/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config - cp $VDR_DIR/keymacros.conf $ADDON_BUILD/$PKG_ADDON_ID/config - cp $VDR_DIR/scr.conf $ADDON_BUILD/$PKG_ADDON_ID/config - cp $VDR_DIR/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config - cp $VDR_DIR/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch + # copy static files + cp -PR $(get_build_dir vdr-plugin-restfulapi)/web/* \ + $(get_build_dir vdr-plugin-restfulapi)/API.html \ + $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live - cp -PR $VDR_PLUGIN_LIVE_DIR/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live + cp -PR $(get_build_dir vdr-plugin-live)/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins + cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/ - cp $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv + # copy binaries + for pkg in ddci2 dummydevice dvbapi eepg epgfixer epgsearch iptv live restfulapi robotv satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do + cp -PR $(get_build_dir vdr-plugin-$pkg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + done - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_VNSISERVER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-dvbapi)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-eepg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_STREAMVEV_DIR/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_PLUGIN_RESTFULAPI_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-robotv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $(get_build_dir vdr-plugin-ddci2)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + cp -P $(get_build_dir vdr-plugin-streamdev)/client/libvdr*.so.* \ + $(get_build_dir vdr-plugin-streamdev)/server/libvdr*.so.* \ + $ADDON_BUILD/$PKG_ADDON_ID/plugin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver - cp -PR $VDR_PLUGIN_VNSISERVER_DIR/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $VDR_DIR/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin - 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_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 + cp -P $(get_build_dir vdr)/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer - cp -PR $VDR_PLUGIN_EPGFIXER_DIR/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer - - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi - cp -P $VDR_PLUGIN_RESTFULAPI_DIR/web/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi - cp -P $VDR_PLUGIN_RESTFULAPI_DIR/API.html $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi + cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin }