Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index dfc746d23733e3cf1897c765f9d8e93f1ba310f3..dcd3b08f73f39de8de2d9651439d0c859ad22ca7 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -333,7 +333,14 @@ CONFIG_ARCH_MULTIPLATFORM=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_MULTI_CPU_AUTO is not set
-# CONFIG_ARCH_MVEBU is not set
+CONFIG_ARCH_MVEBU=y
+
+#
+# Marvell SOC with device tree
+#
+CONFIG_MACH_ARMADA_370_XP=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_XP=y
 # CONFIG_ARCH_BCM is not set
 # CONFIG_GPIO_PCA953X is not set
 CONFIG_KEYBOARD_GPIO_POLLED=m
@@ -443,7 +450,7 @@ CONFIG_MACH_OMAP4_PANDA=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U8500 is not set
@@ -460,12 +467,14 @@ CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
+CONFIG_PLAT_ORION=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARM_TIMER_SP804=y
 
 #
 # Processor Type
 #
+CONFIG_CPU_PJ4B=y
 CONFIG_CPU_V7=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -502,6 +511,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_NR_BANKS=8
 CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_PJ4B_ERRATA_4742=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_643719=y
@@ -1314,6 +1324,7 @@ CONFIG_CMA_AREAS=7
 #
 # Bus devices
 #
+CONFIG_MVEBU_MBUS=y
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_OMAP_INTERCONNECT=y
 CONFIG_CONNECTOR=y
@@ -1402,6 +1413,7 @@ CONFIG_MTD_NAND_IDS=y
 CONFIG_MTD_NAND_GPMI_NAND=m
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_NAND_ORION=y
 CONFIG_MTD_NAND_MXC=m
 # CONFIG_MTD_ONENAND is not set
 
@@ -1945,7 +1957,9 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MV643XX_ETH=m
 CONFIG_MVMDIO=m
+CONFIG_MVNETA=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKGE_GENESIS=y
@@ -2542,8 +2556,10 @@ CONFIG_SERIAL_8250_RSA=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_SERIAL_MFD_HSU is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
@@ -2627,6 +2643,7 @@ CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_IMX=m
 # CONFIG_I2C_INTEL_MID is not set
+CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_NOMADIK=y
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OMAP=y
@@ -2708,8 +2725,12 @@ CONFIG_PINCTRL_IMX51=y
 CONFIG_PINCTRL_IMX53=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_EXYNOS is not set
 # CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_WMT=y
 CONFIG_PINCTRL_WM8850=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -2727,6 +2748,7 @@ CONFIG_GPIO_GENERIC=y
 #
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_EM is not set
+CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_RCAR is not set
@@ -2828,6 +2850,7 @@ CONFIG_CHARGER_TWL4030=y
 # CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_QNAP=y
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_AVS=y
@@ -2964,6 +2987,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_IMX_THERMAL=m
+CONFIG_ARMADA_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
@@ -4147,6 +4171,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_HCD_ORION=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
@@ -4345,6 +4370,7 @@ CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=m
 # CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_MVSDIO=y
 # CONFIG_MMC_CB710 is not set
 # CONFIG_MMC_VIA_SDMMC is not set
 CONFIG_MMC_DW=m
@@ -4495,6 +4521,7 @@ CONFIG_RTC_DRV_OMAP=y
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_VT8500=m
+CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SNVS=m
 
@@ -4508,8 +4535,10 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_AMBA_PL08X=y
 # CONFIG_DW_DMAC is not set
+CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_TIMB_DMA=m
@@ -4687,6 +4716,9 @@ CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_CPU=y
+CONFIG_MVEBU_CLK_GATING=y
 CONFIG_HWSPINLOCK=y
 
 #
@@ -4695,6 +4727,8 @@ CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_OMAP=y
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_ARMADA_370_XP_TIMER=y
+CONFIG_SUN4I_TIMER=y
 CONFIG_VT8500_TIMER=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
@@ -5457,7 +5491,9 @@ CONFIG_CRYPTO_USER_API=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_OMAP_SHAM=y
 CONFIG_CRYPTO_DEV_OMAP_AES=y
 CONFIG_ASYMMETRIC_KEY_TYPE=m

diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index 30c4d552974990d793b0bb17e3babf107fa4439b..89107a3349916082f554708ebaa0ca792f751e4e 100644 (file)
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -5,6 +5,12 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/am335x-bone.dtb
 #boot/dtb-KVER-ipfire-multi/am335x-evm.dtb
 #boot/dtb-KVER-ipfire-multi/am335x-evmsk.dtb
+#boot/dtb-KVER-ipfire-multi/armada-370-db.dtb
+#boot/dtb-KVER-ipfire-multi/armada-370-mirabox.dtb
+#boot/dtb-KVER-ipfire-multi/armada-370-rd.dtb
+#boot/dtb-KVER-ipfire-multi/armada-xp-db.dtb
+#boot/dtb-KVER-ipfire-multi/armada-xp-gp.dtb
+#boot/dtb-KVER-ipfire-multi/armada-xp-openblocks-ax3-4.dtb
 #boot/dtb-KVER-ipfire-multi/imx25-karo-tx25.dtb
 #boot/dtb-KVER-ipfire-multi/imx25-pdk.dtb
 #boot/dtb-KVER-ipfire-multi/imx27-apf27.dtb
@@ -45,6 +51,10 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/omap4-sdp.dtb
 #boot/dtb-KVER-ipfire-multi/omap4-var-som.dtb
 #boot/dtb-KVER-ipfire-multi/omap5-evm.dtb
+#boot/dtb-KVER-ipfire-multi/sun4i-a10-cubieboard.dtb
+#boot/dtb-KVER-ipfire-multi/sun4i-a10-hackberry.dtb
+#boot/dtb-KVER-ipfire-multi/sun4i-a10-mini-xplus.dtb
+#boot/dtb-KVER-ipfire-multi/sun5i-a13-olinuxino.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15-tc1.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15_a7.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca5s.dtb
@@ -181,6 +191,9 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/clk/clk-si5351.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/cpufreq
 #lib/modules/KVER-ipfire-multi/kernel/drivers/cpufreq/imx6q-cpufreq.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto
+#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/hifn_795x.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/mv_cesa.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/dma
 #lib/modules/KVER-ipfire-multi/kernel/drivers/dma/timb_dma.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/firewire
@@ -1135,7 +1148,9 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/jme.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mv643xx_eth.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvmdio.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/mvneta.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/skge.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/marvell/sky2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/mellanox
@@ -1448,6 +1463,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-m48t59.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-max6900.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-msm6242.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mv.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mxc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8523.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8563.ko
@@ -1579,14 +1595,13 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/usbip-host.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/vhci-hcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/thermal
+#lib/modules/KVER-ipfire-multi/kernel/drivers/thermal/armada_thermal.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/thermal/imx_thermal.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_gsm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_hdlc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_r3964.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/amba-pl010.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/amba-pl011.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/arc_uart.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/sccnxp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/uio

diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
new file mode 100644 (file)
index 0000000..0748137
--- /dev/null
+++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi
@@ -0,0 +1,3 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0

diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
new file mode 100644 (file)
index 0000000..5e06c12
--- /dev/null
+++ b/config/rootfiles/packages/i586/vdr_dvbapi
@@ -0,0 +1,4 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse

diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
new file mode 100644 (file)
index 0000000..17f7bc4
--- /dev/null
+++ b/config/rootfiles/packages/vdr_eepg
@@ -0,0 +1,2 @@
+etc/vdr/plugins/eepg
+usr/lib/vdr/libvdr-eepg.so.2.0.0

diff --git a/lfs/strongswan b/lfs/strongswan
index 9ac94de7558a579bd2c71334fc333c41e7c9d32e..600a16f46324fbd6e4986e65a937119a66c175e9 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1.2rc1
+VER        = 5.1.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d0508e262f2ec45ab5428bb080bc1b31
+$(DL_FILE)_MD5 = d45a2e89c624bceaf2e53c9b9cdddf83
 
 install : $(TARGET)
 

diff --git a/lfs/vdr b/lfs/vdr
index 161b04ee1e8cd3446b7d51cca0baeb9ba85bce52..52ecdd54354fe21c86f712beb4cd927d8af20e0a 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.3
+VER        = 2.0.5
 
 # VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
@@ -37,7 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "vdr_streamdev"
 
@@ -63,9 +63,9 @@ MAKE_OPTIONS = \
 
 objects = $(DL_FILE)
 
-$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5  = dd8fb1642bdfa7feb0e9a8ae41e9ef2f
+$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
 
 install : $(TARGET)
 

diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
new file mode 100644 (file)
index 0000000..2cf34e7
--- /dev/null
+++ b/lfs/vdr_dvbapi
@@ -0,0 +1,121 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.0.6
+THISAPP    = vdr-plugin-dvbapi-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_dvbapi
+PAK_VER    = 1
+
+DEPS       = ""
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+CSAFLAGS     =  -O3 -fexpensive-optimizations -funroll-loops
+CSAFLAGS-sse = $(CSAFLAGS) -mmmx -msse -msse2 -msse3
+PARALLEL     = PARALLEL_64_LONG
+PARALLEL-sse = PARALLEL_128_SSE2
+
+define BUILD
+       cp -a $(DIR_APP) $(DIR_APP)-build$(1)
+       cd $(DIR_APP)-build$(1) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+               CFLAGS="$(CFLAGS$(1))" CXXFLAGS="$(CXXFLAGS$(1))" \
+               CSAFLAGS="$(CSAFLAGS$(1))" PARALLEL="$(PARALLEL$(1))" \
+               LOCALEDIR=$$(pwd)/locale all
+
+       -mkdir -pv /etc/vdr/plugins/dvbapi
+       cd $(DIR_APP)-build$(1) && install -m 755 libvdr-dvbapi.so \
+               /usr/lib/vdr/libvdr-dvbapi.so.$(VDRPLUGVER)$(1)
+endef
+
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP)* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(MACHINE)" "i586"
+       # Build an SSE enabled version.
+       $(call BUILD,-sse)
+endif
+
+       # Build normal version.
+       $(call BUILD)
+
+       echo "#" > /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "# Command line parameters for vdr-plugin-dvbapi" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "#" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "# For more details see:" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "#   - \`vdr --help -Pdvbapi\`" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "PLUGIN_OPTIONS=\"\"" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+
+       @rm -rf $(DIR_APP)*
+       @$(POSTBUILD)

diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
new file mode 100644 (file)
index 0000000..fddd075
--- /dev/null
+++ b/lfs/vdr_eepg
@@ -0,0 +1,99 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+GIT_VER    = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011
+VER        = master
+THISAPP    = vdr-plugin-eepg-$(VER)
+DL_FILE    = vdr-plugin-eepg-$(GIT_VER).tar.bz2
+
+DL_FROM    = http://projects.vdr-developer.org/git/vdr-plugin-eepg.git/snapshot
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_eepg
+PAK_VER    = 1
+
+DEPS       = ""
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5  = 0d8049949263f9a2b8deb2ae9919bc49
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_SRC) && mv vdr-plugin-eepg-$(GIT_VER) $(THISAPP)
+
+       cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+               CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+               LOCALEDIR=$$(pwd)/locale all
+
+       mkdir -pv /etc/vdr/plugins/eepg
+       cd $(DIR_APP) && install -m 755 libvdr-eepg.so \
+               /usr/lib/vdr/libvdr-eepg.so.$(VDRPLUGVER)
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 50fca8f7644c5a1d65f7e209d9fcf89f87f2fa6f..c9c5a71be70f31bcd170c118a46f56d0ce9c7a5a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -681,6 +681,8 @@ buildipfire() {
   ipfiremake vdr_streamdev
   ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
+  ipfiremake vdr_dvbapi
+  ipfiremake vdr_eepg
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator