From 86b51d6960cf162bf22c3c47ae06b801214e6544 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Sat, 6 Jul 2019 21:28:16 -0500 Subject: [PATCH] debian: buster: 10.0 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- configs/bb.org-debian-buster-efi-iot-v4.14.conf | 2 +- configs/bb.org-debian-buster-efi-iot-v4.19.conf | 2 +- configs/bb.org-debian-buster-gobot-iot-v4.14.conf | 2 +- configs/bb.org-debian-buster-gobot-iot-v4.19.conf | 2 +- configs/bb.org-debian-buster-iot-v4.14.conf | 2 +- configs/bb.org-debian-buster-iot-v4.19.conf | 2 +- configs/bb.org-debian-buster-tiny-v4.14.conf | 2 +- configs/rcn-ee_console_debian_buster_armhf.conf | 2 +- publish/rcn-ee_bb.org-stable.sh | 8 ++++---- scripts/chroot.sh | 12 ++++++------ 10 files changed, 18 insertions(+), 18 deletions(-) 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 97013ae6a..efb528b94 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 b966a6290..058d1c0ab 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 e7802d552..b263acc10 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 a5f8000b3..e6ed4d703 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 598e2b5b6..87a7f1efa 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 6dd3c2d82..4d13a7470 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 8d175ca4c..b02419639 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 da4d4208a..7d849b8dd 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 8859a941a..f0bbd15ea 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 843d3f9f5..53fe9d730 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} -- GitLab