From 40c258c49b8db43eba907873cad108c25621e831 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Sun, 6 Oct 2019 21:57:19 -0500 Subject: [PATCH] remove references to stretch in build system, make more generic to support future upgrades --- resources/BuildResources/backports.list | 2 +- resources/BuildResources/backports.pref | 4 ++-- resources/BuildResources/bullseye.list | 3 +++ resources/BuildResources/bullseye.pref | 5 +++++ resources/BuildResources/buster.list | 3 --- resources/BuildResources/buster.pref | 5 ----- resources/BuildResources/sid.list | 2 +- resources/BuildResources/sid.pref | 2 +- resources/BuildResources/sources.list | 4 ++-- resources/BuildResources/updates.list | 8 +++---- scripts/buildFilesystem.sh | 30 +++++++++++-------------- 11 files changed, 32 insertions(+), 36 deletions(-) create mode 100644 resources/BuildResources/bullseye.list create mode 100644 resources/BuildResources/bullseye.pref delete mode 100644 resources/BuildResources/buster.list delete mode 100644 resources/BuildResources/buster.pref diff --git a/resources/BuildResources/backports.list b/resources/BuildResources/backports.list index 97f922c..8bcf68d 100644 --- a/resources/BuildResources/backports.list +++ b/resources/BuildResources/backports.list @@ -1 +1 @@ -deb http://ftp.debian.org/debian stretch-backports main +deb http://ftp.debian.org/debian suite-backports main diff --git a/resources/BuildResources/backports.pref b/resources/BuildResources/backports.pref index 4e72562..4e892a6 100644 --- a/resources/BuildResources/backports.pref +++ b/resources/BuildResources/backports.pref @@ -1,5 +1,5 @@ -#Stable (stretch) defaults to 500, and higher priorities are used over lower +#Stable defaults to 500, and higher priorities are used over lower Package: * -Pin: release a=stretch-backports +Pin: release a=suite-backports Pin-Priority: 450 diff --git a/resources/BuildResources/bullseye.list b/resources/BuildResources/bullseye.list new file mode 100644 index 0000000..4ee2ada --- /dev/null +++ b/resources/BuildResources/bullseye.list @@ -0,0 +1,3 @@ +#Add testing +# /etc/apt/preferences prevents this from updating the whole system +deb http://deb.debian.org/debian/ bullseye main diff --git a/resources/BuildResources/bullseye.pref b/resources/BuildResources/bullseye.pref new file mode 100644 index 0000000..de52544 --- /dev/null +++ b/resources/BuildResources/bullseye.pref @@ -0,0 +1,5 @@ +#Stable defaults to 500, and higher priorities are used over lower + +Package: * +Pin: release a=bullseye +Pin-Priority: 400 diff --git a/resources/BuildResources/buster.list b/resources/BuildResources/buster.list deleted file mode 100644 index 45e5524..0000000 --- a/resources/BuildResources/buster.list +++ /dev/null @@ -1,3 +0,0 @@ -#Add buster to grab a functional firefox release -# /etc/apt/preferences prevents this from updating the whole system -deb http://deb.debian.org/debian/ buster main diff --git a/resources/BuildResources/buster.pref b/resources/BuildResources/buster.pref deleted file mode 100644 index 926d25d..0000000 --- a/resources/BuildResources/buster.pref +++ /dev/null @@ -1,5 +0,0 @@ -#Stable (stretch) defaults to 500, and higher priorities are used over lower - -Package: * -Pin: release a=buster -Pin-Priority: 400 diff --git a/resources/BuildResources/sid.list b/resources/BuildResources/sid.list index 793304d..f273140 100644 --- a/resources/BuildResources/sid.list +++ b/resources/BuildResources/sid.list @@ -1,3 +1,3 @@ -#Add sid to grab a functional chromium release +#Add sid to grab bleeding edge software # /etc/apt/preferences prevents this from updating the whole system deb http://deb.debian.org/debian/ unstable main diff --git a/resources/BuildResources/sid.pref b/resources/BuildResources/sid.pref index a38c2eb..74b2b78 100644 --- a/resources/BuildResources/sid.pref +++ b/resources/BuildResources/sid.pref @@ -1,4 +1,4 @@ -#Stable (stretch) defaults to 500, and higher priorities are used over lower +#Stable defaults to 500, and higher priorities are used over lower Package: * Pin: release a=unstable diff --git a/resources/BuildResources/sources.list b/resources/BuildResources/sources.list index 9b52935..b22ba5a 100644 --- a/resources/BuildResources/sources.list +++ b/resources/BuildResources/sources.list @@ -1,2 +1,2 @@ -deb http://ftp.us.debian.org/debian stretch main -deb-src http://ftp.us.debian.org/debian stretch main +deb http://ftp.us.debian.org/debian suite main +deb-src http://ftp.us.debian.org/debian suite main diff --git a/resources/BuildResources/updates.list b/resources/BuildResources/updates.list index 2062272..6058fd6 100644 --- a/resources/BuildResources/updates.list +++ b/resources/BuildResources/updates.list @@ -1,6 +1,6 @@ -deb http://ftp.us.debian.org/debian stretch-updates main -deb-src http://ftp.us.debian.org/debian stretch-updates main +deb http://ftp.us.debian.org/debian suite-updates main +deb-src http://ftp.us.debian.org/debian suite-updates main -deb http://security.debian.org/debian-security/ stretch/updates main -deb-src http://security.debian.org/debian-security/ stretch/updates main +deb http://security.debian.org/debian-security/ suite/updates main +deb-src http://security.debian.org/debian-security/ suite/updates main diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index 82d08e3..a985904 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -126,34 +126,30 @@ chmod +x $outmnt/*.sh #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests cp /etc/hosts $outmnt/etc/ cp $build_resources/sources.list $outmnt/etc/apt/sources.list -sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list +sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list if [ "$PRAWNOS_SUITE" != "sid" ] then # sid doesn't have updates or security; they're present for all other suites cat $build_resources/updates.list >> $outmnt/etc/apt/sources.list - sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list + sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list # sid doesn't have backports; it's present for all other suites cp $build_resources/backports.list $outmnt/etc/apt/sources.list.d/ - sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list.d/backports.list + sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/sources.list.d/backports.list #setup apt pinning cp $build_resources/backports.pref $outmnt/etc/apt/preferences.d/ - sed -i -e "s/stretch/$PRAWNOS_SUITE/g" $outmnt/etc/apt/preferences.d/backports.pref -fi -if [ "$PRAWNOS_SUITE" = "stretch" ] -then - # Install buster as an additional source if the suite is less than buster - cp $build_resources/buster.list $outmnt/etc/apt/sources.list.d/ - #setup apt pinning - cp $build_resources/buster.pref $outmnt/etc/apt/preferences.d/ -fi -if [ "$PRAWNOS_SUITE" = "stretch" ] || [ "$PRAWNOS_SUITE" = "buster" ] -then - # Install sid as an additional source if the suite is less than bullseye. - # This should be replaced with bullseye after bullseye branches from sid. + sed -i -e "s/suite/$PRAWNOS_SUITE/g" $outmnt/etc/apt/preferences.d/backports.pref + # Install sid (unstable) as an additional source for bleeding edge packages. cp $build_resources/sid.list $outmnt/etc/apt/sources.list.d/ #setup apt pinning cp $build_resources/sid.pref $outmnt/etc/apt/preferences.d/ fi +if [ "$PRAWNOS_SUITE" = "buster" ] +then + # Install bullseye (testing) as an additional source + cp $build_resources/bullseye.list $outmnt/etc/apt/sources.list.d/ + #setup apt pinning + cp $build_resources/bullseye.pref $outmnt/etc/apt/preferences.d/ +fi #Setup the locale cp $build_resources/locale.gen $outmnt/etc/locale.gen @@ -178,7 +174,7 @@ chroot $outmnt apt install -y libinput-tools xdotool build-essential chroot $outmnt apt-get install -y -t unstable -d xsecurelock #Download the packages to be installed by Install.sh: -chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs25 accountsservice sudo pavucontrol-qt +chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs accountsservice sudo pavucontrol-qt if [ "$PRAWNOS_SUITE" = "stretch" ] then