From 8b6835d70122bdbd44417777d4751382a4087e6f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 9 Dec 2011 11:30:30 +0100 Subject: [PATCH] projects/ATV/*: add 'make' variable to build with PVR support: to build with PVR support use 'PROJECT= ARCH= PVR=yes make [release]' if $PVR is not 'yes' or not specified the non-PVR version will be built (XBMC without PVR, no PVR drivers and firmwares) otherwise PVR support will be built and installed. This completes the merge of xbmc-pvr into the master branch Signed-off-by: Stephan Raue --- packages/linux/unpack | 11 ++++++++++- projects/ATV/options | 22 ++++++++++++++++++---- projects/Fusion/options | 22 ++++++++++++++++++---- projects/Generic/options | 22 ++++++++++++++++++---- projects/Generic_OSS/options | 22 ++++++++++++++++++---- projects/ION/options | 22 ++++++++++++++++++---- projects/Intel/options | 22 ++++++++++++++++++---- projects/Ultra/options | 22 ++++++++++++++++++---- 8 files changed, 136 insertions(+), 29 deletions(-) diff --git a/packages/linux/unpack b/packages/linux/unpack index 60df5d8b7f..ceb0f781e9 100755 --- a/packages/linux/unpack +++ b/packages/linux/unpack @@ -41,8 +41,17 @@ cp $KERNEL_CFG_FILE $LINUX/.config sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \ $LINUX/.config +# wipe out DVB and TV stuff if not building PVR version + if [ ! "$PVR" = yes ]; then + sed -i -e "s|^CONFIG_DVB_CORE=.*$|# CONFIG_DVB_CORE is not set|" $LINUX/.config + sed -i -e "s|^CONFIG_VIDEO_DEV=.*$|# CONFIG_VIDEO_DEV is not set|" $LINUX/.config + fi + # wipe out nouveau if GRAPHICS_DRIVERS contains nvidia -echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && sed -i '/NOUVEAU/ d' $LINUX/.config && echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config + echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && \ + sed -i '/NOUVEAU/ d' $LINUX/.config && \ + echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config + # copy some extra firmware to linux tree cp -R $PKG_DIR/firmware/* $LINUX/firmware diff --git a/projects/ATV/options b/projects/ATV/options index 53bb88b9e7..31ea57c920 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 bcm_sta a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx bcm_sta" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware wlan-firmware" + FIRMWARE="wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 6d4c1aa8c6..f8bb583c16 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware misc-firmware wlan-firmware" + FIRMWARE="misc-firmware wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 1abb483287..a47ffb891c 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware misc-firmware wlan-firmware" + FIRMWARE="misc-firmware wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index f3d2331284..5a6b5da912 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware misc-firmware wlan-firmware" + FIRMWARE="misc-firmware wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes" diff --git a/projects/ION/options b/projects/ION/options index c30df37935..4ea1899c2e 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware misc-firmware wlan-firmware" + FIRMWARE="misc-firmware wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes" diff --git a/projects/Intel/options b/projects/Intel/options index dc08309f30..d70dde148a 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware misc-firmware wlan-firmware" + FIRMWARE="misc-firmware wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes" diff --git a/projects/Ultra/options b/projects/Ultra/options index b6d5910516..9a68d21274 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -1,5 +1,9 @@ # Name of the Distro to build (full name, without special charcters) - DISTRONAME="OpenELEC_PVR" + if [ "$PVR" = yes ]; then + DISTRONAME="OpenELEC_PVR" + else + DISTRONAME="OpenELEC" + fi # Welcome Message for e.g. SSH Server (up to 5 Lines) GREATING0="##############################################" @@ -104,7 +108,11 @@ LINUX_NEXT="no" # Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" + if [ "$PVR" = yes ]; then + MEDIACENTER="xbmc-pvr" + else + MEDIACENTER="xbmc" + fi # Skins to install (Confluence) # Space separated list is supported, @@ -150,7 +158,10 @@ # asix-ax887xx: Asix AX887xx USB LAN Driver # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="asix-ax887xx AF9035" - ADDITIONAL_DRIVERS="asix-ax887xx AF9035 a867_drv aver_h826d" + ADDITIONAL_DRIVERS="asix-ax887xx" + if [ "$PVR" = yes ]; then + ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS AF9035 a867_drv aver_h826d" + fi # build with network support (yes / no) NETWORK="yes" @@ -251,7 +262,10 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware misc-firmware wlan-firmware" + FIRMWARE="misc-firmware wlan-firmware" + if [ "$PVR" = yes ]; then + FIRMWARE="$FIRMWARE dvb-firmware" + fi # build with lm_sensors hardware monitoring support (yes / no) SENSOR_SUPPORT="yes"