diff --git a/config/desktop/bullseye/environments/mate/config_base/packages b/config/desktop/bullseye/environments/mate/config_base/packages index 2aa9de2bcd..e2d5432d0d 100644 --- a/config/desktop/bullseye/environments/mate/config_base/packages +++ b/config/desktop/bullseye/environments/mate/config_base/packages @@ -87,7 +87,6 @@ mate-window-menu-applet mate-window-title-applet network-manager-gnome numix-gtk-theme -numix-gtk-theme p11-kit pasystray pavucontrol @@ -95,7 +94,6 @@ pavumeter policykit-1 printer-driver-all profile-sync-daemon -profile-sync-daemon pulseaudio pulseaudio-module-bluetooth smbclient diff --git a/config/desktop/buster/environments/lxde/config_base/packages b/config/desktop/buster/environments/lxde/config_base/packages index 1f524a17d9..9f96f25fd1 100644 --- a/config/desktop/buster/environments/lxde/config_base/packages +++ b/config/desktop/buster/environments/lxde/config_base/packages @@ -115,7 +115,6 @@ xfonts-75dpi xfonts-base xfonts-scalable xinit -xinit xorg-docs xorg-docs-core xscreensaver diff --git a/config/desktop/buster/environments/mate/config_base/packages b/config/desktop/buster/environments/mate/config_base/packages index ea016a7aae..5eeaf0c83f 100644 --- a/config/desktop/buster/environments/mate/config_base/packages +++ b/config/desktop/buster/environments/mate/config_base/packages @@ -88,7 +88,6 @@ mate-window-menu-applet mate-window-title-applet network-manager-gnome numix-gtk-theme -numix-gtk-theme p11-kit pasystray pavucontrol @@ -96,7 +95,6 @@ pavumeter policykit-1 printer-driver-all profile-sync-daemon -profile-sync-daemon pulseaudio pulseaudio-module-bluetooth smbclient diff --git a/config/desktop/buster/environments/xfce/config_base/packages b/config/desktop/buster/environments/xfce/config_base/packages index 95a9719175..51b051e0fb 100644 --- a/config/desktop/buster/environments/xfce/config_base/packages +++ b/config/desktop/buster/environments/xfce/config_base/packages @@ -61,7 +61,6 @@ libgtk2.0-bin libnotify-bin libpam-gnome-keyring libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -79,7 +78,6 @@ network-manager-pptp network-manager-ssh network-manager-vpnc numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -92,7 +90,6 @@ pavumeter policykit-1 printer-driver-all profile-sync-daemon -profile-sync-daemon pulseaudio-module-bluetooth redshift slick-greeter @@ -113,7 +110,6 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfce4 @@ -123,12 +119,10 @@ xfce4-terminal xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/budgie/config_base/packages b/config/desktop/focal/environments/budgie/config_base/packages index cac8d85061..1302eed308 100644 --- a/config/desktop/focal/environments/budgie/config_base/packages +++ b/config/desktop/focal/environments/budgie/config_base/packages @@ -130,7 +130,6 @@ libnotify-bin libplank1 libplank-common libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -154,7 +153,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -205,18 +203,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/cinnamon/config_base/packages b/config/desktop/focal/environments/cinnamon/config_base/packages index a70e053d48..897038e9e4 100644 --- a/config/desktop/focal/environments/cinnamon/config_base/packages +++ b/config/desktop/focal/environments/cinnamon/config_base/packages @@ -15,7 +15,6 @@ cinnamon-control-center-data cinnamon-core cinnamon-desktop-data cinnamon-screensaver -cinnamon-screensaver cinnamon-session cinnamon-session-common cinnamon-settings-daemon @@ -97,7 +96,6 @@ libgsettings-qt1 libgtk2.0-bin libnotify-bin libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -122,7 +120,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -171,18 +168,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/deepin/config_base/packages b/config/desktop/focal/environments/deepin/config_base/packages index 6baa994540..353407b0da 100644 --- a/config/desktop/focal/environments/deepin/config_base/packages +++ b/config/desktop/focal/environments/deepin/config_base/packages @@ -52,7 +52,6 @@ deepin-turbo deepin-turbo-booster deepin-voice-recorder deepin-wm -deepin-wm dictionaries-common doc-base evince @@ -120,7 +119,6 @@ libgsettings-qt1 libgtk2.0-bin libnotify-bin libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -140,7 +138,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -192,18 +189,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/enlightenment/config_base/packages b/config/desktop/focal/environments/enlightenment/config_base/packages index c104b13f5e..08d0cfa22d 100644 --- a/config/desktop/focal/environments/enlightenment/config_base/packages +++ b/config/desktop/focal/environments/enlightenment/config_base/packages @@ -85,7 +85,6 @@ libnotify-bin libplank1 libplank-common libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -105,7 +104,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -157,18 +155,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/gnome/config_base/packages b/config/desktop/focal/environments/gnome/config_base/packages index 8b33f9c4bb..5827558a3d 100644 --- a/config/desktop/focal/environments/gnome/config_base/packages +++ b/config/desktop/focal/environments/gnome/config_base/packages @@ -53,7 +53,6 @@ gnome-photos gnome-power-manager gnome-screensaver gnome-screenshot -gnome-screenshot gnome-session gnome-session-bin gnome-session-common diff --git a/config/desktop/focal/environments/i3-wm/config_base/packages b/config/desktop/focal/environments/i3-wm/config_base/packages index f2cecaf49b..7a7bbe4d01 100644 --- a/config/desktop/focal/environments/i3-wm/config_base/packages +++ b/config/desktop/focal/environments/i3-wm/config_base/packages @@ -82,7 +82,6 @@ libgsettings-qt1 libjson-xs-perl libnotify-bin libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -149,18 +148,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs xorg-docs-core xscreensaver diff --git a/config/desktop/focal/environments/kde-plasma/config_base/packages b/config/desktop/focal/environments/kde-plasma/config_base/packages index 494f8bab7b..5343044440 100644 --- a/config/desktop/focal/environments/kde-plasma/config_base/packages +++ b/config/desktop/focal/environments/kde-plasma/config_base/packages @@ -81,7 +81,6 @@ libgsettings-qt1 libgtk2.0-bin libnotify-bin libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -100,7 +99,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -149,18 +147,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/mate/config_base/packages b/config/desktop/focal/environments/mate/config_base/packages index 9e7ed278e9..986564bfdc 100644 --- a/config/desktop/focal/environments/mate/config_base/packages +++ b/config/desktop/focal/environments/mate/config_base/packages @@ -80,7 +80,6 @@ libgsettings-qt1 libgtk2.0-bin libnotify-bin libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -160,7 +159,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -206,18 +204,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/xfce/config_base/packages b/config/desktop/focal/environments/xfce/config_base/packages index 2c8c6ced81..5f121693c7 100644 --- a/config/desktop/focal/environments/xfce/config_base/packages +++ b/config/desktop/focal/environments/xfce/config_base/packages @@ -81,7 +81,6 @@ libgtk2.0-bin libnotify-bin libpam-gnome-keyring libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -101,7 +100,6 @@ network-manager-ssh network-manager-vpnc numix-blue-gtk-theme numix-gtk-theme -numix-gtk-theme numix-icon-theme numix-icon-theme-circle openprinting-ppds @@ -117,7 +115,6 @@ policykit-1 policykit-desktop-privileges printer-driver-all profile-sync-daemon -profile-sync-daemon pulseaudio-module-bluetooth redshift scrcpy @@ -152,7 +149,6 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfce4 @@ -162,12 +158,10 @@ xfce4-terminal xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xorg-docs-core xscreensaver xserver-xorg diff --git a/config/desktop/focal/environments/xmonad/config_base/packages b/config/desktop/focal/environments/xmonad/config_base/packages index 37a890aed1..f1ca914f03 100644 --- a/config/desktop/focal/environments/xmonad/config_base/packages +++ b/config/desktop/focal/environments/xmonad/config_base/packages @@ -74,7 +74,6 @@ libgnome-bluetooth13 libgsettings-qt1 libnotify-bin libproxy1-plugin-gsettings -libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk @@ -90,7 +89,6 @@ network-manager-openvpn-gnome network-manager-pptp network-manager-vpnc nitrogen -nitrogen numix-gtk-theme openprinting-ppds orca @@ -117,7 +115,6 @@ system-config-printer-common system-config-printer-gnome terminator thunar -thunar tracker tracker-extract tracker-miner-fs @@ -133,18 +130,15 @@ x11-apps x11-xserver-utils xbacklight xcursor-themes -xcursor-themes xdg-user-dirs xdg-user-dirs-gtk xfonts-100dpi xfonts-75dpi xfonts-base -xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xinit -xinit xmobar xmonad xscreensaver diff --git a/config/desktop/sid/environments/lxde/config_base/packages b/config/desktop/sid/environments/lxde/config_base/packages index 1f524a17d9..9f96f25fd1 100644 --- a/config/desktop/sid/environments/lxde/config_base/packages +++ b/config/desktop/sid/environments/lxde/config_base/packages @@ -115,7 +115,6 @@ xfonts-75dpi xfonts-base xfonts-scalable xinit -xinit xorg-docs xorg-docs-core xscreensaver diff --git a/config/desktop/sid/environments/mate/config_base/packages b/config/desktop/sid/environments/mate/config_base/packages index ea016a7aae..5eeaf0c83f 100644 --- a/config/desktop/sid/environments/mate/config_base/packages +++ b/config/desktop/sid/environments/mate/config_base/packages @@ -88,7 +88,6 @@ mate-window-menu-applet mate-window-title-applet network-manager-gnome numix-gtk-theme -numix-gtk-theme p11-kit pasystray pavucontrol @@ -96,7 +95,6 @@ pavumeter policykit-1 printer-driver-all profile-sync-daemon -profile-sync-daemon pulseaudio pulseaudio-module-bluetooth smbclient diff --git a/config/desktop/sid/environments/xfce/config_base/packages b/config/desktop/sid/environments/xfce/config_base/packages index 8d104d5bd6..8069803da9 100644 --- a/config/desktop/sid/environments/xfce/config_base/packages +++ b/config/desktop/sid/environments/xfce/config_base/packages @@ -25,16 +25,13 @@ lightdm-gtk-greeter-settings lxtask network-manager-gnome numix-gtk-theme -numix-gtk-theme p11-kit pasystray pavucontrol pavumeter policykit-1 -policykit-1 printer-driver-all profile-sync-daemon -profile-sync-daemon pulseaudio pulseaudio-module-bluetooth samba diff --git a/lib/configuration.sh b/lib/configuration.sh index bf42bb885d..0f1001a930 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -28,7 +28,7 @@ HOSTRELEASE=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2) [[ -z $EXIT_PATCHING_ERROR ]] && EXIT_PATCHING_ERROR="" # exit patching if failed [[ -z $HOST ]] && HOST="$BOARD" # set hostname to the board cd "${SRC}" || exit -ROOTFSCACHE_VERSION=6 +ROOTFSCACHE_VERSION=7 CHROOT_CACHE_VERSION=7 BUILD_REPOSITORY_URL=$(improved_git remote get-url $(improved_git remote 2>/dev/null | grep origin) 2>/dev/null) BUILD_REPOSITORY_COMMIT=$(improved_git describe --match=d_e_a_d_b_e_e_f --always --dirty 2>/dev/null)