From 7cf8d4b77c1be839986f26cbd946ba28ae6a464e Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Tue, 28 Jul 2015 14:41:28 +0200 Subject: [PATCH] rebuild trc6500-master-file package to limit conflicts with trc6500 packages --- master/etc/init.d/ammwake | 6 +- master/etc/init.d/waitslaves | 6 +- master/etc/init.d/waitswitches | 6 +- master/etc/sudoers.d/pdmenu | 2 + master/etc/sudoers.d/webconfig | 2 + master/etc/webconfig/alias.csv | 74 +++++++++---------- simple-cdd/deb_build/master-files | 1 - simple-cdd/{readme => readme.txt} | 1 - .../Makefile | 14 ++-- .../debian-binary | 0 .../debian/debian-changelog | 6 ++ .../debian/debian-control | 0 .../debian/debian-postinst | 0 .../debian/debian-postrm | 0 .../debian/debian-preinst | 0 .../readme => trc6500-master-file/readme.txt | 0 .../script}/change_configuration.sh | 0 .../script}/check_network.sh | 0 .../script}/configure_fe306.sh | 1 - .../script}/configure_matrix.tcl | 0 .../script}/configure_switch.tcl | 0 .../script}/configure_switch_bootstrap.tcl | 0 .../script}/connect_switch.tcl | 0 .../script}/cpumon_lite | 0 .../script}/flash_fe306.sh | 1 - .../script}/set_mediatray.tcl | 0 26 files changed, 66 insertions(+), 54 deletions(-) delete mode 120000 simple-cdd/deb_build/master-files rename simple-cdd/{readme => readme.txt} (96%) rename {simple-cdd/deb_build => trc6500-master-file}/Makefile (83%) rename {simple-cdd/deb_build => trc6500-master-file}/debian-binary (100%) rename {simple-cdd/deb_build => trc6500-master-file}/debian/debian-changelog (80%) rename {simple-cdd/deb_build => trc6500-master-file}/debian/debian-control (100%) rename {simple-cdd/deb_build => trc6500-master-file}/debian/debian-postinst (100%) rename {simple-cdd/deb_build => trc6500-master-file}/debian/debian-postrm (100%) rename {simple-cdd/deb_build => trc6500-master-file}/debian/debian-preinst (100%) rename simple-cdd/deb_build/readme => trc6500-master-file/readme.txt (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/change_configuration.sh (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/check_network.sh (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/configure_fe306.sh (99%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/configure_matrix.tcl (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/configure_switch.tcl (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/configure_switch_bootstrap.tcl (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/connect_switch.tcl (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/cpumon_lite (100%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/flash_fe306.sh (97%) rename {simple-cdd/additional_scripts => trc6500-master-file/script}/set_mediatray.tcl (100%) diff --git a/master/etc/init.d/ammwake b/master/etc/init.d/ammwake index d592e98..c982883 100755 --- a/master/etc/init.d/ammwake +++ b/master/etc/init.d/ammwake @@ -20,12 +20,14 @@ VER=1.0 HOSTS="/etc/hosts" ENABLE="yes" -SCRIPT=/opt/trc6500/script/set_blade_power.tcl +SCRIPTS=/opt/script/set_blade_power.tcl /opt/trc6500/script/set_blade_power.tcl +SCRIPT= PATH=/sbin:/usr/sbin:/bin:/usr/bin [ -f /etc/default/ammwake ] && . /etc/default/ammwake -[ -x $SCRIPT ] || exit 1 +for s in $SCRIPTS; do [ -x $s ] && SCRIPT=$s; done +[ -x "$SCRIPT" ] || exit 1 [ "$ENABLE" = "yes" ] || exit 0 . /lib/lsb/init-functions diff --git a/master/etc/init.d/waitslaves b/master/etc/init.d/waitslaves index 647de2d..137e109 100755 --- a/master/etc/init.d/waitslaves +++ b/master/etc/init.d/waitslaves @@ -19,12 +19,14 @@ VER=1.0 ### END INIT INFO ENABLE="yes" -SCRIPT=/opt/trc6500/script/check_network.sh +SCRIPTS=/opt/script/check_network.sh /opt/trc6500/script/check_network.sh +SCRIPT= TIMEOUT=360 PATH=/sbin:/usr/sbin:/bin:/usr/bin [ -f /etc/default/waitslaves ] && . /etc/default/waitslaves -[ -x $SCRIPT ] || exit 1 +for s in $SCRIPTS; do [ -x $s ] && SCRIPT=$s; done +[ -x "$SCRIPT" ] || exit 1 [ "$ENABLE" = "yes" ] || exit 0 . /lib/lsb/init-functions diff --git a/master/etc/init.d/waitswitches b/master/etc/init.d/waitswitches index d807ef1..f75abba 100755 --- a/master/etc/init.d/waitswitches +++ b/master/etc/init.d/waitswitches @@ -19,12 +19,14 @@ VER=1.0 ### END INIT INFO ENABLE="yes" -SCRIPT=/opt/trc6500/script/check_switches.sh +SCRIPTS=/opt/script/check_switches.sh /opt/trc6500/script/check_switches.sh +SCRIPT= TIMEOUT=360 PATH=/sbin:/usr/sbin:/bin:/usr/bin [ -f /etc/default/waitswitches ] && . /etc/default/waitswitches -[ -x $SCRIPT ] || exit 1 +for s in $SCRIPTS; do [ -x $s ] && SCRIPT=$s; done +[ -x "$SCRIPT" ] || exit 1 [ "$ENABLE" = "yes" ] || exit 0 . /lib/lsb/init-functions diff --git a/master/etc/sudoers.d/pdmenu b/master/etc/sudoers.d/pdmenu index 789fdd9..b21381d 100644 --- a/master/etc/sudoers.d/pdmenu +++ b/master/etc/sudoers.d/pdmenu @@ -1,11 +1,13 @@ # /etc/sudoers.d/trc6500 +trc6500 ALL = (root)NOPASSWD: /opt/script/check_network.sh * trc6500 ALL = (root)NOPASSWD: /opt/trc6500/script/check_network.sh * trc6500 ALL = (root)NOPASSWD: /sbin/halt trc6500 ALL = (root)NOPASSWD: /usr/sbin/service ammwake * trc6500 ALL = (root)NOPASSWD: /usr/sbin/service ipmiwake * trc6500 ALL = (root)NOPASSWD: /usr/sbin/service trc6500 * trc6500 ALL = (root)NOPASSWD: /usr/bin/make * +trc6500 ALL = (root)NOPASSWD: /opt/script/change_configuration.sh * trc6500 ALL = (root)NOPASSWD: /opt/trc6500/script/change_configuration.sh * trc6500 ALL = (root)NOPASSWD: /root/bin/change_lgcore.sh * diff --git a/master/etc/sudoers.d/webconfig b/master/etc/sudoers.d/webconfig index 4f15b4d..e924016 100644 --- a/master/etc/sudoers.d/webconfig +++ b/master/etc/sudoers.d/webconfig @@ -1,10 +1,12 @@ # /etc/sudoers.d/webconfig +webconfig ALL = (root)NOPASSWD: /opt/script/check_network.sh * webconfig ALL = (root)NOPASSWD: /opt/trc6500/script/check_network.sh * webconfig ALL = (root)NOPASSWD: /sbin/halt webconfig ALL = (root)NOPASSWD: /usr/sbin/service ammwake * webconfig ALL = (root)NOPASSWD: /usr/sbin/service ipmiwake * webconfig ALL = (root)NOPASSWD: /usr/sbin/service trc6500 * webconfig ALL = (root)NOPASSWD: /usr/bin/make * +webconfig ALL = (root)NOPASSWD: /opt/script/change_configuration.sh * webconfig ALL = (root)NOPASSWD: /opt/trc6500/script/change_configuration.sh * webconfig ALL = (root)NOPASSWD: /root/bin/change_lgcore.sh * diff --git a/master/etc/webconfig/alias.csv b/master/etc/webconfig/alias.csv index aa5c6bc..3bc9db2 100644 --- a/master/etc/webconfig/alias.csv +++ b/master/etc/webconfig/alias.csv @@ -16,35 +16,35 @@ start_active_phase;/usr/share/webconfig;;Start active phase;/opt/trc6500/bin/sta stop;/usr/share/webconfig;;Stop active phase;/opt/trc6500/bin/stop_active_phase halt;/usr/share/webconfig;;Shutdown TRC6500;sudo halt ;;;FE306 maintenance actions; -fe306;/usr/share/webconfig;;Configure all FE306;/opt/trc6500/script/configure_fe306 -a -FE306-1-flash;/usr/share/webconfig;;Flash FE306-1;/opt/trc6500/script/flash_fe306 -i fe306-1 -FE306-2-flash;/usr/share/webconfig;;Flash FE306-2;/opt/trc6500/script/flash_fe306 -i fe306-2 -FE306-3-flash;/usr/share/webconfig;;Flash FE306-3;/opt/trc6500/script/flash_fe306 -i fe306-3 -FE306-4-flash;/usr/share/webconfig;;Flash FE306-4;/opt/trc6500/script/flash_fe306 -i fe306-4 -FE306-5-flash;/usr/share/webconfig;;Flash FE306-5;/opt/trc6500/script/flash_fe306 -i fe306-5 +fe306;/usr/share/webconfig;;Configure all FE306;/opt/script/configure_fe306 -a +FE306-1-flash;/usr/share/webconfig;;Flash FE306-1;/opt/script/flash_fe306 -i fe306-1 +FE306-2-flash;/usr/share/webconfig;;Flash FE306-2;/opt/script/flash_fe306 -i fe306-2 +FE306-3-flash;/usr/share/webconfig;;Flash FE306-3;/opt/script/flash_fe306 -i fe306-3 +FE306-4-flash;/usr/share/webconfig;;Flash FE306-4;/opt/script/flash_fe306 -i fe306-4 +FE306-5-flash;/usr/share/webconfig;;Flash FE306-5;/opt/script/flash_fe306 -i fe306-5 ;;;Matrix maintenance actions; -maxtrix;/usr/share/webconfig;;Configure matrix;/opt/trc6500/script/configure_matrix +maxtrix;/usr/share/webconfig;;Configure matrix;/opt/script/configure_matrix ;;;Switch maintenance actions; -sw1-boot;/usr/share/webconfig;;Bootstrap switch SW1;/opt/trc6500/script/configure_switch_bootstrap sw1 -sw2-boot;/usr/share/webconfig;;Bootstrap switch SW2;/opt/trc6500/script/configure_switch_bootstrap sw2 -swg1-boot;/usr/share/webconfig;;Bootstrap switch SWG1;/opt/trc6500/script/configure_switch_bootstrap swg1 -swg2-boot;/usr/share/webconfig;;Bootstrap switch SWG2;/opt/trc6500/script/configure_switch_bootstrap swg2 -swm-boot;/usr/share/webconfig;;Bootstrap switch SWM;/opt/trc6500/script/configure_switch_bootstrap swm -sw1;/usr/share/webconfig;;Configure switch SW1;/opt/trc6500/script/configure_switch sw1 -sw2;/usr/share/webconfig;;Configure switch SW2;/opt/trc6500/script/configure_switch sw2 -swg1;/usr/share/webconfig;;Configure switch SWG1;/opt/trc6500/script/configure_switch swg1 -swg2;/usr/share/webconfig;;Configure switch SWG2;/opt/trc6500/script/configure_switch swg2 -swm;/usr/share/webconfig;;Configure switch SWM;/opt/trc6500/script/configure_switch swm -sw1-restart;/usr/share/webconfig;;Restart switch SW1;/opt/trc6500/script/connect_switch.tcl -c reload sw1 -sw2-restart;/usr/share/webconfig;;Restart switch SW2;/opt/trc6500/script/connect_switch.tcl -c reload sw2 -swg1-restart;/usr/share/webconfig;;Restart switch SWG1;/opt/trc6500/script/connect_switch.tcl -c reload swg1 -swg2-restart;/usr/share/webconfig;;Restart switch SWG2;/opt/trc6500/script/connect_switch.tcl -c reload swg2 -swm-restart;/usr/share/webconfig;;Restart switch SWM;/opt/trc6500/script/connect_switch.tcl -c reload swm +sw1-boot;/usr/share/webconfig;;Bootstrap switch SW1;/opt/script/configure_switch_bootstrap sw1 +sw2-boot;/usr/share/webconfig;;Bootstrap switch SW2;/opt/script/configure_switch_bootstrap sw2 +swg1-boot;/usr/share/webconfig;;Bootstrap switch SWG1;/opt/script/configure_switch_bootstrap swg1 +swg2-boot;/usr/share/webconfig;;Bootstrap switch SWG2;/opt/script/configure_switch_bootstrap swg2 +swm-boot;/usr/share/webconfig;;Bootstrap switch SWM;/opt/script/configure_switch_bootstrap swm +sw1;/usr/share/webconfig;;Configure switch SW1;/opt/script/configure_switch sw1 +sw2;/usr/share/webconfig;;Configure switch SW2;/opt/script/configure_switch sw2 +swg1;/usr/share/webconfig;;Configure switch SWG1;/opt/script/configure_switch swg1 +swg2;/usr/share/webconfig;;Configure switch SWG2;/opt/script/configure_switch swg2 +swm;/usr/share/webconfig;;Configure switch SWM;/opt/script/configure_switch swm +sw1-restart;/usr/share/webconfig;;Restart switch SW1;/opt/script/connect_switch.tcl -c reload sw1 +sw2-restart;/usr/share/webconfig;;Restart switch SW2;/opt/script/connect_switch.tcl -c reload sw2 +swg1-restart;/usr/share/webconfig;;Restart switch SWG1;/opt/script/connect_switch.tcl -c reload swg1 +swg2-restart;/usr/share/webconfig;;Restart switch SWG2;/opt/script/connect_switch.tcl -c reload swg2 +swm-restart;/usr/share/webconfig;;Restart switch SWM;/opt/script/connect_switch.tcl -c reload swm ;;;Blade maintenance actions; -bios;/usr/share/webconfig;;Configure BIOS for all Supermicro blades;sudo /opt/trc6500/script/check_network.sh -c '/opt/bios/update_bios_cfg.sh -y -Y' -o -ipmi;/usr/share/webconfig;;Configure IPMI for all Supermicro blades;sudo /opt/trc6500/script/check_network.sh -c '/opt/ipmi/update_blade_cfg.sh -y -Y' -o +bios;/usr/share/webconfig;;Configure BIOS for all Supermicro blades;sudo /opt/script/check_network.sh -c '/opt/bios/update_bios_cfg.sh -y -Y' -o +ipmi;/usr/share/webconfig;;Configure IPMI for all Supermicro blades;sudo /opt/script/check_network.sh -c '/opt/ipmi/update_blade_cfg.sh -y -Y' -o /dce;/usr/share/dce;/etc/dhcp/dhcpd.conf;DHCPD Configuration Editor;sudo service isc-dhcp-server restart -ntp;/usr/share/webconfig;;Synchronize time and date on all blades;sudo /opt/trc6500/script/check_network.sh -c 'service chrony stop; ntpdate-debian; service chrony start' -o +ntp;/usr/share/webconfig;;Synchronize time and date on all blades;sudo /opt/script/check_network.sh -c 'service chrony stop; ntpdate-debian; service chrony start' -o ;;;Internal equipements; http://10.133.26.160:8110;/usr/share/webconfig;;FE306-1;:goto: http://10.133.26.160:8120;/usr/share/webconfig;;FE306-2;:goto: @@ -62,19 +62,19 @@ ammwake;/usr/share/webconfig;;Power on all HS22 IBM slaves;sudo service ammwake ipmiwake;/usr/share/webconfig;;Power on all SuperMicro slaves;sudo service ipmiwake start ammwake;/usr/share/webconfig;;Power off all HS22 IBM slaves;sudo service ammwake stop ipmiwake;/usr/share/webconfig;;Power off all SuperMicro slaves;sudo service ipmiwake stop -mediatray;/usr/share/webconfig;;Set media-tray to HS22 master blade;/opt/trc6500/script/set_mediatray amm00 -b 1 -mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/trc6500/script/set_mediatray amm00 -b 0 && /opt/trc6500/script/set_mediatray amm01 -b 0 +mediatray;/usr/share/webconfig;;Set media-tray to HS22 master blade;/opt/script/set_mediatray amm00 -b 1 +mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/script/set_mediatray amm00 -b 0 && /opt/script/set_mediatray amm01 -b 0 ;;;Setup hardware actions; -8mhzmhf;/usr/share/webconfig;;Setup 8MHzMHF mode;sudo /opt/trc6500/script/change_configuration.sh 8MHzMHF -12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/trc6500/script/change_configuration.sh 12MHzDF -12mhzmdf;/usr/share/webconfig;;Setup 12MHzMDF mode;sudo /opt/trc6500/script/change_configuration.sh 12MHzMDF -30mhzmdf;/usr/share/webconfig;;Setup 30MHzMDF mode;sudo /opt/trc6500/script/change_configuration.sh 30MHzMDF -30mhzmdf.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/trc6500/script/change_configuration.sh 30MHzMDF.lite -30mhzmhf;/usr/share/webconfig;;Setup 30MHzMHF mode;sudo /opt/trc6500/script/change_configuration.sh 30MHzMHF -hw_ibm;/usr/share/webconfig;;Setup IBM HS22 chassis mode;sudo /opt/trc6500/script/change_configuration.sh hw_ibm -hw_supermicro;/usr/share/webconfig;;Setup FatTwin Supermicro chassis mode;sudo /opt/trc6500/script/change_configuration.sh hw_supermicro -tz_zulu;/usr/share/webconfig;;Setup Zulu timezone;sudo /opt/trc6500/script/change_configuration.sh tz_zulu -tz_paris;/usr/share/webconfig;;Setup Europe/Paris timezone;sudo /opt/trc6500/script/change_configuration.sh tz_paris +8mhzmhf;/usr/share/webconfig;;Setup 8MHzMHF mode;sudo /opt/script/change_configuration.sh 8MHzMHF +12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/script/change_configuration.sh 12MHzDF +12mhzmdf;/usr/share/webconfig;;Setup 12MHzMDF mode;sudo /opt/script/change_configuration.sh 12MHzMDF +30mhzmdf;/usr/share/webconfig;;Setup 30MHzMDF mode;sudo /opt/script/change_configuration.sh 30MHzMDF +30mhzmdf.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/script/change_configuration.sh 30MHzMDF.lite +30mhzmhf;/usr/share/webconfig;;Setup 30MHzMHF mode;sudo /opt/script/change_configuration.sh 30MHzMHF +hw_ibm;/usr/share/webconfig;;Setup IBM HS22 chassis mode;sudo /opt/script/change_configuration.sh hw_ibm +hw_supermicro;/usr/share/webconfig;;Setup FatTwin Supermicro chassis mode;sudo /opt/script/change_configuration.sh hw_supermicro +tz_zulu;/usr/share/webconfig;;Setup Zulu timezone;sudo /opt/script/change_configuration.sh tz_zulu +tz_paris;/usr/share/webconfig;;Setup Europe/Paris timezone;sudo /opt/script/change_configuration.sh tz_paris tarballs;/usr/share/webconfig;;Build tarballs;sudo make -f /opt/cluster/Makefile all ;;;Install LgCore actions; install-usb;/usr/share/webconfig;;Install LgCore from USB key;sudo /root/bin/change_lgcore.sh usb diff --git a/simple-cdd/deb_build/master-files b/simple-cdd/deb_build/master-files deleted file mode 120000 index eeb5f92..0000000 --- a/simple-cdd/deb_build/master-files +++ /dev/null @@ -1 +0,0 @@ -../../master/ \ No newline at end of file diff --git a/simple-cdd/readme b/simple-cdd/readme.txt similarity index 96% rename from simple-cdd/readme rename to simple-cdd/readme.txt index cd58b5c..5456125 100644 --- a/simple-cdd/readme +++ b/simple-cdd/readme.txt @@ -19,7 +19,6 @@ This CD does NOT create an usable operating system. All included systems should - the entire profiles/ directory is used by build-simple-cdd - myrc.local is the script executed on first boot - the local_packages/ directory contains packages not available on the regular repository, or more recent versions of packages available there. -- the additional_scripts/ directory contains useful scripts included in the trc6500-master-files deb archive, in the /opt/trc6500/script/ folder. - the deb_build/ folder contains the necessary stuff to build the trc6500-master-files deb package which contains a collection of scripts, config files and config instructions - TRC6500.pub is a GPG public key added to the OS's keyring during install, corresponding to a makeshift Debian repo from T. Pérennou - splash-thales.png is a 640*480 image used for the splashscreen diff --git a/simple-cdd/deb_build/Makefile b/trc6500-master-file/Makefile similarity index 83% rename from simple-cdd/deb_build/Makefile rename to trc6500-master-file/Makefile index f2ed7bb..dabfe20 100644 --- a/simple-cdd/deb_build/Makefile +++ b/trc6500-master-file/Makefile @@ -1,20 +1,20 @@ # -*- Makefile -*- -DIR = master-files/ +DIR = ../master/ CONFIGDIR = debian/ FILES = $(shell cd $(DIR); find etc/ -type f) -TARGET = $(MODULE)_$(VERSION)_$(ARCH).deb +TARGET = ../$(MODULE)_$(VERSION)_$(ARCH).deb OBJECTS = deb/DEBIAN/preinst \ deb/DEBIAN/postrm \ deb/DEBIAN/postinst \ - deb/opt/trc6500/script + deb/opt/script SHELL=/bin/bash -MODULE = trc6500-master-files +MODULE = $(shell basename `pwd`) ARCH = all .DEFAULT: all @@ -51,9 +51,9 @@ deb/DEBIAN/postrm: debian/debian-postrm deb $(addprefix $(DIR)/, $(FILES)) $(MAK deb/DEBIAN/postinst: debian/debian-postinst deb cp $< $@ -deb/opt/trc6500/script: ../additional_scripts deb - mkdir -p deb/opt/trc6500/script/ - cp ../additional_scripts/* deb/opt/trc6500/script/ +deb/opt/script: script deb + mkdir -p $@ + cp $ deb/DEBIAN/control diff --git a/simple-cdd/deb_build/debian-binary b/trc6500-master-file/debian-binary similarity index 100% rename from simple-cdd/deb_build/debian-binary rename to trc6500-master-file/debian-binary diff --git a/simple-cdd/deb_build/debian/debian-changelog b/trc6500-master-file/debian/debian-changelog similarity index 80% rename from simple-cdd/deb_build/debian/debian-changelog rename to trc6500-master-file/debian/debian-changelog index 6d0758f..6f058bf 100644 --- a/simple-cdd/deb_build/debian/debian-changelog +++ b/trc6500-master-file/debian/debian-changelog @@ -1,3 +1,9 @@ +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 * Keep standard 30MHzDF and adds the lite configuration diff --git a/simple-cdd/deb_build/debian/debian-control b/trc6500-master-file/debian/debian-control similarity index 100% rename from simple-cdd/deb_build/debian/debian-control rename to trc6500-master-file/debian/debian-control diff --git a/simple-cdd/deb_build/debian/debian-postinst b/trc6500-master-file/debian/debian-postinst similarity index 100% rename from simple-cdd/deb_build/debian/debian-postinst rename to trc6500-master-file/debian/debian-postinst diff --git a/simple-cdd/deb_build/debian/debian-postrm b/trc6500-master-file/debian/debian-postrm similarity index 100% rename from simple-cdd/deb_build/debian/debian-postrm rename to trc6500-master-file/debian/debian-postrm diff --git a/simple-cdd/deb_build/debian/debian-preinst b/trc6500-master-file/debian/debian-preinst similarity index 100% rename from simple-cdd/deb_build/debian/debian-preinst rename to trc6500-master-file/debian/debian-preinst diff --git a/simple-cdd/deb_build/readme b/trc6500-master-file/readme.txt similarity index 100% rename from simple-cdd/deb_build/readme rename to trc6500-master-file/readme.txt diff --git a/simple-cdd/additional_scripts/change_configuration.sh b/trc6500-master-file/script/change_configuration.sh similarity index 100% rename from simple-cdd/additional_scripts/change_configuration.sh rename to trc6500-master-file/script/change_configuration.sh diff --git a/simple-cdd/additional_scripts/check_network.sh b/trc6500-master-file/script/check_network.sh similarity index 100% rename from simple-cdd/additional_scripts/check_network.sh rename to trc6500-master-file/script/check_network.sh diff --git a/simple-cdd/additional_scripts/configure_fe306.sh b/trc6500-master-file/script/configure_fe306.sh similarity index 99% rename from simple-cdd/additional_scripts/configure_fe306.sh rename to trc6500-master-file/script/configure_fe306.sh index 885af24..53cfae8 100755 --- a/simple-cdd/additional_scripts/configure_fe306.sh +++ b/trc6500-master-file/script/configure_fe306.sh @@ -16,7 +16,6 @@ DRY= ID= IP=192.168.0.1 -#TRC6500_SCRIPT_DIR=/opt/trc6500/script TRC6500_SCRIPT_DIR=$(dirname $0) # help function diff --git a/simple-cdd/additional_scripts/configure_matrix.tcl b/trc6500-master-file/script/configure_matrix.tcl similarity index 100% rename from simple-cdd/additional_scripts/configure_matrix.tcl rename to trc6500-master-file/script/configure_matrix.tcl diff --git a/simple-cdd/additional_scripts/configure_switch.tcl b/trc6500-master-file/script/configure_switch.tcl similarity index 100% rename from simple-cdd/additional_scripts/configure_switch.tcl rename to trc6500-master-file/script/configure_switch.tcl diff --git a/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl b/trc6500-master-file/script/configure_switch_bootstrap.tcl similarity index 100% rename from simple-cdd/additional_scripts/configure_switch_bootstrap.tcl rename to trc6500-master-file/script/configure_switch_bootstrap.tcl diff --git a/simple-cdd/additional_scripts/connect_switch.tcl b/trc6500-master-file/script/connect_switch.tcl similarity index 100% rename from simple-cdd/additional_scripts/connect_switch.tcl rename to trc6500-master-file/script/connect_switch.tcl diff --git a/simple-cdd/additional_scripts/cpumon_lite b/trc6500-master-file/script/cpumon_lite similarity index 100% rename from simple-cdd/additional_scripts/cpumon_lite rename to trc6500-master-file/script/cpumon_lite diff --git a/simple-cdd/additional_scripts/flash_fe306.sh b/trc6500-master-file/script/flash_fe306.sh similarity index 97% rename from simple-cdd/additional_scripts/flash_fe306.sh rename to trc6500-master-file/script/flash_fe306.sh index b728862..423b6d4 100755 --- a/simple-cdd/additional_scripts/flash_fe306.sh +++ b/trc6500-master-file/script/flash_fe306.sh @@ -15,7 +15,6 @@ DRY= FIRMWARE=/opt/trc6500/config/code_metier/libHwCtrl/Bitstream LIST="application.out production.bin ts12_fp_pano.bin ts22_fp_pano.bin firmware.out" HOST= -#TRC6500_SCRIPT_DIR=/opt/trc6500/script TRC6500_SCRIPT_DIR=$(dirname $0) # help function diff --git a/simple-cdd/additional_scripts/set_mediatray.tcl b/trc6500-master-file/script/set_mediatray.tcl similarity index 100% rename from simple-cdd/additional_scripts/set_mediatray.tcl rename to trc6500-master-file/script/set_mediatray.tcl -- 2.30.2