From db408b61c4ae6679162ea7c25c589b979ffe6539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 5 Apr 2022 16:19:51 +0200 Subject: [PATCH] Purge bionic, impish, hirsute, stretch (#3600) * Purge bionic, impish, hirsute, stretch - up jammy to supported (will be soon anyway) * Change recommended build env to Jammy --- README.md | 2 +- config/cli/bionic | 1 - config/cli/hirsute | 1 - config/cli/impish/debootstrap | 1 - config/cli/impish/main/config_cli_standard | 1 - config/cli/impish/main/config_desktop | 1 - config/cli/impish/main/packages | 1 - config/cli/impish/main/packages.additional | 18 -- config/desktop/bionic/appgroups/chat | 1 - .../bionic/appgroups/editors/debian/postinst | 0 .../desktop/bionic/appgroups/editors/packages | 2 - config/desktop/bionic/appgroups/email | 1 - config/desktop/bionic/appgroups/internet | 1 - .../bionic/appgroups/multimedia/packages | 2 - config/desktop/bionic/appgroups/office | 1 - .../desktop/bionic/appgroups/remote_desktop | 1 - .../bionic/environments/xfce/appgroups | 1 - .../desktop/bionic/environments/xfce/armbian | 1 - .../environments/xfce/config_base/packages | 168 -------------- .../xfce/config_base/packages.uninstall | 1 - .../desktop/bionic/environments/xfce/debian | 1 - .../desktop/bionic/environments/xfce/support | 1 - config/desktop/hirsute/appgroups | 1 - config/desktop/hirsute/environments/budgie | 1 - config/desktop/hirsute/environments/cinnamon | 1 - .../hirsute/environments/gnome/armbian | 1 - .../environments/gnome/config_base/packages | 216 ------------------ .../desktop/hirsute/environments/gnome/debian | 1 - .../hirsute/environments/gnome/only_for | 1 - .../hirsute/environments/gnome/support | 1 - config/desktop/hirsute/environments/i3-wm | 1 - .../desktop/hirsute/environments/kde-plasma | 1 - config/desktop/hirsute/environments/mate | 1 - config/desktop/hirsute/environments/xfce | 1 - config/desktop/hirsute/environments/xmonad | 1 - .../impish/appgroups/3dsupport/packages | 1 - .../appgroups/3dsupport/sources/apt/oibaf.gpg | Bin 5934 -> 0 bytes .../3dsupport/sources/apt/oibaf.source | 1 - .../desktop/impish/appgroups/browsers/armbian | 1 - .../desktop/impish/appgroups/browsers/debian | 1 - .../impish/appgroups/browsers/packages | 1 - .../browsers/sources/apt/chromium-browser.gpg | Bin 365 -> 0 bytes .../sources/apt/chromium-browser.source | 1 - .../browsers/sources/apt/mozilla-team.gpg | Bin 7058 -> 0 bytes .../browsers/sources/apt/mozilla-team.source | 1 - config/desktop/impish/appgroups/chat | 1 - config/desktop/impish/appgroups/desktop_tools | 1 - config/desktop/impish/appgroups/editors | 1 - config/desktop/impish/appgroups/email | 1 - config/desktop/impish/appgroups/internet | 1 - config/desktop/impish/appgroups/multimedia | 1 - config/desktop/impish/appgroups/office | 1 - config/desktop/impish/appgroups/programming | 1 - .../desktop/impish/appgroups/remote_desktop | 1 - .../budgie/armbian/create_desktop_package.sh | 1 - .../environments/budgie/config_base/packages | 199 ---------------- .../budgie/config_base/packages.uninstall | 1 - .../environments/budgie/debian/postinst | 1 - .../impish/environments/budgie/only_for | 1 - .../impish/environments/budgie/support | 1 - config/desktop/impish/environments/cinnamon | 1 - config/desktop/impish/environments/gnome | 1 - config/desktop/impish/environments/i3-wm | 1 - config/desktop/impish/environments/kde-plasma | 1 - config/desktop/impish/environments/mate | 1 - config/desktop/impish/environments/xfce | 1 - config/desktop/impish/environments/xmonad | 1 - config/distributions/bionic/name | 1 - config/distributions/bionic/support | 1 - config/distributions/hirsute/name | 1 - config/distributions/hirsute/support | 1 - config/distributions/impish/name | 1 - config/distributions/impish/support | 1 - config/distributions/jammy/support | 2 +- config/distributions/stretch/name | 1 - config/distributions/stretch/support | 1 - config/distributions/xenial/name | 1 - config/distributions/xenial/support | 1 - lib/chroot-buildpackages.sh | 6 - lib/configuration.sh | 8 +- lib/debootstrap.sh | 4 +- lib/distributions.sh | 18 +- lib/general.sh | 6 +- 83 files changed, 10 insertions(+), 707 deletions(-) delete mode 120000 config/cli/bionic delete mode 120000 config/cli/hirsute delete mode 120000 config/cli/impish/debootstrap delete mode 120000 config/cli/impish/main/config_cli_standard delete mode 120000 config/cli/impish/main/config_desktop delete mode 120000 config/cli/impish/main/packages delete mode 100644 config/cli/impish/main/packages.additional delete mode 120000 config/desktop/bionic/appgroups/chat delete mode 100644 config/desktop/bionic/appgroups/editors/debian/postinst delete mode 100644 config/desktop/bionic/appgroups/editors/packages delete mode 120000 config/desktop/bionic/appgroups/email delete mode 120000 config/desktop/bionic/appgroups/internet delete mode 100644 config/desktop/bionic/appgroups/multimedia/packages delete mode 120000 config/desktop/bionic/appgroups/office delete mode 120000 config/desktop/bionic/appgroups/remote_desktop delete mode 120000 config/desktop/bionic/environments/xfce/appgroups delete mode 120000 config/desktop/bionic/environments/xfce/armbian delete mode 100644 config/desktop/bionic/environments/xfce/config_base/packages delete mode 120000 config/desktop/bionic/environments/xfce/config_base/packages.uninstall delete mode 120000 config/desktop/bionic/environments/xfce/debian delete mode 120000 config/desktop/bionic/environments/xfce/support delete mode 120000 config/desktop/hirsute/appgroups delete mode 120000 config/desktop/hirsute/environments/budgie delete mode 120000 config/desktop/hirsute/environments/cinnamon delete mode 120000 config/desktop/hirsute/environments/gnome/armbian delete mode 100644 config/desktop/hirsute/environments/gnome/config_base/packages delete mode 120000 config/desktop/hirsute/environments/gnome/debian delete mode 120000 config/desktop/hirsute/environments/gnome/only_for delete mode 120000 config/desktop/hirsute/environments/gnome/support delete mode 120000 config/desktop/hirsute/environments/i3-wm delete mode 120000 config/desktop/hirsute/environments/kde-plasma delete mode 120000 config/desktop/hirsute/environments/mate delete mode 120000 config/desktop/hirsute/environments/xfce delete mode 120000 config/desktop/hirsute/environments/xmonad delete mode 120000 config/desktop/impish/appgroups/3dsupport/packages delete mode 100644 config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg delete mode 100644 config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source delete mode 120000 config/desktop/impish/appgroups/browsers/armbian delete mode 120000 config/desktop/impish/appgroups/browsers/debian delete mode 120000 config/desktop/impish/appgroups/browsers/packages delete mode 100644 config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg delete mode 100644 config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.source delete mode 100644 config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.gpg delete mode 100644 config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source delete mode 120000 config/desktop/impish/appgroups/chat delete mode 120000 config/desktop/impish/appgroups/desktop_tools delete mode 120000 config/desktop/impish/appgroups/editors delete mode 120000 config/desktop/impish/appgroups/email delete mode 120000 config/desktop/impish/appgroups/internet delete mode 120000 config/desktop/impish/appgroups/multimedia delete mode 120000 config/desktop/impish/appgroups/office delete mode 120000 config/desktop/impish/appgroups/programming delete mode 120000 config/desktop/impish/appgroups/remote_desktop delete mode 120000 config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh delete mode 100644 config/desktop/impish/environments/budgie/config_base/packages delete mode 120000 config/desktop/impish/environments/budgie/config_base/packages.uninstall delete mode 120000 config/desktop/impish/environments/budgie/debian/postinst delete mode 100644 config/desktop/impish/environments/budgie/only_for delete mode 100644 config/desktop/impish/environments/budgie/support delete mode 120000 config/desktop/impish/environments/cinnamon delete mode 120000 config/desktop/impish/environments/gnome delete mode 120000 config/desktop/impish/environments/i3-wm delete mode 120000 config/desktop/impish/environments/kde-plasma delete mode 120000 config/desktop/impish/environments/mate delete mode 120000 config/desktop/impish/environments/xfce delete mode 120000 config/desktop/impish/environments/xmonad delete mode 100644 config/distributions/bionic/name delete mode 100644 config/distributions/bionic/support delete mode 100644 config/distributions/hirsute/name delete mode 100644 config/distributions/hirsute/support delete mode 100644 config/distributions/impish/name delete mode 100644 config/distributions/impish/support delete mode 100644 config/distributions/stretch/name delete mode 100644 config/distributions/stretch/support delete mode 100644 config/distributions/xenial/name delete mode 100644 config/distributions/xenial/support diff --git a/README.md b/README.md index 60f6cd74e..617d33232 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ build framework ## What do you need to get started? - x64 / aarch64 machine with at least 2GB of memory and ~35GB of disk space for a VM, container or native OS, -- Ubuntu Hirsute 21.04 x64 / aarch64 for native building or any [Docker](https://docs.armbian.com/Developer-Guide_Building-with-Docker/) capable x64 / aarch64 Linux for containerised, +- Ubuntu Jammy 22.04 x64 / aarch64 for native building or any [Docker](https://docs.armbian.com/Developer-Guide_Building-with-Docker/) capable x64 / aarch64 Linux for containerised, - superuser rights (configured sudo or root access).

⇧

diff --git a/config/cli/bionic b/config/cli/bionic deleted file mode 120000 index aae2fdcd7..000000000 --- a/config/cli/bionic +++ /dev/null @@ -1 +0,0 @@ -focal \ No newline at end of file diff --git a/config/cli/hirsute b/config/cli/hirsute deleted file mode 120000 index aae2fdcd7..000000000 --- a/config/cli/hirsute +++ /dev/null @@ -1 +0,0 @@ -focal \ No newline at end of file diff --git a/config/cli/impish/debootstrap b/config/cli/impish/debootstrap deleted file mode 120000 index 70a5776e2..000000000 --- a/config/cli/impish/debootstrap +++ /dev/null @@ -1 +0,0 @@ -../focal/debootstrap \ No newline at end of file diff --git a/config/cli/impish/main/config_cli_standard b/config/cli/impish/main/config_cli_standard deleted file mode 120000 index c7fe3c166..000000000 --- a/config/cli/impish/main/config_cli_standard +++ /dev/null @@ -1 +0,0 @@ -../../focal/main/config_cli_standard \ No newline at end of file diff --git a/config/cli/impish/main/config_desktop b/config/cli/impish/main/config_desktop deleted file mode 120000 index e22162e48..000000000 --- a/config/cli/impish/main/config_desktop +++ /dev/null @@ -1 +0,0 @@ -../../focal/main/config_desktop \ No newline at end of file diff --git a/config/cli/impish/main/packages b/config/cli/impish/main/packages deleted file mode 120000 index fa3862360..000000000 --- a/config/cli/impish/main/packages +++ /dev/null @@ -1 +0,0 @@ -../../focal/main/packages \ No newline at end of file diff --git a/config/cli/impish/main/packages.additional b/config/cli/impish/main/packages.additional deleted file mode 100644 index 83f52bf87..000000000 --- a/config/cli/impish/main/packages.additional +++ /dev/null @@ -1,18 +0,0 @@ -cracklib-runtime -curl -htop -i2c-tools -jq -libcrack2 -lsof -mc -mmc-utils -nano -net-tools -netplan.io -network-manager -network-manager-openvpn -resolvconf -sysstat -wget -wireless-tools diff --git a/config/desktop/bionic/appgroups/chat b/config/desktop/bionic/appgroups/chat deleted file mode 120000 index 32416fca1..000000000 --- a/config/desktop/bionic/appgroups/chat +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/chat \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/editors/debian/postinst b/config/desktop/bionic/appgroups/editors/debian/postinst deleted file mode 100644 index e69de29bb..000000000 diff --git a/config/desktop/bionic/appgroups/editors/packages b/config/desktop/bionic/appgroups/editors/packages deleted file mode 100644 index 15a82c709..000000000 --- a/config/desktop/bionic/appgroups/editors/packages +++ /dev/null @@ -1,2 +0,0 @@ -emacs -vim diff --git a/config/desktop/bionic/appgroups/email b/config/desktop/bionic/appgroups/email deleted file mode 120000 index 1df4a1969..000000000 --- a/config/desktop/bionic/appgroups/email +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/email \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/internet b/config/desktop/bionic/appgroups/internet deleted file mode 120000 index 9962013cf..000000000 --- a/config/desktop/bionic/appgroups/internet +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/internet \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/multimedia/packages b/config/desktop/bionic/appgroups/multimedia/packages deleted file mode 100644 index 14bb93350..000000000 --- a/config/desktop/bionic/appgroups/multimedia/packages +++ /dev/null @@ -1,2 +0,0 @@ -gimp -mpv diff --git a/config/desktop/bionic/appgroups/office b/config/desktop/bionic/appgroups/office deleted file mode 120000 index f3b2e2e9d..000000000 --- a/config/desktop/bionic/appgroups/office +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/office \ No newline at end of file diff --git a/config/desktop/bionic/appgroups/remote_desktop b/config/desktop/bionic/appgroups/remote_desktop deleted file mode 120000 index bdac8eaee..000000000 --- a/config/desktop/bionic/appgroups/remote_desktop +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/remote_desktop \ No newline at end of file diff --git a/config/desktop/bionic/environments/xfce/appgroups b/config/desktop/bionic/environments/xfce/appgroups deleted file mode 120000 index cd5891083..000000000 --- a/config/desktop/bionic/environments/xfce/appgroups +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/xfce/appgroups \ No newline at end of file diff --git a/config/desktop/bionic/environments/xfce/armbian b/config/desktop/bionic/environments/xfce/armbian deleted file mode 120000 index 4f0599195..000000000 --- a/config/desktop/bionic/environments/xfce/armbian +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/xfce/armbian \ No newline at end of file diff --git a/config/desktop/bionic/environments/xfce/config_base/packages b/config/desktop/bionic/environments/xfce/config_base/packages deleted file mode 100644 index 176b5a3e0..000000000 --- a/config/desktop/bionic/environments/xfce/config_base/packages +++ /dev/null @@ -1,168 +0,0 @@ -anacron -apport-gtk -blueman -bluez -bluez-cups -bluez-tools -brltty -brltty-x11 -caffeine -cifs-utils -cups -cups-bsd -cups-client -cups-filters -dbus-x11 -dictionaries-common -dmz-cursor-theme -doc-base -evince -evince-common -fontconfig -fontconfig-config -fonts-arphic-ukai -fonts-arphic-uming -fonts-dejavu-core -fonts-freefont-ttf -fonts-guru -fonts-guru-extra -fonts-kacst -fonts-kacst-one -fonts-khmeros-core -fonts-liberation -fonts-nanum -fonts-opensymbol -fonts-stix -fonts-symbola -fonts-ubuntu-font-family-console -foomatic-db-compressed-ppds -gdebi -ghostscript-x -gir1.2-appindicator3-0.1 -gnome-font-viewer -gnome-screenshot -gnome-user-docs-de -gnome-user-docs-es -gnome-user-docs-it -gnome-user-docs-pt -gnome-user-docs-ru -gnome-user-docs-sl -gstreamer1.0-packagekit -gstreamer1.0-plugins-base-apps -gstreamer1.0-pulseaudio -gtk2-engines -gtk2-engines-murrine -gtk2-engines-pixbuf -gvfs-backends -hplip -hunspell-en-us -indicator-printers -inputattach -kerneloops -keyutils -language-pack-gnome-de -language-pack-gnome-en -language-pack-gnome-es -language-pack-gnome-fr -language-pack-gnome-it -language-pack-gnome-pt -language-pack-gnome-ru -language-pack-gnome-sl -laptop-detect -libappindicator3-1 -libatk-adaptor -libfont-afm-perl -libfontconfig1 -libfontembed1 -libfontenc1 -libgail-common -libgl1-mesa-dri -libgsettings-qt1 -libgtk2.0-bin -libnotify-bin -libpam-gnome-keyring -libproxy1-plugin-gsettings -libproxy1-plugin-networkmanager -libu2f-udev -libwmf0.2-7-gtk -libxcursor1 -lightdm -lightdm-settings -lxtask -mesa-utils -mousepad -mousetweaks -network-manager-gnome -network-manager-l2tp -network-manager-openconnect -network-manager-openvpn -network-manager-pptp -network-manager-ssh -network-manager-vpnc -numix-gtk-theme -numix-icon-theme -openprinting-ppds -orca -p7zip-full -pamix -pasystray -pavucontrol -pavucontrol-qt -pavumeter -pinta -policykit-1 -policykit-desktop-privileges -printer-driver-all -profile-sync-daemon -pulseaudio-module-bluetooth -redshift -slick-greeter -smbclient -software-properties-gtk -spice-vdagent -system-config-printer -system-config-printer-common -terminator -thunar-volman -ttf-ubuntu-font-family -ubuntu-drivers-common -update-inetd -update-manager -update-manager-core -update-notifier -update-notifier-common -viewnior -wamerican -wbrazilian -wbritish -wfrench -witalian -wportuguese -wspanish -wswiss -x11-apps -x11-xserver-utils -xarchiver -xbacklight -xcursor-themes -xdg-user-dirs -xdg-user-dirs-gtk -xfce4 -xfce4-notifyd -xfce4-screenshooter -xfce4-terminal -xfonts-100dpi -xfonts-75dpi -xfonts-base -xfonts-encodings -xfonts-scalable -xfonts-utils -xinit -xorg-docs-core -xscreensaver -xserver-xorg -xserver-xorg-video-fbdev -xterm -xtermcontrol -xtermset -zip diff --git a/config/desktop/bionic/environments/xfce/config_base/packages.uninstall b/config/desktop/bionic/environments/xfce/config_base/packages.uninstall deleted file mode 120000 index 5be3fde23..000000000 --- a/config/desktop/bionic/environments/xfce/config_base/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -../../../../focal/environments/xfce/config_base/packages.uninstall \ No newline at end of file diff --git a/config/desktop/bionic/environments/xfce/debian b/config/desktop/bionic/environments/xfce/debian deleted file mode 120000 index cc6b8f653..000000000 --- a/config/desktop/bionic/environments/xfce/debian +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/xfce/debian \ No newline at end of file diff --git a/config/desktop/bionic/environments/xfce/support b/config/desktop/bionic/environments/xfce/support deleted file mode 120000 index cf4c5d782..000000000 --- a/config/desktop/bionic/environments/xfce/support +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/xfce/support \ No newline at end of file diff --git a/config/desktop/hirsute/appgroups b/config/desktop/hirsute/appgroups deleted file mode 120000 index 97784daa0..000000000 --- a/config/desktop/hirsute/appgroups +++ /dev/null @@ -1 +0,0 @@ -../focal/appgroups \ No newline at end of file diff --git a/config/desktop/hirsute/environments/budgie b/config/desktop/hirsute/environments/budgie deleted file mode 120000 index 03309a752..000000000 --- a/config/desktop/hirsute/environments/budgie +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/budgie \ No newline at end of file diff --git a/config/desktop/hirsute/environments/cinnamon b/config/desktop/hirsute/environments/cinnamon deleted file mode 120000 index 5cb429269..000000000 --- a/config/desktop/hirsute/environments/cinnamon +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/cinnamon \ No newline at end of file diff --git a/config/desktop/hirsute/environments/gnome/armbian b/config/desktop/hirsute/environments/gnome/armbian deleted file mode 120000 index 3adcf2a0e..000000000 --- a/config/desktop/hirsute/environments/gnome/armbian +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/gnome/armbian \ No newline at end of file diff --git a/config/desktop/hirsute/environments/gnome/config_base/packages b/config/desktop/hirsute/environments/gnome/config_base/packages deleted file mode 100644 index 5cef53553..000000000 --- a/config/desktop/hirsute/environments/gnome/config_base/packages +++ /dev/null @@ -1,216 +0,0 @@ -alsa-base -anacron -at-spi2-core -bubblewrap -cups -dbus-x11 -dictionaries-common -dmz-cursor-theme -evolution-data-server -evolution-data-server-common -fonts-freefont-ttf -fonts-urw-base35 -foomatic-db-compressed-ppds -gconf2 -gcr -gdebi -gdm3 -genisoimage -geoclue-2.0 -ghostscript -ghostscript-x -gir1.2-accountsservice-1.0 -gir1.2-atspi-2.0 -gir1.2-gck-1 -gir1.2-gcr-3 -gir1.2-gdesktopenums-3.0 -gir1.2-gdm-1.0 -gir1.2-geoclue-2.0 -gir1.2-gnomebluetooth-1.0 -gir1.2-gnomedesktop-3.0 -gir1.2-goa-1.0 -gir1.2-graphene-1.0 -gir1.2-gweather-3.0 -gir1.2-ibus-1.0 -gir1.2-json-1.0 -gir1.2-mutter-7 -gir1.2-nm-1.0 -gir1.2-nma-1.0 -gir1.2-polkit-1.0 -gir1.2-rsvg-2.0 -gir1.2-snapd-1 -gir1.2-soup-2.4 -gir1.2-upowerglib-1.0 -gjs -gnome-control-center -gnome-desktop3-data -gnome-keyring -gnome-menus -gnome-session -gnome-session-bin -gnome-session-common -gnome-settings-daemon -gnome-settings-daemon-common -gnome-shell -gnome-shell-common -gnome-shell-extension-appindicator -gnome-shell-extension-desktop-icons -gnome-shell-extension-trash -gvfs-backends -hunspell-en-us -inputattach -libaccountsservice0 -libasound2-plugins -libaspell15 -libatk-adaptor -libcairo-gobject-perl -libcairo-perl -libcamel-1.2-62 -libcue2 -libdee-1.0-4 -libebackend-1.2-10 -libebook-1.2-20 -libebook-contacts-1.2-3 -libecal-2.0-1 -libedata-book-1.2-26 -libedata-cal-2.0-1 -libedataserver-1.2-26 -libedataserverui-1.2-3 -libenchant-2-2 -libexempi8 -libexiv2-27 -libextutils-depends-perl -libextutils-pkgconfig-perl -libfontenc1 -libgck-1-0 -libgcr-base-3-1 -libgcr-ui-3-1 -libgdata22 -libgdata-common -libgdm1 -libgeoclue-2-0 -libgeocode-glib0 -libgexiv2-2 -libgjs0g -libglib-object-introspection-perl -libglib-perl -libglu1-mesa -libgnome-autoar-0-0 -libgnome-bluetooth13 -libgnome-desktop-3-19 -libgoa-1.0-0b -libgoa-1.0-common -libgraphene-1.0-0 -libgs9 -libgs9-common -libgsf-1-114 -libgsf-1-common -libgtk3-perl -libgweather-3-16 -libgweather-common -libgxps2 -libibus-1.0-5 -libical3 -libidn11 -libijs-0.35 -libimobiledevice6 -libjavascriptcoregtk-4.0-18 -libjbig2dec0 -libmutter-7-0 -libnautilus-extension1a -libnma0 -libnotify-bin -libpaper1 -libphonenumber8 -libplist3 -libpoppler-glib8 -libprotobuf23 -libpulsedsp -libsasl2-modules -libspeexdsp1 -libtext-iconv-perl -libtotem-plparser18 -libtotem-plparser-common -libtracker-control-2.0-0 -libtracker-miner-2.0-0 -libtracker-sparql-2.0-0 -libu2f-udev -libunity9 -libunity-protocol-private0 -libunity-scopes-json-def-desktop -libunwind8 -libupower-glib3 -libusbmuxd6 -libwebkit2gtk-4.0-37 -libxaw7 -libxfont2 -libxkbfile1 -libxmu6 -libxmuu1 -libxtst6 -libxxf86dga1 -libyelp0 -linux-sound-base -mutter -mutter-common -nautilus -nautilus-data -openprinting-ppds -p11-kit -p11-kit-modules -pavucontrol -pinentry-gnome3 -poppler-data -printer-driver-pnm2ppa -pulseaudio -pulseaudio-module-bluetooth -pulseaudio-utils -python3-click -python3-colorama -python3-dateutil -python3-debconf -python3-debian -python3-distupgrade -python3-update-manager -python3-xkit -python3-yaml -software-properties-gtk -spice-vdagent -system-config-printer-gnome -terminator -tracker -tracker-extract -tracker-miner-fs -ubuntu-business-defaults -ubuntu-desktop-minimal -ubuntu-session -ubuntu-settings -update-manager -update-manager-core -update-notifier -update-notifier-common -upower -x11-apps -x11-session-utils -x11-utils -x11-xkb-utils -x11-xserver-utils -xarchiver -xdg-dbus-proxy -xdg-desktop-portal -xdg-user-dirs -xdg-user-dirs-gtk -xfonts-base -xinit -xinput -xorg -xorg-docs-core -xserver-common -xserver-xorg -xserver-xorg-video-fbdev -xwayland -yaru-theme-gnome-shell -yelp -yelp-xsl -zenity -zenity-common diff --git a/config/desktop/hirsute/environments/gnome/debian b/config/desktop/hirsute/environments/gnome/debian deleted file mode 120000 index 68b05869b..000000000 --- a/config/desktop/hirsute/environments/gnome/debian +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/gnome/debian \ No newline at end of file diff --git a/config/desktop/hirsute/environments/gnome/only_for b/config/desktop/hirsute/environments/gnome/only_for deleted file mode 120000 index 6b2dee246..000000000 --- a/config/desktop/hirsute/environments/gnome/only_for +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/gnome/only_for \ No newline at end of file diff --git a/config/desktop/hirsute/environments/gnome/support b/config/desktop/hirsute/environments/gnome/support deleted file mode 120000 index fe28f381d..000000000 --- a/config/desktop/hirsute/environments/gnome/support +++ /dev/null @@ -1 +0,0 @@ -../../../focal/environments/gnome/support \ No newline at end of file diff --git a/config/desktop/hirsute/environments/i3-wm b/config/desktop/hirsute/environments/i3-wm deleted file mode 120000 index b198ea73e..000000000 --- a/config/desktop/hirsute/environments/i3-wm +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/i3-wm \ No newline at end of file diff --git a/config/desktop/hirsute/environments/kde-plasma b/config/desktop/hirsute/environments/kde-plasma deleted file mode 120000 index 40255817b..000000000 --- a/config/desktop/hirsute/environments/kde-plasma +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/kde-plasma \ No newline at end of file diff --git a/config/desktop/hirsute/environments/mate b/config/desktop/hirsute/environments/mate deleted file mode 120000 index 1defe21ee..000000000 --- a/config/desktop/hirsute/environments/mate +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/mate \ No newline at end of file diff --git a/config/desktop/hirsute/environments/xfce b/config/desktop/hirsute/environments/xfce deleted file mode 120000 index e48eb6dc1..000000000 --- a/config/desktop/hirsute/environments/xfce +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/xfce \ No newline at end of file diff --git a/config/desktop/hirsute/environments/xmonad b/config/desktop/hirsute/environments/xmonad deleted file mode 120000 index 8f92a94e7..000000000 --- a/config/desktop/hirsute/environments/xmonad +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/xmonad \ No newline at end of file diff --git a/config/desktop/impish/appgroups/3dsupport/packages b/config/desktop/impish/appgroups/3dsupport/packages deleted file mode 120000 index 6e36910cb..000000000 --- a/config/desktop/impish/appgroups/3dsupport/packages +++ /dev/null @@ -1 +0,0 @@ -../../../focal/appgroups/3dsupport/packages \ No newline at end of file diff --git a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg b/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg deleted file mode 100644 index b5a8ebbf68cee1e03552ce2cb35fb2287b68fbe0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5934 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 diff --git a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source b/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source deleted file mode 100644 index a9f65c90a..000000000 --- a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ impish main diff --git a/config/desktop/impish/appgroups/browsers/armbian b/config/desktop/impish/appgroups/browsers/armbian deleted file mode 120000 index 6c54c7f4d..000000000 --- a/config/desktop/impish/appgroups/browsers/armbian +++ /dev/null @@ -1 +0,0 @@ -../../../focal/appgroups/browsers/armbian \ No newline at end of file diff --git a/config/desktop/impish/appgroups/browsers/debian b/config/desktop/impish/appgroups/browsers/debian deleted file mode 120000 index b7a68e9df..000000000 --- a/config/desktop/impish/appgroups/browsers/debian +++ /dev/null @@ -1 +0,0 @@ -../../../focal/appgroups/browsers/debian \ No newline at end of file diff --git a/config/desktop/impish/appgroups/browsers/packages b/config/desktop/impish/appgroups/browsers/packages deleted file mode 120000 index 5bfe93b11..000000000 --- a/config/desktop/impish/appgroups/browsers/packages +++ /dev/null @@ -1 +0,0 @@ -../../../focal/appgroups/browsers/packages \ No newline at end of file diff --git a/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg b/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg deleted file mode 100644 index 95cf6bbd3345b3c727616983f6fa65b7f6d92208..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 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 AxBvhE diff --git a/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source b/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source deleted file mode 100644 index 786834d46..000000000 --- a/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source +++ /dev/null @@ -1 +0,0 @@ -deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ impish main diff --git a/config/desktop/impish/appgroups/chat b/config/desktop/impish/appgroups/chat deleted file mode 120000 index 32416fca1..000000000 --- a/config/desktop/impish/appgroups/chat +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/chat \ No newline at end of file diff --git a/config/desktop/impish/appgroups/desktop_tools b/config/desktop/impish/appgroups/desktop_tools deleted file mode 120000 index 9135d2858..000000000 --- a/config/desktop/impish/appgroups/desktop_tools +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/desktop_tools \ No newline at end of file diff --git a/config/desktop/impish/appgroups/editors b/config/desktop/impish/appgroups/editors deleted file mode 120000 index 5c5c21c05..000000000 --- a/config/desktop/impish/appgroups/editors +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/editors \ No newline at end of file diff --git a/config/desktop/impish/appgroups/email b/config/desktop/impish/appgroups/email deleted file mode 120000 index 1df4a1969..000000000 --- a/config/desktop/impish/appgroups/email +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/email \ No newline at end of file diff --git a/config/desktop/impish/appgroups/internet b/config/desktop/impish/appgroups/internet deleted file mode 120000 index 9962013cf..000000000 --- a/config/desktop/impish/appgroups/internet +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/internet \ No newline at end of file diff --git a/config/desktop/impish/appgroups/multimedia b/config/desktop/impish/appgroups/multimedia deleted file mode 120000 index 8af025216..000000000 --- a/config/desktop/impish/appgroups/multimedia +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/multimedia \ No newline at end of file diff --git a/config/desktop/impish/appgroups/office b/config/desktop/impish/appgroups/office deleted file mode 120000 index f3b2e2e9d..000000000 --- a/config/desktop/impish/appgroups/office +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/office \ No newline at end of file diff --git a/config/desktop/impish/appgroups/programming b/config/desktop/impish/appgroups/programming deleted file mode 120000 index 0f5ee0d7c..000000000 --- a/config/desktop/impish/appgroups/programming +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/programming \ No newline at end of file diff --git a/config/desktop/impish/appgroups/remote_desktop b/config/desktop/impish/appgroups/remote_desktop deleted file mode 120000 index bdac8eaee..000000000 --- a/config/desktop/impish/appgroups/remote_desktop +++ /dev/null @@ -1 +0,0 @@ -../../focal/appgroups/remote_desktop \ No newline at end of file diff --git a/config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh b/config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh deleted file mode 120000 index a928e9618..000000000 --- a/config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../focal/environments/budgie/armbian/create_desktop_package.sh \ No newline at end of file diff --git a/config/desktop/impish/environments/budgie/config_base/packages b/config/desktop/impish/environments/budgie/config_base/packages deleted file mode 100644 index 50e67b672..000000000 --- a/config/desktop/impish/environments/budgie/config_base/packages +++ /dev/null @@ -1,199 +0,0 @@ -anacron -apport-gtk -blueman -bluez -bluez-cups -bluez-tools -brltty -brltty-x11 -budgie-app-launcher-applet -budgie-applications-menu-applet -budgie-appmenu-applet -budgie-brightness-controller-applet -budgie-clockworks-applet -budgie-countdown-applet -budgie-desktop -budgie-desktop-doc -budgie-desktop-environment -budgie-dropby-applet -budgie-extras-common -budgie-extras-daemon -budgie-fuzzyclock-applet -budgie-hotcorners-applet -budgie-indicator-applet -budgie-kangaroo-applet -budgie-keyboard-autoswitch-applet -budgie-network-manager-applet -budgie-previews -budgie-previews-applet -budgie-quickchar -budgie-quicknote-applet -budgie-recentlyused-applet -budgie-rotation-lock-applet -budgie-showtime-applet -budgie-sntray-plugin -budgie-takeabreak-applet -budgie-trash-applet -budgie-visualspace-applet -budgie-wallpapers-focal -budgie-wallstreet -budgie-weathershow-applet -budgie-welcome -budgie-window-mover-applet -budgie-window-shuffler -budgie-workspace-overview-applet -budgie-workspace-stopwatch-applet -caffeine -cifs-utils -cups -cups-bsd -cups-client -cups-filters -dbus-x11 -dictionaries-common -doc-base -evince -evince-common -fontconfig -fontconfig-config -fonts-noto-mono -fonts-ubuntu-font-family-console -foomatic-db-compressed-ppds -gdebi -ghostscript-x -gir1.2-appindicator3-0.1 -gnome-orca -gnome-screenshot -gnome-tweaks -gnome-user-docs-de -gnome-user-docs-es -gnome-user-docs-it -gnome-user-docs-pt -gnome-user-docs-ru -gnome-user-docs-sl -gstreamer1.0-packagekit -gstreamer1.0-plugins-base-apps -gstreamer1.0-pulseaudio -gtk2-engines -gtk2-engines-murrine -gtk2-engines-pixbuf -gvfs-backends -hplip -hunspell-en-us -indicator-printers -inputattach -kerneloops -keyutils -language-pack-gnome-de -language-pack-gnome-en -language-pack-gnome-es -language-pack-gnome-fr -language-pack-gnome-it -language-pack-gnome-pt -language-pack-gnome-ru -language-pack-gnome-sl -laptop-detect -libappindicator3-1 -libatk-adaptor -libcvc0 -libfont-afm-perl -libfontconfig1 -libfontembed1 -libfontenc1 -libgail-common -libgl1-mesa-dri -libgsettings-qt1 -libgtk2.0-bin -libnotify-bin -libplank1 -libplank-common -libproxy1-plugin-gsettings -libproxy1-plugin-networkmanager -libu2f-udev -libwmf0.2-7-gtk -libxcursor1 -lightdm -lightdm-settings -mesa-utils -mousepad -mousetweaks -nemo -nemo-data -nemo-fileroller -nemo-font-manager -nemo-gtkhash -network-manager-config-connectivity-ubuntu -network-manager-l2tp -network-manager-openconnect -network-manager-openvpn -network-manager-pptp -network-manager-ssh -network-manager-vpnc -numix-blue-gtk-theme -numix-gtk-theme -numix-icon-theme -numix-icon-theme-circle -openprinting-ppds -p7zip-full -pamix -pasystray -pavucontrol -pavucontrol-qt -pavumeter -plank -policykit-1 -policykit-1-gnome -policykit-desktop-privileges -printer-driver-all -profile-sync-daemon -pulseaudio-module-bluetooth -redshift -samba -slick-greeter -smbclient -software-properties-gtk -spice-vdagent -system-config-printer -system-config-printer-common -terminator -tracker-extract -tracker-miner-fs -ttf-ubuntu-font-family -ubuntu-drivers-common -update-inetd -update-manager -update-manager-core -update-notifier -update-notifier-common -viewnior -wamerican -wbrazilian -wbritish -wfrench -witalian -wportuguese -wspanish -wswiss -x11-apps -x11-xserver-utils -xarchiver -xbacklight -xcursor-themes -xdg-user-dirs -xdg-user-dirs-gtk -xfonts-100dpi -xfonts-75dpi -xfonts-base -xfonts-encodings -xfonts-scalable -xfonts-utils -xinit -xorg-docs-core -xscreensaver -xserver-xorg -xserver-xorg-video-fbdev -xterm -xtermcontrol -xtermset -xwallpaper -zip diff --git a/config/desktop/impish/environments/budgie/config_base/packages.uninstall b/config/desktop/impish/environments/budgie/config_base/packages.uninstall deleted file mode 120000 index 576c812ef..000000000 --- a/config/desktop/impish/environments/budgie/config_base/packages.uninstall +++ /dev/null @@ -1 +0,0 @@ -../../../../focal/environments/budgie/config_base/packages.uninstall \ No newline at end of file diff --git a/config/desktop/impish/environments/budgie/debian/postinst b/config/desktop/impish/environments/budgie/debian/postinst deleted file mode 120000 index 00ed651ab..000000000 --- a/config/desktop/impish/environments/budgie/debian/postinst +++ /dev/null @@ -1 +0,0 @@ -../../../../focal/environments/budgie/debian/postinst \ No newline at end of file diff --git a/config/desktop/impish/environments/budgie/only_for b/config/desktop/impish/environments/budgie/only_for deleted file mode 100644 index 54b43c7a5..000000000 --- a/config/desktop/impish/environments/budgie/only_for +++ /dev/null @@ -1 +0,0 @@ -arm64, amd64 diff --git a/config/desktop/impish/environments/budgie/support b/config/desktop/impish/environments/budgie/support deleted file mode 100644 index a23e5fb94..000000000 --- a/config/desktop/impish/environments/budgie/support +++ /dev/null @@ -1 +0,0 @@ -supported diff --git a/config/desktop/impish/environments/cinnamon b/config/desktop/impish/environments/cinnamon deleted file mode 120000 index 5cb429269..000000000 --- a/config/desktop/impish/environments/cinnamon +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/cinnamon \ No newline at end of file diff --git a/config/desktop/impish/environments/gnome b/config/desktop/impish/environments/gnome deleted file mode 120000 index 921b0cde8..000000000 --- a/config/desktop/impish/environments/gnome +++ /dev/null @@ -1 +0,0 @@ -../../hirsute/environments/gnome \ No newline at end of file diff --git a/config/desktop/impish/environments/i3-wm b/config/desktop/impish/environments/i3-wm deleted file mode 120000 index b198ea73e..000000000 --- a/config/desktop/impish/environments/i3-wm +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/i3-wm \ No newline at end of file diff --git a/config/desktop/impish/environments/kde-plasma b/config/desktop/impish/environments/kde-plasma deleted file mode 120000 index 40255817b..000000000 --- a/config/desktop/impish/environments/kde-plasma +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/kde-plasma \ No newline at end of file diff --git a/config/desktop/impish/environments/mate b/config/desktop/impish/environments/mate deleted file mode 120000 index 1defe21ee..000000000 --- a/config/desktop/impish/environments/mate +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/mate \ No newline at end of file diff --git a/config/desktop/impish/environments/xfce b/config/desktop/impish/environments/xfce deleted file mode 120000 index e48eb6dc1..000000000 --- a/config/desktop/impish/environments/xfce +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/xfce \ No newline at end of file diff --git a/config/desktop/impish/environments/xmonad b/config/desktop/impish/environments/xmonad deleted file mode 120000 index 8f92a94e7..000000000 --- a/config/desktop/impish/environments/xmonad +++ /dev/null @@ -1 +0,0 @@ -../../focal/environments/xmonad \ No newline at end of file diff --git a/config/distributions/bionic/name b/config/distributions/bionic/name deleted file mode 100644 index 6e4b58986..000000000 --- a/config/distributions/bionic/name +++ /dev/null @@ -1 +0,0 @@ -Ubuntu Bionic 18.04 LTS diff --git a/config/distributions/bionic/support b/config/distributions/bionic/support deleted file mode 100644 index 03cd47015..000000000 --- a/config/distributions/bionic/support +++ /dev/null @@ -1 +0,0 @@ -csc diff --git a/config/distributions/hirsute/name b/config/distributions/hirsute/name deleted file mode 100644 index 16f6ce4f1..000000000 --- a/config/distributions/hirsute/name +++ /dev/null @@ -1 +0,0 @@ -Ubuntu Hirsute 21.04 diff --git a/config/distributions/hirsute/support b/config/distributions/hirsute/support deleted file mode 100644 index a23e5fb94..000000000 --- a/config/distributions/hirsute/support +++ /dev/null @@ -1 +0,0 @@ -supported diff --git a/config/distributions/impish/name b/config/distributions/impish/name deleted file mode 100644 index 893d22a73..000000000 --- a/config/distributions/impish/name +++ /dev/null @@ -1 +0,0 @@ -Ubuntu Impish 21.10 diff --git a/config/distributions/impish/support b/config/distributions/impish/support deleted file mode 100644 index 03cd47015..000000000 --- a/config/distributions/impish/support +++ /dev/null @@ -1 +0,0 @@ -csc diff --git a/config/distributions/jammy/support b/config/distributions/jammy/support index 03cd47015..a23e5fb94 100644 --- a/config/distributions/jammy/support +++ b/config/distributions/jammy/support @@ -1 +1 @@ -csc +supported diff --git a/config/distributions/stretch/name b/config/distributions/stretch/name deleted file mode 100644 index b095b99be..000000000 --- a/config/distributions/stretch/name +++ /dev/null @@ -1 +0,0 @@ -Debian 9 Stretch diff --git a/config/distributions/stretch/support b/config/distributions/stretch/support deleted file mode 100644 index bc2264ca1..000000000 --- a/config/distributions/stretch/support +++ /dev/null @@ -1 +0,0 @@ -eos diff --git a/config/distributions/xenial/name b/config/distributions/xenial/name deleted file mode 100644 index 5775788f6..000000000 --- a/config/distributions/xenial/name +++ /dev/null @@ -1 +0,0 @@ -Ubuntu Xenial 16.04 LTS diff --git a/config/distributions/xenial/support b/config/distributions/xenial/support deleted file mode 100644 index bc2264ca1..000000000 --- a/config/distributions/xenial/support +++ /dev/null @@ -1 +0,0 @@ -eos diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh index 8b1f63c04..511196e45 100644 --- a/lib/chroot-buildpackages.sh +++ b/lib/chroot-buildpackages.sh @@ -32,18 +32,12 @@ create_chroot() qemu_binary['arm64']='qemu-aarch64-static' apt_mirror['buster']="$DEBIAN_MIRROR" apt_mirror['bullseye']="$DEBIAN_MIRROR" - apt_mirror['bionic']="$UBUNTU_MIRROR" apt_mirror['focal']="$UBUNTU_MIRROR" - apt_mirror['hirsute']="$UBUNTU_MIRROR" - apt_mirror['impish']="$UBUNTU_MIRROR" apt_mirror['jammy']="$UBUNTU_MIRROR" components['buster']='main,contrib' components['bullseye']='main,contrib' components['sid']='main,contrib' - components['bionic']='main,universe,multiverse' components['focal']='main,universe,multiverse' - components['hirsute']='main,universe,multiverse' - components['impish']='main,universe,multiverse' components['jammy']='main,universe,multiverse' display_alert "Creating build chroot" "$release/$arch" "info" local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc,apt-utils" diff --git a/lib/configuration.sh b/lib/configuration.sh index 217cbf59e..e9f05f681 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -406,12 +406,6 @@ SDCARD="${SRC}/.tmp/rootfs-${MOUNT_UUID}" MOUNT="${SRC}/.tmp/mount-${MOUNT_UUID}" DESTIMG="${SRC}/.tmp/image-${MOUNT_UUID}" -# dropbear needs to be configured differently -[[ $CRYPTROOT_ENABLE == yes && $RELEASE == xenial ]] && exit_with_error "Encrypted rootfs is not supported in Xenial" -[[ $RELEASE == stretch && $CAN_BUILD_STRETCH != yes ]] && exit_with_error "Building Debian Stretch images with selected kernel is not supported" -[[ $RELEASE == bionic && $CAN_BUILD_STRETCH != yes ]] && exit_with_error "Building Ubuntu Bionic images with selected kernel is not supported" -[[ $RELEASE == hirsute && $HOSTRELEASE == focal ]] && exit_with_error "Building Ubuntu Hirsute images requires Hirsute build host. Please upgrade your host or select a different target OS" - [[ -n $ATFSOURCE && -z $ATF_USE_GCC ]] && exit_with_error "Error in configuration: ATF_USE_GCC is unset" [[ -z $UBOOT_USE_GCC ]] && exit_with_error "Error in configuration: UBOOT_USE_GCC is unset" [[ -z $KERNEL_USE_GCC ]] && exit_with_error "Error in configuration: KERNEL_USE_GCC is unset" @@ -423,7 +417,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^} [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY" [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH" -if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy)$ ]]; then +if [[ "$RELEASE" =~ ^(focal|jammy)$ ]]; then DISTRIBUTION="Ubuntu" else DISTRIBUTION="Debian" diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index 1fae8af88..7eec22824 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -440,10 +440,8 @@ prepare_partitions() # add -N number of inodes to keep mount from running out # create bigger number for desktop builds if [[ $BUILD_DESKTOP == yes ]]; then local node_number=4096; else local node_number=1024; fi - if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|focal|hirsute|impish|jammy|sid ]]; then + if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|sid ]]; then mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum -N $((128*${node_number}))" - elif [[ $HOSTRELEASE == xenial ]]; then - mkopts[ext4]="-q -m 2 -N $((128*${node_number}))" fi mkopts[fat]='-n BOOT' mkopts[ext2]='-q' diff --git a/lib/distributions.sh b/lib/distributions.sh index 3ec270dd9..63ae159bb 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -620,20 +620,7 @@ install_distribution_specific() case $RELEASE in - xenial) - - # remove legal info from Ubuntu - [[ -f "${SDCARD}"/etc/legal ]] && rm "${SDCARD}"/etc/legal - - # ureadahead needs kernel tracing options that AFAIK are present only in mainline. disable - chroot "${SDCARD}" /bin/bash -c \ - "systemctl --no-reload mask ondemand.service ureadahead.service >/dev/null 2>&1" - chroot "${SDCARD}" /bin/bash -c \ - "systemctl --no-reload mask setserial.service etc-setserial.service >/dev/null 2>&1" - - ;; - - stretch|buster|sid) + buster|sid) # remove doubled uname from motd [[ -f "${SDCARD}"/etc/update-motd.d/10-uname ]] && rm "${SDCARD}"/etc/update-motd.d/10-uname @@ -654,7 +641,8 @@ install_distribution_specific() ;; - bionic|focal|hirsute|impish|jammy) + + focal|jammy) # by using default lz4 initrd compression leads to corruption, go back to proven method sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf diff --git a/lib/general.sh b/lib/general.sh index 75529d4d3..64389df77 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -159,7 +159,7 @@ get_package_list_hash() # create_sources_list # -# : buster|bullseye|bionic|focal|hirsute|impish|jammy|sid +# : bullseye|focal|jammy|sid # : path to root directory # create_sources_list() @@ -169,7 +169,7 @@ create_sources_list() [[ -z $basedir ]] && exit_with_error "No basedir passed to create_sources_list" case $release in - stretch|buster) + buster) cat <<-EOF > "${basedir}"/etc/apt/sources.list deb http://${DEBIAN_MIRROR} $release main contrib non-free #deb-src http://${DEBIAN_MIRROR} $release main contrib non-free @@ -208,7 +208,7 @@ create_sources_list() EOF ;; - xenial|bionic|focal|hirsute|impish|jammy) + focal|jammy) cat <<-EOF > "${basedir}"/etc/apt/sources.list deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse #deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse