From ffa13f512b672e8492a266044d090a84ded6eec8 Mon Sep 17 00:00:00 2001 From: wittinobi Date: Fri, 12 Jul 2013 16:10:09 +0200 Subject: [PATCH] many fixes and updates --- Makefile | 2 +- archive-patches/kernel-2.6.34.13-cnxt.config | 43 ++++++---- config | 7 +- make/archives.mk | 4 +- make/bootstrap.mk | 4 + make/environment.mk | 6 +- make/kernel.mk | 2 +- make/libraries.mk | 22 +++-- make/neutrino.mk | 6 +- make/plugins.mk | 2 +- make/prerequisites.mk | 80 +++++++++---------- make/toolchecker.mk | 17 ++++ skel-root/etc/init.d/rcB.local | 2 + skel-root/etc/init.d/rcS-kernel-2.6.26.8-cnxt | 8 +- .../etc/init.d/rcS-kernel-2.6.34.13-cnxt | 8 +- .../etc/init.d/rcS-kernel-2.6.35.14-cnxt | 8 +- skel-root/etc/init.d/rcS-kernel-2.6.39.4-cnxt | 8 +- skel-root/etc/init.d/rcS.local | 6 +- skel-root/etc/init.d/start_neutrino | 8 +- skel-root/etc/init.d/upnp.sh | 13 +++ 20 files changed, 169 insertions(+), 87 deletions(-) create mode 100755 skel-root/etc/init.d/rcB.local create mode 100755 skel-root/etc/init.d/upnp.sh diff --git a/Makefile b/Makefile index cb32ae4..d198206 100755 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ prerequisites: bootstrap: $(MAKE) targetprefix $(BUILD_TMP) $(CROSS_BASE) $(HOSTPREFIX)/bin includes-and-libs modules $(TARGETPREFIX)/lib/libc.so.6 $(ARCHIVE) includes-and-libs: - $(MAKE) $(TARGETPREFIX)/lib/libnxp.so $(TARGETPREFIX)/lib/libcoolstream.so $(TARGETPREFIX)/lib/firmware $(TARGETPREFIX)/include/coolstream + $(MAKE) $(TARGETPREFIX)/lib/libnxp.so $(TARGETPREFIX)/lib/libcoolstream.so $(TARGETPREFIX)/lib/libca-sc.so $(TARGETPREFIX)/lib/firmware $(TARGETPREFIX)/include/coolstream modules: if [ $(CST_KERNEL_VERSION) = "2.6.26.8" ]; then \ $(MAKE) $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis; \ diff --git a/archive-patches/kernel-2.6.34.13-cnxt.config b/archive-patches/kernel-2.6.34.13-cnxt.config index 36167e4..fbd1da9 100644 --- a/archive-patches/kernel-2.6.34.13-cnxt.config +++ b/archive-patches/kernel-2.6.34.13-cnxt.config @@ -291,6 +291,7 @@ CONFIG_CPU_CP15_MMU=y CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_CPU_HAS_PMU=y CONFIG_ARM_ERRATA_411920=y +CONFIG_COMMON_CLKDEV=y # # Bus support @@ -706,7 +707,7 @@ CONFIG_ARCVMAC=y CONFIG_WLAN=y # CONFIG_LIBERTAS_THINFIRM is not set # CONFIG_AT76C50X_USB is not set -# CONFIG_USB_ZD1201 is not set +CONFIG_USB_ZD1201=m # CONFIG_USB_NET_RNDIS_WLAN is not set CONFIG_RTL8187=m # CONFIG_MAC80211_HWSIM is not set @@ -716,11 +717,11 @@ CONFIG_RTL8187=m # CONFIG_HOSTAP is not set # CONFIG_LIBERTAS is not set # CONFIG_P54_COMMON is not set -CONFIG_RT2X00=y +CONFIG_RT2X00=m CONFIG_RT2500USB=m CONFIG_RT73USB=m CONFIG_RT2800USB=m -# CONFIG_RT2800USB_RT30XX is not set +CONFIG_RT2800USB_RT30XX=y # CONFIG_RT2800USB_RT35XX is not set # CONFIG_RT2800USB_UNKNOWN is not set CONFIG_RT2800_LIB=m @@ -731,7 +732,8 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y # CONFIG_RT2X00_DEBUG is not set # CONFIG_WL12XX is not set -# CONFIG_ZD1211RW is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -771,7 +773,7 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # @@ -1069,7 +1071,7 @@ CONFIG_DVB_FE_CUSTOMISE=y # CONFIG_DVB_OR51132 is not set # CONFIG_DVB_BCM3510 is not set # CONFIG_DVB_LGDT330X is not set -CONFIG_DVB_LGDT3304=m +# CONFIG_DVB_LGDT3304 is not set # CONFIG_DVB_LGDT3305 is not set # CONFIG_DVB_S5H1409 is not set # CONFIG_DVB_S5H1411 is not set @@ -1469,8 +1471,12 @@ CONFIG_JBD2=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set -# CONFIG_XFS_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set @@ -1484,7 +1490,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m -# CONFIG_CUSE is not set +CONFIG_CUSE=m # # Caches @@ -1494,8 +1500,11 @@ CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems # -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +# CONFIG_ZISOFS is not set +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems @@ -1556,14 +1565,20 @@ CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set CONFIG_ROOT_NFS=y -# CONFIG_NFSD is not set +CONFIG_NFSD=y +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CEPH_FS is not set diff --git a/config b/config index 6c1f643..4381c67 100755 --- a/config +++ b/config @@ -14,12 +14,13 @@ TARGET=arm-cx2450x-linux-gnueabi # BUILD=x86_64-unknown-linux-gnu # choose one of the following neutrino-hd-port versions: -# NEUTRINO_HD_PORT=neutrino-hd-novatux (novatux tuxbox port) # NEUTRINO_HD_PORT=neutrino-hd-single-old (coolstream neutrino-experimental port) # NEUTRINO_HD_PORT=neutrino-hd-single (coolstream single port) # NEUTRINO_HD_PORT=neutrino-hd-master (coolstream master port) -# NEUTRINO_HD_PORT=neutrino-hd-twin (coolstream dvbsi++ port) -NEUTRINO_HD_PORT=neutrino-hd-twin +# NEUTRINO_HD_PORT=neutrino-hd-pucc (coolstream pu/cc port) +# NEUTRINO_HD_PORT=neutrino-hd-next (coolstream next port) +# NEUTRINO_HD_PORT=neutrino-hd-next-cc (coolstream next-cc port) +NEUTRINO_HD_PORT=neutrino-hd-next-cc # choose one of the following kernel versions: # CST_KERNEL_VERSION=2.6.26.8 diff --git a/make/archives.mk b/make/archives.mk index 8ffd52c..bb19da9 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -203,8 +203,8 @@ $(ARCHIVE)/crosstool-1.3.2-downloads.tar.bz2: $(ARCHIVE)/crosstool-1.16.0-downloads.tar.bz2: $(WGET) http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.16.0.tar.bz2 - $(WGET) http://ex.seabright.co.nz/misc/mirror/downloads/old/eglibc-2_13.tar.bz2 - $(WGET) http://ex.seabright.co.nz/misc/mirror/downloads/old/eglibc-ports-2_13.tar.bz2 + $(WGET) http://www.dbox2world.net/download/eglibc-2_13.tar.bz2 + $(WGET) http://www.dbox2world.net/download/eglibc-ports-2_13.tar.bz2 $(WGET) http://ftp.gnu.org/gnu/binutils/binutils-2.20.1a.tar.bz2 $(WGET) http://ftp.gnu.org/gnu/binutils/binutils-2.22.tar.bz2 $(WGET) http://gcc.cybermirror.org/infrastructure/cloog-ppl-0.15.11.tar.gz diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 6024e9c..3dbd162 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -46,6 +46,9 @@ $(TARGETPREFIX)/lib/libcoolstream.so: | $(TARGETPREFIX) cp -a $(SOURCE_DIR)/git/DRIVERS/libs/libcoolstream-mt.so $(TARGETPREFIX)/lib/libcoolstream-mt.so; \ fi +$(TARGETPREFIX)/lib/libca-sc.so: | $(TARGETPREFIX) + cp -a $(SOURCE_DIR)/git/DRIVERS/libs/libca-sc.so $(TARGETPREFIX)/lib/libca-sc.so + $(TARGETPREFIX)/lib/firmware: | $(TARGETPREFIX) mkdir -p $@ cp -a $(SOURCE_DIR)/svn/THIRDPARTY/lib/firmware/* $@/ @@ -97,6 +100,7 @@ $(ARCHIVE): PHONY += $(TARGETPREFIX)/include/coolstream PHONY += $(TARGETPREFIX)/lib/libnxp.so PHONY += $(TARGETPREFIX)/lib/libcoolstream.so +PHONY += $(TARGETPREFIX)/lib/libca-sc.so PHONY += $(TARGETPREFIX)/lib/firmware PHONY += $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis PHONY += $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis diff --git a/make/environment.mk b/make/environment.mk index 334a923..cd8d81f 100755 --- a/make/environment.mk +++ b/make/environment.mk @@ -63,8 +63,10 @@ CONFIGURE = \ $(BUILDENV) \ ./configure $(CONFIGURE_OPTS) -SVN ?= svn --username coolstream --password coolstream --no-auth-cache -SVNCO ?= $(SVN) co http://www.coolstreamtech.de/coolstream_public_svn +#SVN ?= svn --username coolstream --password coolstream --no-auth-cache +#SVNCO ?= $(SVN) co http://www.coolstreamtech.de/coolstream_public_svn +SVN ?= svn +SVNCO ?= $(SVN) co http://tuxcode.svn.sourceforge.net/svnroot/tuxcode CSGIT ?= git://c00lstreamtech.de diff --git a/make/kernel.mk b/make/kernel.mk index 822f79a..ee83f27 100755 --- a/make/kernel.mk +++ b/make/kernel.mk @@ -121,7 +121,7 @@ $(D)/coolstream-kernel-2.6.35.14-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREF cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/mtd/devices/mtdram.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/mtdram.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/net/wireless/rtl818x/rtl8187.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/rtl8187.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/staging/rt2870/rt2870sta.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/rt2870sta.ko - cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/staging/rtl8192u/r8192u_usb.ko $(TARGETPREFIX)/lib/modules/2.6.35.14nevis/r8192u_usb.ko + cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/staging/rtl8192u/r8192u_usb.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/r8192u_usb.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/usb/serial/ftdi_sio.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/ftdi_sio.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/usb/serial/pl2303.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/pl2303.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/usb/serial/usbserial.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/usbserial.ko diff --git a/make/libraries.mk b/make/libraries.mk index b465bb5..e729cff 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -441,6 +441,13 @@ $(D)/ffmpeg: | $(TARGETPREFIX) --enable-parser=dvdsub \ --enable-parser=dvbsub \ --disable-decoders \ + --enable-decoder=text \ + --enable-decoder=srt \ + --enable-decoder=subrip \ + --enable-decoder=subviewer \ + --enable-decoder=subviewer1 \ + --enable-decoder=xsub \ + --enable-decoder=pgssub \ --enable-decoder=dca \ --enable-decoder=dvdsub \ --enable-decoder=dvbsub \ @@ -459,33 +466,36 @@ $(D)/ffmpeg: | $(TARGETPREFIX) --enable-demuxer=mp3 \ --enable-demuxer=pcm_s16le \ --enable-demuxer=matroska \ + --enable-demuxer=flv \ + --enable-demuxer=rm \ --disable-encoders \ --disable-muxers \ --disable-ffplay \ --disable-ffmpeg \ --disable-ffserver \ - --disable-ffprobe \ --disable-static \ --disable-filters \ - --arch=arm \ - --cpu=armv6 \ --disable-protocols \ --enable-protocol=file \ + --enable-protocol=http \ --enable-bsfs \ --disable-devices \ - --disable-swresample \ + --enable-swresample \ --disable-postproc \ --disable-swscale \ --disable-mmx \ --disable-altivec \ --disable-zlib \ - --disable-network \ + --enable-network \ --enable-cross-compile \ --enable-shared \ - --cross-prefix=$(TARGET)- \ --enable-bzlib \ --enable-debug \ --enable-stripping \ + --arch=arm \ + --disable-neon \ + --cpu=armv6 \ + --cross-prefix=$(TARGET)- \ --target-os=linux && \ $(MAKE) && \ $(MAKE) install && \ diff --git a/make/neutrino.mk b/make/neutrino.mk index cdcbf71..c0ba5ee 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -29,7 +29,7 @@ $(N_OBJDIR)/config.status: libraries-int export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ CC=$(TARGET)-gcc CFLAGS="$(OLD_N_CFLAGS)" CXXFLAGS="$(OLD_N_CFLAGS)" LDFLAGS="$(N_LDFLAGS)" \ $(SOURCE_DIR)/neutrino-hd/configure --host=$(TARGET) --build=$(BUILD) --prefix= \ - --enable-maintainer-mode --with-target=cdk + --enable-maintainer-mode --with-target=cdk --with-targetprefix= --enable-pip $(N_OBJDIR)/config-new.status: libraries-int-new test -d $(N_OBJDIR) || mkdir -p $(N_OBJDIR) @@ -39,10 +39,10 @@ $(N_OBJDIR)/config-new.status: libraries-int-new export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ CC=$(TARGET)-gcc CFLAGS="$(N_CFLAGS)" CXXFLAGS="$(N_CFLAGS)" LDFLAGS="$(N_LDFLAGS)" \ $(SOURCE_DIR)/neutrino-hd/configure --host=$(TARGET) --build=$(BUILD) --prefix= \ - --enable-maintainer-mode --with-target=cdk + --enable-maintainer-mode --with-target=cdk --with-targetprefix= --enable-pip $(TARGETPREFIX)/.version: $(TARGETPREFIX)/bin/neutrino - echo "version=0208`date +%Y%m%d%H%M`" > $@ + echo "version=0212`date +%Y%m%d%H%M`" > $@ echo "creator=`id -un` (wittinobi's BS GIT Build: `cd $(BASE_DIR) && git log | grep "^commit" | wc -l`)" >> $@ echo "docs=http://wiki.neutrino-hd.de" >> $@ echo "homepage=http://www.wiki.wittinobi.de" >> $@ diff --git a/make/plugins.mk b/make/plugins.mk index 9450057..ae32480 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -195,7 +195,7 @@ $(D)/logomask: cp -f $(BUILD_TMP)/logomask/logoset.cfg $(LIBPLUG)/ cp -f $(BUILD_TMP)/logomask/logomask.so $(LIBPLUG)/ cp -f $(BUILD_TMP)/logomask/logomask.cfg $(LIBPLUG)/ - cp -f $(BUILD_TMP)/logomask/lmask $(LIBPLUG)/ + cp -f $(BUILD_TMP)/logomask/logomask.sh $(TARGETPREFIX)/bin/ cp -f $(BUILD_TMP)/logomask/logomask $(TARGETPREFIX)/bin/ rm -rf $(BUILD_TMP)/logomask touch $@ diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 56f544a..982ab37 100755 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -3,22 +3,7 @@ $(SOURCE_DIR)/neutrino-hd: mkdir -p $(SOURCE_DIR) cd $(SOURCE_DIR) && \ - if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-novatux" ]; then \ - if [ -d $(SOURCE_DIR)/neutrino-hd-novatux/ ]; then \ - cd $(SOURCE_DIR)/neutrino-hd-novatux && \ - git pull origin tuxbox-port && \ - rm -rf $(SOURCE_DIR)/neutrino-hd; \ - cd $(SOURCE_DIR) && \ - ln -sf neutrino-hd-novatux neutrino-hd; \ - else \ - git clone $(NTGIT)/neutrino-hd/ neutrino-hd-novatux; \ - cd $(SOURCE_DIR)/neutrino-hd-novatux && \ - git checkout --track -b tuxbox-port origin/tuxbox-port && \ - rm -rf $(SOURCE_DIR)/neutrino-hd; \ - cd $(SOURCE_DIR) && \ - ln -sf neutrino-hd-novatux neutrino-hd; \ - fi; \ - elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single-old" ]; then \ + if [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single-old" ]; then \ if [ -d $(SOURCE_DIR)/neutrino-hd-single-old/ ]; then \ cd $(SOURCE_DIR)/neutrino-hd-single-old && \ git pull origin neutrino-experimental && \ @@ -33,21 +18,6 @@ $(SOURCE_DIR)/neutrino-hd: cd $(SOURCE_DIR) && \ ln -sf neutrino-hd-single-old neutrino-hd; \ fi; \ - elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-single" ]; then \ - if [ -d $(SOURCE_DIR)/neutrino-hd-single/ ]; then \ - cd $(SOURCE_DIR)/neutrino-hd-single && \ - git pull origin single && \ - rm -rf $(SOURCE_DIR)/neutrino-hd; \ - cd $(SOURCE_DIR) && \ - ln -sf neutrino-hd-single neutrino-hd; \ - else \ - git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-single; \ - cd $(SOURCE_DIR)/neutrino-hd-single && \ - git checkout --track -b single origin/single && \ - rm -rf $(SOURCE_DIR)/neutrino-hd; \ - cd $(SOURCE_DIR) && \ - ln -sf neutrino-hd-single neutrino-hd; \ - fi; \ elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-master" ]; then \ if [ -d $(SOURCE_DIR)/neutrino-hd-master/ ]; then \ cd $(SOURCE_DIR)/neutrino-hd-master && \ @@ -63,20 +33,50 @@ $(SOURCE_DIR)/neutrino-hd: cd $(SOURCE_DIR) && \ ln -sf neutrino-hd-master neutrino-hd; \ fi; \ - elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-twin" ]; then \ - if [ -d $(SOURCE_DIR)/neutrino-hd-twin/ ]; then \ - cd $(SOURCE_DIR)/neutrino-hd-twin && \ - git pull origin dvbsi++ && \ + elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-pucc" ]; then \ + if [ -d $(SOURCE_DIR)/neutrino-hd-pucc/ ]; then \ + cd $(SOURCE_DIR)/neutrino-hd-pucc && \ + git pull origin pu/cc && \ + rm -rf $(SOURCE_DIR)/neutrino-hd; \ + cd $(SOURCE_DIR) && \ + ln -sf neutrino-hd-pucc neutrino-hd; \ + else \ + git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-pucc; \ + cd $(SOURCE_DIR)/neutrino-hd-pucc && \ + git checkout --track -b pu/cc origin/pu/cc && \ + rm -rf $(SOURCE_DIR)/neutrino-hd; \ + cd $(SOURCE_DIR) && \ + ln -sf neutrino-hd-pucc neutrino-hd; \ + fi; \ + elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-next-cc" ]; then \ + if [ -d $(SOURCE_DIR)/neutrino-hd-next-cc/ ]; then \ + cd $(SOURCE_DIR)/neutrino-hd-next-cc && \ + git pull origin next-cc && \ + rm -rf $(SOURCE_DIR)/neutrino-hd; \ + cd $(SOURCE_DIR) && \ + ln -sf neutrino-hd-next-cc neutrino-hd; \ + else \ + git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-next-cc; \ + cd $(SOURCE_DIR)/neutrino-hd-next-cc && \ + git checkout --track -b next-cc origin/next-cc && \ + rm -rf $(SOURCE_DIR)/neutrino-hd; \ + cd $(SOURCE_DIR) && \ + ln -sf neutrino-hd-next-cc neutrino-hd; \ + fi; \ + elif [ $(NEUTRINO_HD_PORT) = "neutrino-hd-next" ]; then \ + if [ -d $(SOURCE_DIR)/neutrino-hd-next/ ]; then \ + cd $(SOURCE_DIR)/neutrino-hd-next && \ + git pull origin next && \ rm -rf $(SOURCE_DIR)/neutrino-hd; \ cd $(SOURCE_DIR) && \ - ln -sf neutrino-hd-twin neutrino-hd; \ + ln -sf neutrino-hd-next neutrino-hd; \ else \ - git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-twin; \ - cd $(SOURCE_DIR)/neutrino-hd-twin && \ - git checkout --track -b dvbsi++ origin/dvbsi++ && \ + git clone $(CSGIT)/cst-public-gui-neutrino.git/ neutrino-hd-next; \ + cd $(SOURCE_DIR)/neutrino-hd-next && \ + git checkout --track -b next-cc origin/next && \ rm -rf $(SOURCE_DIR)/neutrino-hd; \ cd $(SOURCE_DIR) && \ - ln -sf neutrino-hd-twin neutrino-hd; \ + ln -sf neutrino-hd-next neutrino-hd; \ fi; \ else \ if [ -d $(SOURCE_DIR)/neutrino-hd-single/ ]; then \ diff --git a/make/toolchecker.mk b/make/toolchecker.mk index 6ebf777..a01f11f 100755 --- a/make/toolchecker.mk +++ b/make/toolchecker.mk @@ -217,6 +217,23 @@ echo "" else echo -e "unp: \033[31mnot installed\033[0m" fi; + #---------------------------------------------# + # cmake + CMAKE=`which cmake` + if [ $CMAKE ] && [ $CMAKE != " " ]; then + echo "cmake: "`$CMAKE --version | $GREP cmake | $CUT -f3 -d " "` + else + echo -e "cmake: \033[31mnot installed\033[0m" + fi; + #---------------------------------------------# + # gperf + QPERF=`which gperf` + if [ $QPERF ] && [ $QPERF != " " ]; then + echo "gperf: "`$QPERF --version | $GREP gperf | $CUT -f3 -d " "` + else + echo -e "gperf: \033[31mnot installed\033[0m" + fi; + #---------------------------------------------# echo "" echo -e "\033[31m* check your installed hostapps in the list above !!!\033[0m" echo "" diff --git a/skel-root/etc/init.d/rcB.local b/skel-root/etc/init.d/rcB.local new file mode 100755 index 0000000..4f2692d --- /dev/null +++ b/skel-root/etc/init.d/rcB.local @@ -0,0 +1,2 @@ +#!/bin/sh +export PATH=/sbin:/bin:/usr/bin:/usr/sbin diff --git a/skel-root/etc/init.d/rcS-kernel-2.6.26.8-cnxt b/skel-root/etc/init.d/rcS-kernel-2.6.26.8-cnxt index f9e7133..0da8d0a 100755 --- a/skel-root/etc/init.d/rcS-kernel-2.6.26.8-cnxt +++ b/skel-root/etc/init.d/rcS-kernel-2.6.26.8-cnxt @@ -36,6 +36,7 @@ dmesg -n1 /sbin/insmod tda10023 /sbin/insmod avl2108 /sbin/insmod max2112 +/sbin/insmod cs_frontend_prop /sbin/insmod dvb-core /sbin/insmod cs_frontend /bin/dt -t"Loading SATA" @@ -47,8 +48,8 @@ dmesg -n1 if [ -e /etc/init.d/update.sh ]; then /etc/init.d/update.sh fi -if [ -e /etc/init.d/rcB ]; then - /etc/init.d/rcB +if [ -e /etc/init.d/rcB.local ]; then + /etc/init.d/rcB.local fi if [ -e /etc/init.d/rcS.local ]; then /etc/init.d/rcS.local @@ -59,4 +60,7 @@ fi if [ -e /bin/tuxmaild ]; then /bin/tuxmaild & fi +if [ -e /etc/init.d/upnp.sh ]; then + /etc/init.d/upnp.sh +fi /etc/init.d/start_neutrino & diff --git a/skel-root/etc/init.d/rcS-kernel-2.6.34.13-cnxt b/skel-root/etc/init.d/rcS-kernel-2.6.34.13-cnxt index 9ab2f56..6dd603c 100755 --- a/skel-root/etc/init.d/rcS-kernel-2.6.34.13-cnxt +++ b/skel-root/etc/init.d/rcS-kernel-2.6.34.13-cnxt @@ -39,6 +39,7 @@ dmesg -n1 /sbin/insmod tda10023 /sbin/insmod avl2108 /sbin/insmod max2112 +/sbin/insmod cs_frontend_prop /sbin/insmod dvb-core /sbin/insmod cs_frontend /bin/dt -t"Loading SATA" @@ -51,8 +52,8 @@ dmesg -n1 if [ -e /etc/init.d/update.sh ]; then /etc/init.d/update.sh fi -if [ -e /etc/init.d/rcB ]; then - /etc/init.d/rcB +if [ -e /etc/init.d/rcB.local ]; then + /etc/init.d/rcB.local fi if [ -e /etc/init.d/rcS.local ]; then /etc/init.d/rcS.local @@ -63,4 +64,7 @@ fi if [ -e /bin/tuxmaild ]; then /bin/tuxmaild & fi +if [ -e /etc/init.d/upnp.sh ]; then + /etc/init.d/upnp.sh +fi /etc/init.d/start_neutrino & diff --git a/skel-root/etc/init.d/rcS-kernel-2.6.35.14-cnxt b/skel-root/etc/init.d/rcS-kernel-2.6.35.14-cnxt index 9ab2f56..6dd603c 100755 --- a/skel-root/etc/init.d/rcS-kernel-2.6.35.14-cnxt +++ b/skel-root/etc/init.d/rcS-kernel-2.6.35.14-cnxt @@ -39,6 +39,7 @@ dmesg -n1 /sbin/insmod tda10023 /sbin/insmod avl2108 /sbin/insmod max2112 +/sbin/insmod cs_frontend_prop /sbin/insmod dvb-core /sbin/insmod cs_frontend /bin/dt -t"Loading SATA" @@ -51,8 +52,8 @@ dmesg -n1 if [ -e /etc/init.d/update.sh ]; then /etc/init.d/update.sh fi -if [ -e /etc/init.d/rcB ]; then - /etc/init.d/rcB +if [ -e /etc/init.d/rcB.local ]; then + /etc/init.d/rcB.local fi if [ -e /etc/init.d/rcS.local ]; then /etc/init.d/rcS.local @@ -63,4 +64,7 @@ fi if [ -e /bin/tuxmaild ]; then /bin/tuxmaild & fi +if [ -e /etc/init.d/upnp.sh ]; then + /etc/init.d/upnp.sh +fi /etc/init.d/start_neutrino & diff --git a/skel-root/etc/init.d/rcS-kernel-2.6.39.4-cnxt b/skel-root/etc/init.d/rcS-kernel-2.6.39.4-cnxt index 814bae1..80beff4 100755 --- a/skel-root/etc/init.d/rcS-kernel-2.6.39.4-cnxt +++ b/skel-root/etc/init.d/rcS-kernel-2.6.39.4-cnxt @@ -41,6 +41,7 @@ dmesg -n1 /sbin/insmod tda10023 /sbin/insmod avl2108 /sbin/insmod max2112 +/sbin/insmod cs_frontend_prop /sbin/insmod dvb-core /sbin/insmod cs_frontend /bin/dt -t"Loading SATA" @@ -53,8 +54,8 @@ dmesg -n1 if [ -e /etc/init.d/update.sh ]; then /etc/init.d/update.sh fi -if [ -e /etc/init.d/rcB ]; then - /etc/init.d/rcB +if [ -e /etc/init.d/rcB.local ]; then + /etc/init.d/rcB.local fi if [ -e /etc/init.d/rcS.local ]; then /etc/init.d/rcS.local @@ -65,4 +66,7 @@ fi if [ -e /bin/tuxmaild ]; then /bin/tuxmaild & fi +if [ -e /etc/init.d/upnp.sh ]; then + /etc/init.d/upnp.sh +fi /etc/init.d/start_neutrino & diff --git a/skel-root/etc/init.d/rcS.local b/skel-root/etc/init.d/rcS.local index 0dcdbb4..7b9168c 100755 --- a/skel-root/etc/init.d/rcS.local +++ b/skel-root/etc/init.d/rcS.local @@ -1,5 +1,7 @@ #!/bin/sh export PATH=/sbin:/bin:/usr/bin:/usr/sbin - - +#FritzCallMonitor starten +if [ -e /var/bin/FritzCallMonitor ]; then + /var/bin/FritzCallMonitor & +fi diff --git a/skel-root/etc/init.d/start_neutrino b/skel-root/etc/init.d/start_neutrino index 26fd79d..15d382c 100755 --- a/skel-root/etc/init.d/start_neutrino +++ b/skel-root/etc/init.d/start_neutrino @@ -3,15 +3,15 @@ export PATH=/sbin:/bin:/usr/bin:/usr/sbin if [ -e /var/etc/.noblink ]; then if [ -e /var/etc/.neutrino_debug ]; then - /bin/neutrino --noblink -u 2>&1 > /dev/console + /bin/neutrino --noblink -u 3 > /dev/console 2> /dev/console else - /bin/neutrino --noblink -u 2>&1 > /dev/null + /bin/neutrino --noblink -u -v 3 > /dev/null 2> /dev/null fi else if [ -e /var/etc/.neutrino_debug ]; then - /bin/neutrino -u 2>&1 > /dev/console + /bin/neutrino -u 3 > /dev/console 2> /dev/console else - /bin/neutrino -u 2>&1 > /dev/null + /bin/neutrino -u -v 3 > /dev/null 2> /dev/null fi fi diff --git a/skel-root/etc/init.d/upnp.sh b/skel-root/etc/init.d/upnp.sh new file mode 100755 index 0000000..6e353c9 --- /dev/null +++ b/skel-root/etc/init.d/upnp.sh @@ -0,0 +1,13 @@ +#!/bin/sh +export PATH=/sbin:/bin:/usr/bin:/usr/sbin + +mkdir /media/00upnp + +if [ -e /var/etc/.djmount ]; then + /bin/djmount -o iocharset=utf8 /media/00upnp +fi + +if [ -e /var/etc/.ushare ]; then + sleep 10 + /bin/ushare -D +fi -- 2.39.5