From 5d7744c880c7202b4f572134f35986e50a423512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 24 Oct 2022 09:07:51 +0200 Subject: [PATCH] Add Ubuntu 22.10 Kinetic (#4326) * Add Ubuntu Kinetic * Remove missing package * Keep only working desktops in kinetic * Optimisation * Cleanup --- config/cli/jammy/main/sources/apt/zfs.source | 1 - config/cli/kinetic/debootstrap | 1 + config/cli/kinetic/main/config_cli_standard | 1 + config/cli/kinetic/main/config_desktop | 1 + config/cli/kinetic/main/packages | 1 + config/cli/kinetic/main/packages.additional | 1 + config/cli/kinetic/main/packages.uninstall | 1 + .../main/sources/apt/chromium-browser.gpg | 1 + .../main/sources/apt/chromium-browser.source | 1 + .../kinetic/main/sources/apt/mozilla-team.gpg | 1 + .../main/sources/apt/mozilla-team.source | 1 + config/cli/kinetic/main/sources/apt/nala.gpg | 1 + .../cli/kinetic/main/sources/apt/nala.source | 1 + config/cli/kinetic/main/sources/apt/zfs.gpg | 1 + .../cli/kinetic/main/sources/apt/zfs.source | 1 + .../environments/gnome/config_base/packages | 1 - config/desktop/kinetic/appgroups/3dsupport | 1 + config/desktop/kinetic/appgroups/browsers | 1 + .../desktop/kinetic/appgroups/chat/packages | 8 + .../desktop/kinetic/appgroups/desktop_tools | 1 + config/desktop/kinetic/appgroups/editors | 1 + config/desktop/kinetic/appgroups/email | 1 + config/desktop/kinetic/appgroups/internet | 1 + config/desktop/kinetic/appgroups/multimedia | 1 + config/desktop/kinetic/appgroups/office | 1 + config/desktop/kinetic/appgroups/programming | 1 + .../desktop/kinetic/appgroups/remote_desktop | 1 + .../kinetic/environments/cinnamon/armbian | 1 + .../cinnamon/config_base/packages | 183 ++++++++++++++++++ .../cinnamon/config_base/packages.uninstall | 1 + .../kinetic/environments/cinnamon/debian | 1 + .../kinetic/environments/cinnamon/only_for | 1 + .../kinetic/environments/cinnamon/support | 1 + .../kinetic/environments/gnome/armbian | 1 + .../environments/gnome/config_base/packages | 166 ++++++++++++++++ .../desktop/kinetic/environments/gnome/debian | 1 + .../kinetic/environments/gnome/only_for | 1 + .../kinetic/environments/gnome/support | 1 + config/desktop/kinetic/environments/xfce | 1 + config/distributions/kinetic/name | 1 + config/distributions/kinetic/support | 1 + lib/functions/cli/utils-cli.sh | 2 +- lib/functions/configuration/main-config.sh | 2 +- lib/functions/extras/buildpkg.sh | 6 +- lib/functions/general/repo.sh | 2 +- lib/functions/host/prepare-host.sh | 4 +- lib/functions/image/partitioning.sh | 2 +- lib/functions/rootfs/distro-specific.sh | 6 +- 48 files changed, 406 insertions(+), 13 deletions(-) create mode 120000 config/cli/kinetic/debootstrap create mode 120000 config/cli/kinetic/main/config_cli_standard create mode 120000 config/cli/kinetic/main/config_desktop create mode 120000 config/cli/kinetic/main/packages create mode 120000 config/cli/kinetic/main/packages.additional create mode 120000 config/cli/kinetic/main/packages.uninstall create mode 120000 config/cli/kinetic/main/sources/apt/chromium-browser.gpg create mode 120000 config/cli/kinetic/main/sources/apt/chromium-browser.source create mode 120000 config/cli/kinetic/main/sources/apt/mozilla-team.gpg create mode 100644 config/cli/kinetic/main/sources/apt/mozilla-team.source create mode 120000 config/cli/kinetic/main/sources/apt/nala.gpg create mode 120000 config/cli/kinetic/main/sources/apt/nala.source create mode 120000 config/cli/kinetic/main/sources/apt/zfs.gpg create mode 100644 config/cli/kinetic/main/sources/apt/zfs.source create mode 120000 config/desktop/kinetic/appgroups/3dsupport create mode 120000 config/desktop/kinetic/appgroups/browsers create mode 100644 config/desktop/kinetic/appgroups/chat/packages create mode 120000 config/desktop/kinetic/appgroups/desktop_tools create mode 120000 config/desktop/kinetic/appgroups/editors create mode 120000 config/desktop/kinetic/appgroups/email create mode 120000 config/desktop/kinetic/appgroups/internet create mode 120000 config/desktop/kinetic/appgroups/multimedia create mode 120000 config/desktop/kinetic/appgroups/office create mode 120000 config/desktop/kinetic/appgroups/programming create mode 120000 config/desktop/kinetic/appgroups/remote_desktop create mode 120000 config/desktop/kinetic/environments/cinnamon/armbian create mode 100644 config/desktop/kinetic/environments/cinnamon/config_base/packages create mode 120000 config/desktop/kinetic/environments/cinnamon/config_base/packages.uninstall create mode 120000 config/desktop/kinetic/environments/cinnamon/debian create mode 120000 config/desktop/kinetic/environments/cinnamon/only_for create mode 120000 config/desktop/kinetic/environments/cinnamon/support create mode 120000 config/desktop/kinetic/environments/gnome/armbian create mode 100644 config/desktop/kinetic/environments/gnome/config_base/packages create mode 120000 config/desktop/kinetic/environments/gnome/debian create mode 120000 config/desktop/kinetic/environments/gnome/only_for create mode 120000 config/desktop/kinetic/environments/gnome/support create mode 120000 config/desktop/kinetic/environments/xfce create mode 100644 config/distributions/kinetic/name create mode 100644 config/distributions/kinetic/support diff --git a/config/cli/jammy/main/sources/apt/zfs.source b/config/cli/jammy/main/sources/apt/zfs.source index 87c9f71ef..524d9acc9 100644 --- a/config/cli/jammy/main/sources/apt/zfs.source +++ b/config/cli/jammy/main/sources/apt/zfs.source @@ -1,2 +1 @@ deb [signed-by=/usr/share/keyrings/zfs.gpg] https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ jammy main -# deb-src https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ jammy main diff --git a/config/cli/kinetic/debootstrap b/config/cli/kinetic/debootstrap new file mode 120000 index 000000000..3a2f1c6eb --- /dev/null +++ b/config/cli/kinetic/debootstrap @@ -0,0 +1 @@ +../jammy/debootstrap \ No newline at end of file diff --git a/config/cli/kinetic/main/config_cli_standard b/config/cli/kinetic/main/config_cli_standard new file mode 120000 index 000000000..03d9e1ecb --- /dev/null +++ b/config/cli/kinetic/main/config_cli_standard @@ -0,0 +1 @@ +../../jammy/main/config_cli_standard \ No newline at end of file diff --git a/config/cli/kinetic/main/config_desktop b/config/cli/kinetic/main/config_desktop new file mode 120000 index 000000000..9f8254298 --- /dev/null +++ b/config/cli/kinetic/main/config_desktop @@ -0,0 +1 @@ +../../jammy/main/config_desktop \ No newline at end of file diff --git a/config/cli/kinetic/main/packages b/config/cli/kinetic/main/packages new file mode 120000 index 000000000..7102d1f81 --- /dev/null +++ b/config/cli/kinetic/main/packages @@ -0,0 +1 @@ +../../jammy/main/packages \ No newline at end of file diff --git a/config/cli/kinetic/main/packages.additional b/config/cli/kinetic/main/packages.additional new file mode 120000 index 000000000..5283a62aa --- /dev/null +++ b/config/cli/kinetic/main/packages.additional @@ -0,0 +1 @@ +../../jammy/main/packages.additional \ No newline at end of file diff --git a/config/cli/kinetic/main/packages.uninstall b/config/cli/kinetic/main/packages.uninstall new file mode 120000 index 000000000..24014a451 --- /dev/null +++ b/config/cli/kinetic/main/packages.uninstall @@ -0,0 +1 @@ +../../jammy/main/packages.uninstall \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/chromium-browser.gpg b/config/cli/kinetic/main/sources/apt/chromium-browser.gpg new file mode 120000 index 000000000..52abbbad5 --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/chromium-browser.gpg @@ -0,0 +1 @@ +../../../../jammy/main/sources/apt/chromium-browser.gpg \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/chromium-browser.source b/config/cli/kinetic/main/sources/apt/chromium-browser.source new file mode 120000 index 000000000..42854cbc9 --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/chromium-browser.source @@ -0,0 +1 @@ +../../../../jammy/main/sources/apt/chromium-browser.source \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/mozilla-team.gpg b/config/cli/kinetic/main/sources/apt/mozilla-team.gpg new file mode 120000 index 000000000..ef5e9507d --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/mozilla-team.gpg @@ -0,0 +1 @@ +../../../../jammy/main/sources/apt/mozilla-team.gpg \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/mozilla-team.source b/config/cli/kinetic/main/sources/apt/mozilla-team.source new file mode 100644 index 000000000..d3f7355ca --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/mozilla-team.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ kinetic main diff --git a/config/cli/kinetic/main/sources/apt/nala.gpg b/config/cli/kinetic/main/sources/apt/nala.gpg new file mode 120000 index 000000000..6274a9365 --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/nala.gpg @@ -0,0 +1 @@ +../../../../jammy/main/sources/apt/nala.gpg \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/nala.source b/config/cli/kinetic/main/sources/apt/nala.source new file mode 120000 index 000000000..b191dc3f1 --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/nala.source @@ -0,0 +1 @@ +../../../../jammy/main/sources/apt/nala.source \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/zfs.gpg b/config/cli/kinetic/main/sources/apt/zfs.gpg new file mode 120000 index 000000000..8ddbbfdd8 --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/zfs.gpg @@ -0,0 +1 @@ +../../../../jammy/main/sources/apt/zfs.gpg \ No newline at end of file diff --git a/config/cli/kinetic/main/sources/apt/zfs.source b/config/cli/kinetic/main/sources/apt/zfs.source new file mode 100644 index 000000000..524d9acc9 --- /dev/null +++ b/config/cli/kinetic/main/sources/apt/zfs.source @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/zfs.gpg] https://ppa.launchpadcontent.net/jonathonf/zfs/ubuntu/ jammy main diff --git a/config/desktop/jammy/environments/gnome/config_base/packages b/config/desktop/jammy/environments/gnome/config_base/packages index ee5ca82c0..eded2a0a9 100644 --- a/config/desktop/jammy/environments/gnome/config_base/packages +++ b/config/desktop/jammy/environments/gnome/config_base/packages @@ -66,7 +66,6 @@ libidn12 libijs-0.35 libimobiledevice6 libjbig2dec0 -libnautilus-extension1a libnotify-bin libpaper1 libphonenumber8 diff --git a/config/desktop/kinetic/appgroups/3dsupport b/config/desktop/kinetic/appgroups/3dsupport new file mode 120000 index 000000000..f2bd51b9d --- /dev/null +++ b/config/desktop/kinetic/appgroups/3dsupport @@ -0,0 +1 @@ +../../jammy/appgroups/3dsupport \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/browsers b/config/desktop/kinetic/appgroups/browsers new file mode 120000 index 000000000..fc5c7b9b6 --- /dev/null +++ b/config/desktop/kinetic/appgroups/browsers @@ -0,0 +1 @@ +../../jammy/appgroups/browsers \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/chat/packages b/config/desktop/kinetic/appgroups/chat/packages new file mode 100644 index 000000000..73c1b12ff --- /dev/null +++ b/config/desktop/kinetic/appgroups/chat/packages @@ -0,0 +1,8 @@ +hexchat +pidgin +purple-discord +purple-lurch +purple-mm-sms +purple-rocketchat +telegram-purple +telegram-desktop diff --git a/config/desktop/kinetic/appgroups/desktop_tools b/config/desktop/kinetic/appgroups/desktop_tools new file mode 120000 index 000000000..728b8a57a --- /dev/null +++ b/config/desktop/kinetic/appgroups/desktop_tools @@ -0,0 +1 @@ +../../jammy/appgroups/desktop_tools \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/editors b/config/desktop/kinetic/appgroups/editors new file mode 120000 index 000000000..5c5c21c05 --- /dev/null +++ b/config/desktop/kinetic/appgroups/editors @@ -0,0 +1 @@ +../../focal/appgroups/editors \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/email b/config/desktop/kinetic/appgroups/email new file mode 120000 index 000000000..1df4a1969 --- /dev/null +++ b/config/desktop/kinetic/appgroups/email @@ -0,0 +1 @@ +../../focal/appgroups/email \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/internet b/config/desktop/kinetic/appgroups/internet new file mode 120000 index 000000000..9962013cf --- /dev/null +++ b/config/desktop/kinetic/appgroups/internet @@ -0,0 +1 @@ +../../focal/appgroups/internet \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/multimedia b/config/desktop/kinetic/appgroups/multimedia new file mode 120000 index 000000000..8af025216 --- /dev/null +++ b/config/desktop/kinetic/appgroups/multimedia @@ -0,0 +1 @@ +../../focal/appgroups/multimedia \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/office b/config/desktop/kinetic/appgroups/office new file mode 120000 index 000000000..f3b2e2e9d --- /dev/null +++ b/config/desktop/kinetic/appgroups/office @@ -0,0 +1 @@ +../../focal/appgroups/office \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/programming b/config/desktop/kinetic/appgroups/programming new file mode 120000 index 000000000..0f5ee0d7c --- /dev/null +++ b/config/desktop/kinetic/appgroups/programming @@ -0,0 +1 @@ +../../focal/appgroups/programming \ No newline at end of file diff --git a/config/desktop/kinetic/appgroups/remote_desktop b/config/desktop/kinetic/appgroups/remote_desktop new file mode 120000 index 000000000..bdac8eaee --- /dev/null +++ b/config/desktop/kinetic/appgroups/remote_desktop @@ -0,0 +1 @@ +../../focal/appgroups/remote_desktop \ No newline at end of file diff --git a/config/desktop/kinetic/environments/cinnamon/armbian b/config/desktop/kinetic/environments/cinnamon/armbian new file mode 120000 index 000000000..5a6ad11a6 --- /dev/null +++ b/config/desktop/kinetic/environments/cinnamon/armbian @@ -0,0 +1 @@ +../../../focal/environments/cinnamon/armbian \ No newline at end of file diff --git a/config/desktop/kinetic/environments/cinnamon/config_base/packages b/config/desktop/kinetic/environments/cinnamon/config_base/packages new file mode 100644 index 000000000..333e61091 --- /dev/null +++ b/config/desktop/kinetic/environments/cinnamon/config_base/packages @@ -0,0 +1,183 @@ +anacron +apport-gtk +blueman +bluez +bluez-cups +bluez-tools +brltty +brltty-x11 +cifs-utils +cinnamon +cinnamon-common +cinnamon-control-center +cinnamon-control-center-data +cinnamon-core +cinnamon-desktop-data +cinnamon-screensaver +cinnamon-session +cinnamon-session-common +cinnamon-settings-daemon +colord +cups +cups-bsd +cups-client +cups-filters +dbus-x11 +dictionaries-common +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-console +foomatic-db-compressed-ppds +gdebi +ghostscript-x +gir1.2-cinnamondesktop-3.0 +gir1.2-cmenu-3.0 +gir1.2-cvc-1.0 +gist +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 +gnome-system-monitor +gnome-terminal +gstreamer1.0-packagekit +gstreamer1.0-plugins-base-apps +gstreamer1.0-pulseaudio +gtk2-engines +gtk2-engines-murrine +gtk2-engines-pixbuf +gvfs-backends +hplip +indicator-printers +inxi +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 +libatk-adaptor +libcinnamon-desktop4 +libcinnamon-menu-3-0 +libcscreensaver0 +libcvc0 +libfont-afm-perl +libfontconfig1 +libfontembed1 +libfontenc1 +libgail-common +libgl1-mesa-dri +libgsettings-qt1 +libgtk2.0-bin +libnotify-bin +libproxy1-plugin-gsettings +libproxy1-plugin-networkmanager +libu2f-udev +libwmf0.2-7-gtk +libxapp1 +libxcursor1 +lightdm +lightdm-settings +lm-sensors +lxtask +mesa-utils +mousepad +mousetweaks +nemo +nemo-data +nemo-fileroller +nemo-font-manager +nemo-gtkhash +network-manager-config-connectivity-ubuntu +network-manager-openvpn +network-manager-ssh +network-manager-vpnc +numix-gtk-theme +numix-icon-theme +numix-icon-theme-circle +openprinting-ppds +p7zip-full +pamix +pasystray +pavucontrol +pavucontrol-qt +pavumeter +pinta +policykit-1 +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 +tree +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-utils +x11-xserver-utils +xapp +xapps-common +xarchiver +xbacklight +xcursor-themes +xdg-user-dirs +xdg-user-dirs-gtk +xfonts-100dpi +xfonts-75dpi +xfonts-base +xfonts-encodings +xfonts-scalable +xfonts-utils +xorg-docs-core +xscreensaver +xsensors +xserver-xorg +xserver-xorg-video-fbdev +xwallpaper diff --git a/config/desktop/kinetic/environments/cinnamon/config_base/packages.uninstall b/config/desktop/kinetic/environments/cinnamon/config_base/packages.uninstall new file mode 120000 index 000000000..53c540975 --- /dev/null +++ b/config/desktop/kinetic/environments/cinnamon/config_base/packages.uninstall @@ -0,0 +1 @@ +../../../../focal/environments/cinnamon/config_base/packages.uninstall \ No newline at end of file diff --git a/config/desktop/kinetic/environments/cinnamon/debian b/config/desktop/kinetic/environments/cinnamon/debian new file mode 120000 index 000000000..8a277298f --- /dev/null +++ b/config/desktop/kinetic/environments/cinnamon/debian @@ -0,0 +1 @@ +../../../focal/environments/cinnamon/debian \ No newline at end of file diff --git a/config/desktop/kinetic/environments/cinnamon/only_for b/config/desktop/kinetic/environments/cinnamon/only_for new file mode 120000 index 000000000..3fcda088e --- /dev/null +++ b/config/desktop/kinetic/environments/cinnamon/only_for @@ -0,0 +1 @@ +../../../focal/environments/cinnamon/only_for \ No newline at end of file diff --git a/config/desktop/kinetic/environments/cinnamon/support b/config/desktop/kinetic/environments/cinnamon/support new file mode 120000 index 000000000..f49b5bbd5 --- /dev/null +++ b/config/desktop/kinetic/environments/cinnamon/support @@ -0,0 +1 @@ +../../../focal/environments/cinnamon/support \ No newline at end of file diff --git a/config/desktop/kinetic/environments/gnome/armbian b/config/desktop/kinetic/environments/gnome/armbian new file mode 120000 index 000000000..3adcf2a0e --- /dev/null +++ b/config/desktop/kinetic/environments/gnome/armbian @@ -0,0 +1 @@ +../../../focal/environments/gnome/armbian \ No newline at end of file diff --git a/config/desktop/kinetic/environments/gnome/config_base/packages b/config/desktop/kinetic/environments/gnome/config_base/packages new file mode 100644 index 000000000..eded2a0a9 --- /dev/null +++ b/config/desktop/kinetic/environments/gnome/config_base/packages @@ -0,0 +1,166 @@ +alsa-base +anacron +at-spi2-core +bubblewrap +colord +cups +dbus-x11 +dictionaries-common +dmz-cursor-theme +eject +evolution-data-server +evolution-data-server-common +fonts-freefont-ttf +fonts-noto-cjk +fonts-noto-cjk-extra +fonts-ubuntu +fonts-ubuntu-console +fonts-urw-base35 +foomatic-db-compressed-ppds +gconf2 +gcr +gdebi +genisoimage +ghostscript +ghostscript-x +gist +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-system-monitor +gnome-terminal +gvfs-backends +inputattach +inxi +libasound2-plugins +libaspell15 +libatk-adaptor +libcairo-gobject-perl +libcairo-perl +libcue2 +libexempi8 +libextutils-depends-perl +libextutils-pkgconfig-perl +libfontenc1 +libgdata22 +libgdata-common +libgjs0g +libglib-object-introspection-perl +libglib-perl +libglu1-mesa +libgs9 +libgs9-common +libgxps2 +libical3 +libidn12 +libijs-0.35 +libimobiledevice6 +libjbig2dec0 +libnotify-bin +libpaper1 +libphonenumber8 +libplist3 +libpoppler-glib8 +libprotobuf23 +libpulsedsp +libsasl2-modules +libspeexdsp1 +libtext-iconv-perl +libtotem-plparser18 +libtotem-plparser-common +libu2f-udev +libunity9 +libunity-protocol-private0 +libunity-scopes-json-def-desktop +libunwind8 +libusbmuxd6 +libxapp1 +libxaw7 +libxfont2 +libxkbfile1 +libxmu6 +libxmuu1 +libxtst6 +libxxf86dga1 +libyelp0 +lightdm +lightdm-settings +linux-sound-base +mutter +mutter-common +nautilus +nautilus-data +network-manager-openvpn-gnome +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 +qalculate-gtk +slick-greeter +software-properties-gtk +spice-vdagent +system-config-printer +terminator +tracker +tracker-extract +tracker-miner-fs +tree +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 +xapp +xapps-common +xarchiver +xdg-dbus-proxy +xdg-desktop-portal +xdg-user-dirs +xdg-user-dirs-gtk +xfonts-base +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/kinetic/environments/gnome/debian b/config/desktop/kinetic/environments/gnome/debian new file mode 120000 index 000000000..68b05869b --- /dev/null +++ b/config/desktop/kinetic/environments/gnome/debian @@ -0,0 +1 @@ +../../../focal/environments/gnome/debian \ No newline at end of file diff --git a/config/desktop/kinetic/environments/gnome/only_for b/config/desktop/kinetic/environments/gnome/only_for new file mode 120000 index 000000000..6b2dee246 --- /dev/null +++ b/config/desktop/kinetic/environments/gnome/only_for @@ -0,0 +1 @@ +../../../focal/environments/gnome/only_for \ No newline at end of file diff --git a/config/desktop/kinetic/environments/gnome/support b/config/desktop/kinetic/environments/gnome/support new file mode 120000 index 000000000..fe28f381d --- /dev/null +++ b/config/desktop/kinetic/environments/gnome/support @@ -0,0 +1 @@ +../../../focal/environments/gnome/support \ No newline at end of file diff --git a/config/desktop/kinetic/environments/xfce b/config/desktop/kinetic/environments/xfce new file mode 120000 index 000000000..e48eb6dc1 --- /dev/null +++ b/config/desktop/kinetic/environments/xfce @@ -0,0 +1 @@ +../../focal/environments/xfce \ No newline at end of file diff --git a/config/distributions/kinetic/name b/config/distributions/kinetic/name new file mode 100644 index 000000000..34e90fda4 --- /dev/null +++ b/config/distributions/kinetic/name @@ -0,0 +1 @@ +Ubuntu kinetic 22.10 diff --git a/config/distributions/kinetic/support b/config/distributions/kinetic/support new file mode 100644 index 000000000..03cd47015 --- /dev/null +++ b/config/distributions/kinetic/support @@ -0,0 +1 @@ +csc diff --git a/lib/functions/cli/utils-cli.sh b/lib/functions/cli/utils-cli.sh index 27ca25608..a1e9b176e 100644 --- a/lib/functions/cli/utils-cli.sh +++ b/lib/functions/cli/utils-cli.sh @@ -98,7 +98,7 @@ function handle_docker() { codename=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2) codeid=$(cat /etc/os-release | grep ^NAME | cut -d"=" -f2 | awk '{print tolower($0)}' | tr -d '"' | awk '{print $1}') [[ "${codename}" == "debbie" ]] && codename="buster" && codeid="debian" - [[ "${codename}" == "ulyana" || "${codename}" == "jammy" ]] && codename="focal" && codeid="ubuntu" + [[ "${codename}" == "ulyana" || "${codename}" == "jammy" || "${codename}" == "kinetic" ]] && codename="focal" && codeid="ubuntu" # different binaries for some. TBD. Need to check for all others [[ "${codename}" =~ focal|hirsute ]] && DOCKER_BINARY="docker containerd docker.io" diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index e5f7b8afe..13a819e73 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -221,7 +221,7 @@ POST_FAMILY_CONFIG [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY" [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH" - if [[ "$RELEASE" =~ ^(focal|jammy)$ ]]; then + if [[ "$RELEASE" =~ ^(focal|jammy|kinetic)$ ]]; then DISTRIBUTION="Ubuntu" else DISTRIBUTION="Debian" diff --git a/lib/functions/extras/buildpkg.sh b/lib/functions/extras/buildpkg.sh index 6ef97b238..4b286ecdd 100644 --- a/lib/functions/extras/buildpkg.sh +++ b/lib/functions/extras/buildpkg.sh @@ -11,17 +11,19 @@ create_chroot() { apt_mirror['bullseye']="$DEBIAN_MIRROR" apt_mirror['focal']="$UBUNTU_MIRROR" apt_mirror['jammy']="$UBUNTU_MIRROR" + apt_mirror['kinetic']="$UBUNTU_MIRROR" components['buster']='main,contrib' components['bullseye']='main,contrib' components['sid']='main,contrib' components['focal']='main,universe,multiverse' components['jammy']='main,universe,multiverse' + components['kinetic']='main,universe,multiverse' display_alert "Creating build chroot" "$release/$arch" "info" local includes="ccache,locales,git,ca-certificates,libfile-fcntllock-perl,rsync,python3,distcc,apt-utils" # perhaps a temporally workaround case $release in - bullseye | focal | jammy | sid) + bullseye | focal | jammy | sid | kinetic) includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl" ;; esac @@ -34,7 +36,6 @@ create_chroot() { mkdir -p "${target_dir}" cd "${target_dir}" - debootstrap --variant=buildd \ --components="${components[${release}]}" \ --arch="${arch}" $DEBOOTSTRAP_OPTION \ @@ -117,6 +118,7 @@ chroot_prepare_distccd() { gcc_version['hirsute']='10.2' gcc_version['sid']='10.2' gcc_version['jammy']='12' + gcc_version['kinetic']='12' gcc_type['armhf']='arm-linux-gnueabihf-' gcc_type['arm64']='aarch64-linux-gnu-' rm -f "${dest}"/cmdlist diff --git a/lib/functions/general/repo.sh b/lib/functions/general/repo.sh index adb57a132..987e0557d 100644 --- a/lib/functions/general/repo.sh +++ b/lib/functions/general/repo.sh @@ -23,7 +23,7 @@ addtorepo() { # parameter "delete" remove incoming directory if publishing is succesful # function: cycle trough distributions - local distributions=("stretch" "bionic" "buster" "bullseye" "focal" "hirsute" "impish" "jammy" "sid") + local distributions=("stretch" "bionic" "buster" "bullseye" "focal" "hirsute" "impish" "jammy" "kinetic" "sid") #local distributions=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3)) local errors=0 diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index 94535b025..6044a77ee 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -60,7 +60,7 @@ prepare_host() { fi # Add support for Ubuntu 20.04, 21.04 and Mint 20.x - if [[ $HOSTRELEASE =~ ^(focal|impish|hirsute|jammy|ulyana|ulyssa|bullseye|uma|una)$ ]]; then + if [[ $HOSTRELEASE =~ ^(focal|impish|hirsute|jammy|kinetic|ulyana|ulyssa|vanessa|bullseye|uma|una)$ ]]; then hostdeps+=" python2 python3" ln -fs /usr/bin/python2.7 /usr/bin/python2 ln -fs /usr/bin/python2.7 /usr/bin/python @@ -75,7 +75,7 @@ prepare_host() { # # NO_HOST_RELEASE_CHECK overrides the check for a supported host system # Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion - if [[ -z $HOSTRELEASE || "buster bullseye focal impish hirsute jammy debbie tricia ulyana ulyssa uma una" != *"$HOSTRELEASE"* ]]; then + if [[ -z $HOSTRELEASE || "buster bullseye focal impish hirsute jammy kinetic debbie tricia ulyana ulyssa vanessa uma una" != *"$HOSTRELEASE"* ]]; then if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn" display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn" diff --git a/lib/functions/image/partitioning.sh b/lib/functions/image/partitioning.sh index 06c957896..af7dd8983 100644 --- a/lib/functions/image/partitioning.sh +++ b/lib/functions/image/partitioning.sh @@ -27,7 +27,7 @@ prepare_partitions() { # parttype[nfs] is empty # metadata_csum and 64bit may need to be disabled explicitly when migrating to newer supported host OS releases - if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|sid ]]; then + if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|kinetic|sid ]]; then mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum" fi # mkopts[fat] is empty diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index 0161574f7..ea0fb9b8b 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -12,7 +12,7 @@ install_distribution_specific() { case $RELEASE in - focal | jammy) + focal | jammy | kinetic ) # 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 @@ -87,7 +87,7 @@ install_distribution_specific() { # create_sources_list # -# : bullseye|focal|jammy|sid +# : bullseye|focal|jammy|kinetic|sid # : path to root directory # create_sources_list() { @@ -135,7 +135,7 @@ create_sources_list() { EOF ;; - focal | jammy) + focal | jammy | kinetic) 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