diff --git a/publish/rcn-ee_bb.org-stable.sh b/publish/rcn-ee_bb.org-stable.sh index 409c5c81b78687ceb9cb286096d7fc8fb05f0523..6f91516ebf3319877f18258431c8e7542cf331be 100755 --- a/publish/rcn-ee_bb.org-stable.sh +++ b/publish/rcn-ee_bb.org-stable.sh @@ -18,7 +18,6 @@ fi ./RootStock-NG.sh -c bb.org-debian-jessie-iot-v4.1.conf ./RootStock-NG.sh -c bb.org-debian-jessie-console-v4.1 ./RootStock-NG.sh -c bb.org-debian-jessie-usbflasher -#./RootStock-NG.sh -c bb.org-debian-jessie-lxqt-4gb-nodejs-4.2.x-v4.1 debian_wheezy_machinekit="debian-7.9-machinekit-armhf-${time}" debian_jessie_lxqt_2gb="debian-8.3-lxqt-2gb-armhf-${time}" @@ -26,7 +25,6 @@ debian_jessie_lxqt_4gb="debian-8.3-lxqt-4gb-armhf-${time}" debian_jessie_iot="debian-8.3-iot-armhf-${time}" debian_jessie_console="debian-8.3-console-armhf-${time}" debian_jessie_usbflasher="debian-8.3-usbflasher-armhf-${time}" -debian_jessie_lxqt_4gb_nodejs="debian-8.3-lxqt-4gb-nodejs-4.2.x-armhf-${time}" archive="xz -z -8" @@ -170,12 +168,6 @@ base_rootfs="${debian_jessie_usbflasher}" ; blend="usbflasher" ; extract_base_ro options="--img-4gb BBB-blank-\${base_rootfs} --dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc --hostname beaglebone --usb-flasher" ; generate_img options="--img-4gb bbx15-\${base_rootfs} --dtb am57xx-beagle-x15 --hostname BeagleBoard-X15 --usb-flasher" ; generate_img -###lxqt-4gb-nodejs-4.2.x image -base_rootfs="${debian_jessie_lxqt_4gb_nodejs}" ; blend="lxqt-4gb-nodejs-4.2.x" ; extract_base_rootfs - -options="--img-4gb bone-\${base_rootfs} ${beaglebone}" ; generate_img -options="--img-4gb bbx15-\${base_rootfs} ${am57xx_beagle_x15}" ; generate_img - ###archive *.tar base_rootfs="${debian_wheezy_machinekit}" ; blend="machinekit" ; archive_base_rootfs base_rootfs="${debian_jessie_lxqt_4gb}" ; blend="lxqt-4gb" ; archive_base_rootfs @@ -183,7 +175,6 @@ base_rootfs="${debian_jessie_lxqt_2gb}" ; blend="lxqt-2gb" ; archive_base_rootfs base_rootfs="${debian_jessie_iot}" ; blend="iot" ; archive_base_rootfs base_rootfs="${debian_jessie_console}" ; blend="console" ; archive_base_rootfs base_rootfs="${debian_jessie_usbflasher}" ; blend="usbflasher" ; archive_base_rootfs -base_rootfs="${debian_jessie_lxqt_4gb_nodejs}" ; blend="lxqt-4gb-nodejs-4.2.x" ; archive_base_rootfs ###archive *.img base_rootfs="${debian_wheezy_machinekit}" ; blend="machinekit" @@ -227,12 +218,6 @@ base_rootfs="${debian_jessie_usbflasher}" ; blend="usbflasher" wfile="BBB-blank-\${base_rootfs}-4gb" ; archive_img wfile="bbx15-\${base_rootfs}-4gb" ; archive_img -###lxqt-4gb-nodejs-4.2.x image -base_rootfs="${debian_jessie_lxqt_4gb_nodejs}" ; blend="lxqt-4gb-nodejs-4.2.x" - -wfile="bone-\${base_rootfs}-4gb" ; archive_img -wfile="bbx15-\${base_rootfs}-4gb" ; archive_img - __EOF__ chmod +x ${DIR}/deploy/gift_wrap_final_images.sh diff --git a/scripts/chroot.sh b/scripts/chroot.sh index 272b677244942e60268df0a6cc2964f16e008f54..20224432b65416e491ba6b0182222962240604cf 100755 --- a/scripts/chroot.sh +++ b/scripts/chroot.sh @@ -397,12 +397,6 @@ if [ "x${repo_rcnee}" = "xenable" ] ; then echo "deb [arch=armhf] http://repos.rcn-ee.com/${deb_distribution}/ ${deb_codename} main" >> ${wfile} echo "#deb-src [arch=armhf] http://repos.rcn-ee.com/${deb_distribution}/ ${deb_codename} main" >> ${wfile} - if [ "x${exp_repo_rcnee_jessie_nodejs}" = "xenable" ] ; then - echo "#" >> ${wfile} - echo "deb [arch=armhf] http://repos.rcn-ee.com/${deb_distribution}-nodejs/ jessie main" >> ${wfile} - echo "#deb-src [arch=armhf] http://repos.rcn-ee.com/${deb_distribution}-nodejs/ jessie main" >> ${wfile} - fi - sudo cp -v "${OIB_DIR}/target/keyring/repos.rcn-ee.net-archive-keyring.asc" "${tempdir}/tmp/repos.rcn-ee.net-archive-keyring.asc" fi