diff --git a/configs/bb.org-debian-buster-efi-iot-v4.14.conf b/configs/bb.org-debian-buster-efi-iot-v4.14.conf index 97013ae6ad9fac00cd9c304d9fa3213562bc52d4..efb528b94ce82860d1d7bc9845c507e61bbf8568 100644 --- a/configs/bb.org-debian-buster-efi-iot-v4.14.conf +++ b/configs/bb.org-debian-buster-efi-iot-v4.14.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="efi-iot" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/bb.org-debian-buster-efi-iot-v4.19.conf b/configs/bb.org-debian-buster-efi-iot-v4.19.conf index b966a62906a0c7d578910d435c04f0d72a854e88..058d1c0ab3e6cea492f3a2aef5f1c59891d2866e 100644 --- a/configs/bb.org-debian-buster-efi-iot-v4.19.conf +++ b/configs/bb.org-debian-buster-efi-iot-v4.19.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="efi-iot" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/bb.org-debian-buster-gobot-iot-v4.14.conf b/configs/bb.org-debian-buster-gobot-iot-v4.14.conf index e7802d552ed84a7e2f2f163690ce9c45411f6e51..b263acc104e4070c1c6dbd9d99aa276f0ba7b362 100644 --- a/configs/bb.org-debian-buster-gobot-iot-v4.14.conf +++ b/configs/bb.org-debian-buster-gobot-iot-v4.14.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="gobot-iot" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/bb.org-debian-buster-gobot-iot-v4.19.conf b/configs/bb.org-debian-buster-gobot-iot-v4.19.conf index a5f8000b398ac762fc65a6427c72d26424708d8f..e6ed4d703e208c3c06948b7f3219230d704a2d55 100644 --- a/configs/bb.org-debian-buster-gobot-iot-v4.19.conf +++ b/configs/bb.org-debian-buster-gobot-iot-v4.19.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="gobot-iot" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/bb.org-debian-buster-iot-v4.14.conf b/configs/bb.org-debian-buster-iot-v4.14.conf index 598e2b5b6bc666d9da186cee625aee9c4b864c4c..87a7f1efa486c814a7ac6d005026bb4984e3a191 100644 --- a/configs/bb.org-debian-buster-iot-v4.14.conf +++ b/configs/bb.org-debian-buster-iot-v4.14.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="iot" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/bb.org-debian-buster-iot-v4.19.conf b/configs/bb.org-debian-buster-iot-v4.19.conf index 6dd3c2d821f946690d8d3c24ecffa95c7bc4b471..4d13a74701a0f95304ce072e30b301a43cc4afa9 100644 --- a/configs/bb.org-debian-buster-iot-v4.19.conf +++ b/configs/bb.org-debian-buster-iot-v4.19.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="iot" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/bb.org-debian-buster-tiny-v4.14.conf b/configs/bb.org-debian-buster-tiny-v4.14.conf index 8d175ca4ca04fcc1fdf8c6b1bfd51fe84aacd309..b02419639096dd64d0889380237dd1f699fd1f44 100644 --- a/configs/bb.org-debian-buster-tiny-v4.14.conf +++ b/configs/bb.org-debian-buster-tiny-v4.14.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="tiny" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/configs/rcn-ee_console_debian_buster_armhf.conf b/configs/rcn-ee_console_debian_buster_armhf.conf index da4d4208a1a5f1d5db1e6dd4bcafca72561eba08..7d849b8ddf6b1e49f7fe5dfd25ab3cc6ff4407a2 100644 --- a/configs/rcn-ee_console_debian_buster_armhf.conf +++ b/configs/rcn-ee_console_debian_buster_armhf.conf @@ -1,5 +1,5 @@ ## -release="buster" +release="10.0" image_type="console" ## ##Debootstrap: https://wiki.debian.org/Debootstrap diff --git a/publish/rcn-ee_bb.org-stable.sh b/publish/rcn-ee_bb.org-stable.sh index 8859a941a258b6863d53ad1ef1066029510994c9..f0bbd15ea793543a01e48ec11d48012680a0cae1 100755 --- a/publish/rcn-ee_bb.org-stable.sh +++ b/publish/rcn-ee_bb.org-stable.sh @@ -62,10 +62,10 @@ debian_jessie_seeed_lxqt_4gb="debian-8.11-seeed-lxqt-4gb-armhf-${time}" debian_stretch_wayland="debian-9.9-wayland-armhf-${time}" debian_stretch_oemflasher="debian-9.9-oemflasher-armhf-${time}" - debian_buster_tiny="debian-buster-tiny-armhf-${time}" - debian_buster_iot="debian-buster-iot-armhf-${time}" - debian_buster_gobot_iot="debian-buster-gobot-iot-armhf-${time}" - debian_buster_efi_iot="debian-buster-efi-iot-armhf-${time}" + debian_buster_tiny="debian-10.0-tiny-armhf-${time}" + debian_buster_iot="debian-10.0-iot-armhf-${time}" + debian_buster_gobot_iot="debian-10.0-gobot-iot-armhf-${time}" + debian_buster_efi_iot="debian-10.0-efi-iot-armhf-${time}" ubuntu_bionic_ros_iot="ubuntu-18.04.2-ros-iot-armhf-${time}" diff --git a/scripts/chroot.sh b/scripts/chroot.sh index 843d3f9f50855ce3b2a07e601e0b9f3ba114d8c1..53fe9d73037c854fa639f2ab91529da238d47c18 100755 --- a/scripts/chroot.sh +++ b/scripts/chroot.sh @@ -334,12 +334,12 @@ if [ "x${deb_distribution}" = "xdebian" ] ; then echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > /tmp/02compress-indexes sudo mv /tmp/02compress-indexes "${tempdir}/etc/apt/apt.conf.d/02compress-indexes" ;; - stretch) + stretch|buster) echo 'Acquire::GzipIndexes "true"; APT::Compressor::xz::Cost "40";' > /tmp/02compress-indexes sudo mv /tmp/02compress-indexes "${tempdir}/etc/apt/apt.conf.d/02compress-indexes" ;; - buster|sid) - ###FIXME: close to release switch to ^ xz, right now buster is slow on apt... + sid) + ###FIXME: close to release switch to ^ xz, right now <next> is slow on apt... echo 'Acquire::GzipIndexes "true"; APT::Compressor::gzip::Cost "40";' > /tmp/02compress-indexes sudo mv /tmp/02compress-indexes "${tempdir}/etc/apt/apt.conf.d/02compress-indexes" ;; @@ -366,7 +366,7 @@ echo "" >> ${wfile} #https://wiki.debian.org/StableUpdates case "${deb_codename}" in -buster|sid) +sid) echo "#deb http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile} echo "##deb-src http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile} echo "" >> ${wfile} @@ -383,12 +383,12 @@ esac #https://wiki.debian.org/LTS/Using case "${deb_codename}" in -jessie|stretch) +jessie|stretch|buster) echo "deb http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile} echo "#deb-src http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile} echo "" >> ${wfile} ;; -buster|sid) +sid) echo "#deb http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile} echo "##deb-src http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile} echo "" >> ${wfile}