From d1e111d7e9ac2acf92dc6de3e389d73a54fc8e38 Mon Sep 17 00:00:00 2001 From: wittinobi Date: Fri, 26 Oct 2012 13:04:26 +0200 Subject: [PATCH] fix old crosstool, update personal settings --- make/crosstool.mk | 11 +- skel-root/var/tuxbox/config/scan.conf | 24 +- skel-root/var/tuxbox/config/zapit/audio.conf | 25 - .../var/tuxbox/config/zapit/bouquets.xml | 2102 ++-- .../var/tuxbox/config/zapit/frontend.conf | 104 +- .../var/tuxbox/config/zapit/services.xml | 8790 +++++++++-------- .../var/tuxbox/config/zapit/ubouquets.xml | 623 +- skel-root/var/tuxbox/config/zapit/zapit.conf | 1 + 8 files changed, 6097 insertions(+), 5583 deletions(-) delete mode 100644 skel-root/var/tuxbox/config/zapit/audio.conf diff --git a/make/crosstool.mk b/make/crosstool.mk index 5aae84f..4f74175 100755 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -8,11 +8,14 @@ crosstool: prerequisites | $(ARCHIVE)/crosstool-$(CROSSTOOL_VERSION)-downloads.t tar -C $(GIT_KERNEL) -cp linux-$(CST_KERNEL_VERSION)-cnxt --exclude=.git | tar -C $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_VERSION)/targets/src -x; \ tar cfvj $(BASE_DIR)/download/linux-$(CST_KERNEL_VERSION)-cnxt.tar.bz2 $(GIT_KERNEL)/linux-$(CST_KERNEL_VERSION)-cnxt; \ if [ $(CST_KERNEL_VERSION) = "2.6.26.8" ]; then \ - (cd targets/src/linux-2.6.26.8-cnxt && \ - patch -p1 -i $(PATCHES)/linux-2.6.26.8-new-make.patch && \ - patch -p1 -i $(PATCHES)/linux-2.6.26.8-rename-getline.patch && \ - patch -p1 -i $(PATCHES)/eglibc-2_8-new-make.patch); \ + cd targets/src/linux-2.6.26.8-cnxt; \ + patch -p1 -i $(PATCHES)/linux-2.6.26.8-rename-getline.patch; \ + if [ $(CROSSTOOL_VERSION) = "1.3.2" ]; then \ + patch -p1 -i $(PATCHES)/linux-2.6.26.8-new-make.patch; \ + patch -p1 -i $(PATCHES)/eglibc-2_8-new-make.patch; \ + fi; \ fi; \ + cd $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_VERSION); \ ln -sf linux-$(CST_KERNEL_VERSION)-cnxt targets/src/linux-custom; \ touch targets/src/.linux-custom.extracted; \ cp -a $(PATCHES)/crosstool-ng-$(CROSSTOOL_VERSION)-newconfig .config; \ diff --git a/skel-root/var/tuxbox/config/scan.conf b/skel-root/var/tuxbox/config/scan.conf index 0a8fe4f..c23f720 100644 --- a/skel-root/var/tuxbox/config/scan.conf +++ b/skel-root/var/tuxbox/config/scan.conf @@ -1,13 +1,19 @@ -TP_fec=3 -TP_freq= +TP_fec=20 +TP_freq=11493000 TP_mod=3 TP_pol=0 -TP_rate= +TP_rate=22000000 bouquetMode=3 +cable_nid=0 delivery_system=1 -diseqcMode=3 -diseqcRepeat=0 -satNameNoDiseqc=Astra 1F/1H/1KR/1L/1M (19.2E) -scanSectionsd=0 -scanType=3 -scan_mode=0 +fast_op=0 +fast_type=1 +satNameNoDiseqc=Astra 1H/1KR/1L/1M (19.2E) +scanType=96 +scan_bat=0 +scan_fta_flag=0 +scan_logical_hd=1 +scan_logical_numbers=0 +scan_nit=1 +scan_nit_manual=0 +scan_reset_numbers=0 diff --git a/skel-root/var/tuxbox/config/zapit/audio.conf b/skel-root/var/tuxbox/config/zapit/audio.conf deleted file mode 100644 index 91422d4..0000000 --- a/skel-root/var/tuxbox/config/zapit/audio.conf +++ /dev/null @@ -1,25 +0,0 @@ -a914041d0001526c 259 0 90 0 0 0 -ab60000f0085003a 2304 0 90 0 0 0 -b15803ef00011332 4923 0 90 0 0 0 -b20c03f200012b8e 6522 0 90 0 0 0 -b20c03f200012ba2 6722 0 90 0 0 0 -b24403f300012b7a 6322 0 90 0 0 0 -b24403f300012b84 6422 0 90 0 0 0 -b45403fb0001283d 5106 0 90 0 0 0 -b5b804010001285b 5262 0 90 0 0 0 -b914000200850008 2563 0 90 0 0 0 -b92207d400021ff7 3176 0 90 0 0 0 -ba4c000e0085007a 0 0 90 0 0 0 -ba4c000e0085007b 0 0 90 0 0 0 -bae8000600850081 771 0 90 0 0 0 -bae8000600850082 1027 0 80 0 0 0 -bb630c8c000336d8 420 0 90 0 0 0 -bc20000d00850070 515 0 90 0 0 0 -bc20000d00850071 771 0 90 0 0 0 -bcbc00040085000d 3328 0 90 0 0 0 -bcbc00040085000f 0 0 90 0 0 0 -bd58000100850032 2560 0 90 0 0 0 -c100000c00850069 258 0 90 0 0 0 -c2d404b100016ea6 5506 0 90 0 0 0 -c6d226ac013f01f6 822 0 90 0 0 0 -c784045f0035321a 929 0 80 0 0 0 diff --git a/skel-root/var/tuxbox/config/zapit/bouquets.xml b/skel-root/var/tuxbox/config/zapit/bouquets.xml index 10a466f..0be2495 100644 --- a/skel-root/var/tuxbox/config/zapit/bouquets.xml +++ b/skel-root/var/tuxbox/config/zapit/bouquets.xml @@ -21,7 +21,6 @@ - @@ -51,6 +50,10 @@ + - - + -