From: Laurent Mazet Date: Tue, 15 Sep 2015 08:56:54 +0000 (+0200) Subject: Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500 X-Git-Tag: debian_7.8.4~8 X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=4ec55a784b05179a73f7666e41d91fd6662122ef;hp=d3151854d03b1a8b3d50d2c1959a62350bb5a9c7;p=debian6500.git Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500 --- diff --git a/.gitignore b/.gitignore index 5d5e210..210664f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,10 @@ *.orig .*project .settings +*.iso +trc6500-master-file_*.deb +simple-cdd/build.log +simple-cdd/dists/ +simple-cdd/images/ +trc6500-master-file/deb diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2c2a28a --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +SHELL=/bin/bash + +MASTERFILE = trc6500-master-file + +VERSION = $(shell awk '/^$(MASTERFILE)/ {gsub(/[()]/, ""); print $$2; exit}' $(MASTERFILE)/debian/debian-changelog) + +ISOVER = $(shell echo $(VERSION) | sed 's/-.*$$//') + +ISO = simple-cdd/images/debian-7.8-amd64-CD-1.iso + +TARGET_ISO = debian-trc6500-$(ISOVER).iso + +TARGET_DEB = $(MASTERFILE)_$(VERSION)_all.deb + +all: iso masterfile + +iso: $(TARGET_ISO) + +$(TARGET_ISO): $(ISO) + mv $< $@ + +$(ISO): $(TARGET_DEB) + cd simple-cdd && build-simple-cdd --dist wheezy --conf ./simple-cdd.conf + +masterfile: $(TARGET_DEB) + +$(TARGET_DEB): + make -C $(MASTERFILE) + +clean: + rm -f $(TARGET_DEB) $(TARGET_ISO) diff --git a/master/etc/default/rproxy b/master/etc/default/rproxy deleted file mode 100644 index 7b0dcda..0000000 --- a/master/etc/default/rproxy +++ /dev/null @@ -1,7 +0,0 @@ -# rproxy configure options - -# Should webconfig be enabled? -SERVICE=yes - -# SITES: filename containing site declarations -SITES=/etc/rproxy/sites.csv diff --git a/master/etc/rproxy/sites.csv b/master/etc/rproxy/sites.csv deleted file mode 100644 index 6589008..0000000 --- a/master/etc/rproxy/sites.csv +++ /dev/null @@ -1,8 +0,0 @@ -# Host;portExt;portInt -fe306-1;8110;80 -fe306-2;8120;80 -fe306-3;8130;80 -fe306-4;8140;80 -fe306-5;8150;80 -swg1;8231;80 -swg2;8232;80 diff --git a/simple-cdd/local_packages/dce_1.10.2-1_all.deb b/simple-cdd/local_packages/dce_1.10.2-1_all.deb deleted file mode 100644 index bf5bfe3..0000000 Binary files a/simple-cdd/local_packages/dce_1.10.2-1_all.deb and /dev/null differ diff --git a/simple-cdd/local_packages/libmadb-dev_0.8.1-1_amd64.deb b/simple-cdd/local_packages/libmadb-dev_0.8.1-1_amd64.deb deleted file mode 100644 index 1ca9ed9..0000000 Binary files a/simple-cdd/local_packages/libmadb-dev_0.8.1-1_amd64.deb and /dev/null differ diff --git a/simple-cdd/local_packages/libmadb0_0.8.1-1_amd64.deb b/simple-cdd/local_packages/libmadb0_0.8.1-1_amd64.deb deleted file mode 100644 index 31d8bd1..0000000 Binary files a/simple-cdd/local_packages/libmadb0_0.8.1-1_amd64.deb and /dev/null differ diff --git a/simple-cdd/local_packages/swb_1.2.0-1_all.deb b/simple-cdd/local_packages/swb_1.2.0-1_all.deb deleted file mode 100644 index 7d7706d..0000000 Binary files a/simple-cdd/local_packages/swb_1.2.0-1_all.deb and /dev/null differ diff --git a/simple-cdd/local_packages/webconfig_1.12.5-2_all.deb b/simple-cdd/local_packages/webconfig_1.12.5-2_all.deb deleted file mode 100644 index 2b43dae..0000000 Binary files a/simple-cdd/local_packages/webconfig_1.12.5-2_all.deb and /dev/null differ diff --git a/simple-cdd/local_packages/webconfig_1.12.6-1_all.deb b/simple-cdd/local_packages/webconfig_1.12.6-1_all.deb deleted file mode 100644 index fc32b7c..0000000 Binary files a/simple-cdd/local_packages/webconfig_1.12.6-1_all.deb and /dev/null differ diff --git a/simple-cdd/local_packages/webconfig_1.16.0-2_all.deb b/simple-cdd/local_packages/webconfig_1.16.0-2_all.deb new file mode 100644 index 0000000..6c8ae0d Binary files /dev/null and b/simple-cdd/local_packages/webconfig_1.16.0-2_all.deb differ diff --git a/simple-cdd/local_packages/xcfe_1.6.2-1_all.deb b/simple-cdd/local_packages/xcfe_1.6.2-1_all.deb deleted file mode 100644 index 06b2c33..0000000 Binary files a/simple-cdd/local_packages/xcfe_1.6.2-1_all.deb and /dev/null differ diff --git a/simple-cdd/local_packages/xcfe_1.6.3-1_all.deb b/simple-cdd/local_packages/xcfe_1.6.3-1_all.deb deleted file mode 100644 index ccdc238..0000000 Binary files a/simple-cdd/local_packages/xcfe_1.6.3-1_all.deb and /dev/null differ diff --git a/simple-cdd/profiles/trc6500.postinst b/simple-cdd/profiles/trc6500.postinst index 4a808e8..5670732 100755 --- a/simple-cdd/profiles/trc6500.postinst +++ b/simple-cdd/profiles/trc6500.postinst @@ -18,7 +18,7 @@ echo 'force-confnew' > /etc/dpkg/dpkg.cfg.d/trc6500 # now we unpack our master archive and replace all those conf files and scripts and things echo 'Unpacking master config files..' -dpkg -i /media/cdrom/simple-cdd/trc6500-master-files* # version-proof +dpkg -i /media/cdrom/simple-cdd/trc6500-master-file* # version-proof chown root /etc/cron.d/getswitchtemp chown root /root/bin/get_switch_temperature echo 'Files unpacked.' diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf index ae6faff..5432ae9 100644 --- a/simple-cdd/simple-cdd.conf +++ b/simple-cdd/simple-cdd.conf @@ -3,13 +3,15 @@ # normally we should use the built-in simple_cdd_dir but I have doubts.. Let's use this. # you'll probably want to change that working_dir="/home/trc6500/cdd-attempt" +working_dir=$(pwd) # Profiles to include on the CD profiles="trc6500" build_profiles="trc6500" auto_profiles="trc6500" -do_mirror="false" +do_mirror="true" +debian_mirror="ftp://integration2/debian" profiles_udeb_dist="wheezy" mirror_component="main" mirror_tools="wget" @@ -23,7 +25,7 @@ local_packages="${working_dir}/local_packages" # for now, this includes : myrc.local, TRC6500.pub, local_packages/firmware-bnx2, and the deb package with all the master files # additionally, the bnx2 firmware is there because it resists being added to local_packages for some odd reason. So we'll install it by hand. #all_extras="${working_dir}/master.tar.gz,${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb" -all_extras="${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb, ${working_dir}/deb_build/trc6500-master-files*.deb" +all_extras="${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb, $(find ${working_dir}/.. -maxdepth 1 -name trc6500-master-file\*.deb|sort|tail -1)" # added value export SPLASHPNG="${working_dir}/splash-thales.png" diff --git a/trc6500-master-file/debian/debian-changelog b/trc6500-master-file/debian/debian-changelog index 31c6611..b95e918 100644 --- a/trc6500-master-file/debian/debian-changelog +++ b/trc6500-master-file/debian/debian-changelog @@ -1,4 +1,10 @@ -trc6500-master-files (7.8.3-1) unstable; urgency=low +trc6500-master-file (7.8.4-1) unstable; urgency=low + * update softndesign packages + * remove rproxy default files + + -- Laurent Mazet Mon, 14 Sep 2015 20:10:41 +0200 + +trc6500-master-file (7.8.3-1) unstable; urgency=low * Rebuild trc6500-master-file package to limit conflicts with trc6500 packages * Add lite tarball for xdf-30mhz-lite * Clean rc.local for xdf-12mhz, xdf-30mhz, and mhf @@ -10,19 +16,19 @@ trc6500-master-files (7.8.3-1) unstable; urgency=low -- Laurent Mazet Tue, 28 Jul 2015 14:02:50 +0200 -trc6500-master-files (7.8.2-1) unstable; urgency=low +trc6500-master-file (7.8.2-1) unstable; urgency=low * Keep standard 30MHzDF and adds the lite configuration -- Thomas Pérennou Mon, 22 Jun 2015 15:15:16 +0200 -trc6500-master-files (7.8.1-1) unstable; urgency=low +trc6500-master-file (7.8.1-1) unstable; urgency=low * .deb packaging -- Olivier Leobal Wed, 10 Jun 2015 14:16:08 +0200 -trc6500-master-files (7.8.0-1) unstable; urgency=low +trc6500-master-file (7.8.0-1) unstable; urgency=low * initial release (#1337) * added scripts from lgcore diff --git a/trc6500-master-file/script/cpumon_lite b/trc6500-master-file/script/cpumon_lite old mode 100644 new mode 100755