From 09e16e65750d457e9b3da5347dff789a9bf0864e Mon Sep 17 00:00:00 2001 From: orangepi-xunlong <258384131@qq.com> Date: Wed, 23 Mar 2022 11:58:59 +0800 Subject: [PATCH] Update some packages --- .../main/config_cli_standard/packages | 2 + .../buster/main/config_cli_standard/packages | 2 + .../focal/main/config_cli_standard/packages | 2 + .../jammy/main/config_cli_standard/packages | 2 + .../bionic/appgroups/desktop_tools/packages | 2 +- .../environments/xfce/config_base/packages | 1 - .../bionic/environments/xfce/debian/postinst | 10 +- .../bookworm/appgroups/3dsupport/packages | 4 + .../bullseye/appgroups/3dsupport/packages | 4 + .../desktop/buster/appgroups/chat/packages | 1 + .../focal/appgroups/desktop_tools/packages | 2 +- .../focal/environments/gnome/debian/postinst | 6 +- .../gnome/orangepi/create_desktop_package.sh | 42 ++-- .../desktop/focal/environments/gnome/support | 2 +- .../desktop/jammy/appgroups/browsers/packages | 1 + .../jammy/appgroups/desktop_tools/packages | 2 +- .../environments/gnome/config_base/packages | 213 ++++++++++++++++++ .../gnome/config_base/packages.uninstall | 1 + .../jammy/environments/gnome/debian/postinst | 37 +++ .../desktop/jammy/environments/gnome/only_for | 1 + .../gnome/orangepi/create_desktop_package.sh | 164 ++++++++++++++ .../desktop/jammy/environments/gnome/support | 1 + .../environments/xfce/config_base/packages | 4 +- .../jammy/environments/xfce/debian/postinst | 10 +- .../xfce/orangepi/create_desktop_package.sh | 4 +- .../desktop/sid/appgroups/3dsupport/packages | 4 + external/config/templates/Dockerfile | 19 +- scripts/configuration.sh | 15 +- scripts/distributions.sh | 3 +- scripts/general.sh | 7 +- 30 files changed, 502 insertions(+), 66 deletions(-) create mode 100755 external/config/desktop/bookworm/appgroups/3dsupport/packages create mode 100755 external/config/desktop/bullseye/appgroups/3dsupport/packages create mode 100755 external/config/desktop/jammy/environments/gnome/config_base/packages create mode 100755 external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall create mode 100755 external/config/desktop/jammy/environments/gnome/debian/postinst create mode 100755 external/config/desktop/jammy/environments/gnome/only_for create mode 100755 external/config/desktop/jammy/environments/gnome/orangepi/create_desktop_package.sh create mode 100755 external/config/desktop/jammy/environments/gnome/support create mode 100755 external/config/desktop/sid/appgroups/3dsupport/packages diff --git a/external/config/cli/bullseye/main/config_cli_standard/packages b/external/config/cli/bullseye/main/config_cli_standard/packages index 3eb4d62ba27e..29cdfb1e2567 100644 --- a/external/config/cli/bullseye/main/config_cli_standard/packages +++ b/external/config/cli/bullseye/main/config_cli_standard/packages @@ -25,6 +25,8 @@ libwrap0-dev linux-base man-db networkd-dispatcher +nfs-common +nfs-kernel-server python3-distutils python3-lib2to3 sudo diff --git a/external/config/cli/buster/main/config_cli_standard/packages b/external/config/cli/buster/main/config_cli_standard/packages index 4600b6e83ce1..70c48ef5e769 100644 --- a/external/config/cli/buster/main/config_cli_standard/packages +++ b/external/config/cli/buster/main/config_cli_standard/packages @@ -24,6 +24,8 @@ libwrap0-dev linux-base man-db networkd-dispatcher +nfs-kernel-server +nfs-common python3-distutils python3-lib2to3 rng-tools diff --git a/external/config/cli/focal/main/config_cli_standard/packages b/external/config/cli/focal/main/config_cli_standard/packages index ea9bb3da5b20..625140901ecc 100644 --- a/external/config/cli/focal/main/config_cli_standard/packages +++ b/external/config/cli/focal/main/config_cli_standard/packages @@ -23,6 +23,8 @@ libwrap0-dev linux-base man-db networkd-dispatcher +nfs-common +nfs-kernel-server python3-distutils python3-lib2to3 selinux-policy-default diff --git a/external/config/cli/jammy/main/config_cli_standard/packages b/external/config/cli/jammy/main/config_cli_standard/packages index ea9bb3da5b20..625140901ecc 100755 --- a/external/config/cli/jammy/main/config_cli_standard/packages +++ b/external/config/cli/jammy/main/config_cli_standard/packages @@ -23,6 +23,8 @@ libwrap0-dev linux-base man-db networkd-dispatcher +nfs-common +nfs-kernel-server python3-distutils python3-lib2to3 selinux-policy-default diff --git a/external/config/desktop/bionic/appgroups/desktop_tools/packages b/external/config/desktop/bionic/appgroups/desktop_tools/packages index 23f24bfd4109..3a5c657bd182 100644 --- a/external/config/desktop/bionic/appgroups/desktop_tools/packages +++ b/external/config/desktop/bionic/appgroups/desktop_tools/packages @@ -1,4 +1,4 @@ bleachbit fbi gparted -kazam +system-monitoring-center diff --git a/external/config/desktop/bionic/environments/xfce/config_base/packages b/external/config/desktop/bionic/environments/xfce/config_base/packages index fb356582a2fd..176b5a3e05f0 100644 --- a/external/config/desktop/bionic/environments/xfce/config_base/packages +++ b/external/config/desktop/bionic/environments/xfce/config_base/packages @@ -99,7 +99,6 @@ network-manager-openvpn network-manager-pptp network-manager-ssh network-manager-vpnc -numix-blue-gtk-theme numix-gtk-theme numix-icon-theme openprinting-ppds diff --git a/external/config/desktop/bionic/environments/xfce/debian/postinst b/external/config/desktop/bionic/environments/xfce/debian/postinst index f2d3e994a94a..6269956e8a9f 100644 --- a/external/config/desktop/bionic/environments/xfce/debian/postinst +++ b/external/config/desktop/bionic/environments/xfce/debian/postinst @@ -6,11 +6,11 @@ if [ -d /etc/orangepi/lightdm ]; then cp -R /etc/orangepi/lightdm /etc/; fi if [ -f /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ]; then sed -i 's/Xfce-dusk/NumixBlue/g' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml; fi # Adjust menu -if [ -f /etc/xdg/menus/xfce-applications.menu ]; then -sed -i -n '/Settings<\/Menuname>/{p;:a;N;/xfce4-session-logout.desktop<\/Filename>/!ba;s/.*\n/\ -\t\n\t\n \n orangepi-donate.desktop<\/Filename>\ -\n orangepi-support.desktop<\/Filename>\n/};p' /etc/xdg/menus/xfce-applications.menu -fi +#if [ -f /etc/xdg/menus/xfce-applications.menu ]; then +#sed -i -n '/Settings<\/Menuname>/{p;:a;N;/xfce4-session-logout.desktop<\/Filename>/!ba;s/.*\n/\ +#\t\n\t\n \n orangepi-donate.desktop<\/Filename>\ +#\n orangepi-support.desktop<\/Filename>\n/};p' /etc/xdg/menus/xfce-applications.menu +#fi # Hide few items if [ -f /usr/share/applications/display-im6.q16.desktop ]; then mv /usr/share/applications/display-im6.q16.desktop /usr/share/applications/display-im6.q16.desktop.hidden; fi diff --git a/external/config/desktop/bookworm/appgroups/3dsupport/packages b/external/config/desktop/bookworm/appgroups/3dsupport/packages new file mode 100755 index 000000000000..c467dab2a35f --- /dev/null +++ b/external/config/desktop/bookworm/appgroups/3dsupport/packages @@ -0,0 +1,4 @@ +libglx-mesa0 +libgl1-mesa-dri +mesa-utils +mesa-utils-extra diff --git a/external/config/desktop/bullseye/appgroups/3dsupport/packages b/external/config/desktop/bullseye/appgroups/3dsupport/packages new file mode 100755 index 000000000000..c467dab2a35f --- /dev/null +++ b/external/config/desktop/bullseye/appgroups/3dsupport/packages @@ -0,0 +1,4 @@ +libglx-mesa0 +libgl1-mesa-dri +mesa-utils +mesa-utils-extra diff --git a/external/config/desktop/buster/appgroups/chat/packages b/external/config/desktop/buster/appgroups/chat/packages index 750362098e45..2f983f15582e 100644 --- a/external/config/desktop/buster/appgroups/chat/packages +++ b/external/config/desktop/buster/appgroups/chat/packages @@ -1 +1,2 @@ hexchat +telegram-desktop diff --git a/external/config/desktop/focal/appgroups/desktop_tools/packages b/external/config/desktop/focal/appgroups/desktop_tools/packages index 23f24bfd4109..3a5c657bd182 100644 --- a/external/config/desktop/focal/appgroups/desktop_tools/packages +++ b/external/config/desktop/focal/appgroups/desktop_tools/packages @@ -1,4 +1,4 @@ bleachbit fbi gparted -kazam +system-monitoring-center diff --git a/external/config/desktop/focal/environments/gnome/debian/postinst b/external/config/desktop/focal/environments/gnome/debian/postinst index 1ee5cbf2962d..ff3be438448e 100644 --- a/external/config/desktop/focal/environments/gnome/debian/postinst +++ b/external/config/desktop/focal/environments/gnome/debian/postinst @@ -1,6 +1,6 @@ # overwrite stock lightdm greeter configuration if [ -d /etc/orangepi/lightdm ]; then cp -R /etc/orangepi/lightdm /etc/; fi -if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/orangepi03-Dre0x-Minum-dark-blurred-3840x2160.jpg/orangepi-4k-black-psycho-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi +#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/orangepi03-Dre0x-Minum-dark-blurred-3840x2160.jpg/orangepi-4k-black-psycho-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi # Disable Pulseaudio timer scheduling which does not work with sndhdmi driver if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi @@ -13,13 +13,13 @@ install -Dv /dev/null $keys install -Dv /dev/null $profile echo "[org/gnome/desktop/background] -picture-uri='file:///usr/share/backgrounds/orangepi/aorangepi-4k-black-psycho.jpg' +picture-uri='file:///usr/share/backgrounds/orangepi/orangepi-default.png' picture-options='zoom' primary-color='#456789' secondary-color='#FFFFFF' [org/gnome/desktop/screensaver] -picture-uri='file:///usr/share/backgrounds/orangepi/orangepi-4k-black-psycho-gauss.jpg' +picture-uri='file:///usr/share/backgrounds/orangepi/orangepi-default.png' picture-options='zoom' primary-color='#456789' secondary-color='#FFFFFF'" >> $keys diff --git a/external/config/desktop/focal/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/focal/environments/gnome/orangepi/create_desktop_package.sh index b3c7efb0ea4a..65267a1d277f 100755 --- a/external/config/desktop/focal/environments/gnome/orangepi/create_desktop_package.sh +++ b/external/config/desktop/focal/environments/gnome/orangepi/create_desktop_package.sh @@ -11,11 +11,11 @@ cp "${EXTER}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/sh # install wallpapers mkdir -p "${destination}"/usr/share/backgrounds/orangepi/ -cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/orangepi +cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi # install wallpapers mkdir -p "${destination}"/usr/share/backgrounds/orangepi-lightdm/ -cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/orangepi-lightdm +cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi-lightdm # install logo for login screen mkdir -p "${destination}"/usr/share/pixmaps/orangepi @@ -29,133 +29,133 @@ cat < "${destination}"/usr/share/gnome-background-properties/orangepi.xml OrangePi black-pyscho - /usr/share/backgrounds/orangepi/orangepi-4k-black-psycho.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi bluie-circle - /usr/share/backgrounds/orangepi/orangepi-4k-blue-circle.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi blue-monday - /usr/share/backgrounds/orangepi/orangepi-4k-blue-monday.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi blue-penguin - /usr/share/backgrounds/orangepi/orangepi-4k-blue-penguin.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi gray-resultado - /usr/share/backgrounds/orangepi/orangepi-4k-gray.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi green-penguin - /usr/share/backgrounds/orangepi/orangepi-4k-green-penguin.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi green-retro - /usr/share/backgrounds/orangepi/orangepi-4k-green-retro.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi green-wall-penguin - /usr/share/backgrounds/orangepi/orangepi-4k-green-wall-penguin.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi 4k-neglated - /usr/share/backgrounds/orangepi/orangepi-4k-neglated.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi neon-gray-penguin - /usr/share/backgrounds/orangepi/orangepi-4k-neon-gray-penguin.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi plastic-love - /usr/share/backgrounds/orangepi/orangepi-4k-plastic-love.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi purple-penguine - /usr/share/backgrounds/orangepi/orangepi-4k-purple-penguine.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi purplepunk-resultado - /usr/share/backgrounds/orangepi/orangepi-4k-purplepunk.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi red-penguin-dark - /usr/share/backgrounds/orangepi/orangepi-4k-red-penguin-dark.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi red-penguin - /usr/share/backgrounds/orangepi/orangepi-4k-red-penguin.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi light - /usr/share/backgrounds/orangepi/orangepi18-Dre0x-Minum-light-3840x2160.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi dark - /usr/share/backgrounds/orangepi/orangepi03-Dre0x-Minum-dark-3840x2160.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi uc - /usr/share/backgrounds/orangepi/orangepi-full-under-construction-3840-2160.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 OrangePi clear - /usr/share/backgrounds/orangepi/OrangePi-clear-rounded-bakcground-3840-2160.jpg + /usr/share/backgrounds/orangepi/orangepi-default.png zoom #ffffff #000000 diff --git a/external/config/desktop/focal/environments/gnome/support b/external/config/desktop/focal/environments/gnome/support index 03cd47015043..0b0206d21c91 100644 --- a/external/config/desktop/focal/environments/gnome/support +++ b/external/config/desktop/focal/environments/gnome/support @@ -1 +1 @@ -csc +supported \ No newline at end of file diff --git a/external/config/desktop/jammy/appgroups/browsers/packages b/external/config/desktop/jammy/appgroups/browsers/packages index dbfb8f931b33..6821f1236d30 100755 --- a/external/config/desktop/jammy/appgroups/browsers/packages +++ b/external/config/desktop/jammy/appgroups/browsers/packages @@ -1 +1,2 @@ +chromium-browser firefox diff --git a/external/config/desktop/jammy/appgroups/desktop_tools/packages b/external/config/desktop/jammy/appgroups/desktop_tools/packages index 23f24bfd4109..3a5c657bd182 100755 --- a/external/config/desktop/jammy/appgroups/desktop_tools/packages +++ b/external/config/desktop/jammy/appgroups/desktop_tools/packages @@ -1,4 +1,4 @@ bleachbit fbi gparted -kazam +system-monitoring-center diff --git a/external/config/desktop/jammy/environments/gnome/config_base/packages b/external/config/desktop/jammy/environments/gnome/config_base/packages new file mode 100755 index 000000000000..f83331dd2ad6 --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/config_base/packages @@ -0,0 +1,213 @@ +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-8 +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-trash +gnome-system-monitor +gvfs-backends +hunspell-en-us +inputattach +libaccountsservice0 +libasound2-plugins +libaspell15 +libatk-adaptor +libcairo-gobject-perl +libcairo-perl +libcamel-1.2-63 +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-8-0 +libnautilus-extension1a +libnma0 +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 +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 +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/external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall b/external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall new file mode 100755 index 000000000000..ec0762d75173 --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall @@ -0,0 +1 @@ +gdm3 \ No newline at end of file diff --git a/external/config/desktop/jammy/environments/gnome/debian/postinst b/external/config/desktop/jammy/environments/gnome/debian/postinst new file mode 100755 index 000000000000..22b150e1e296 --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/debian/postinst @@ -0,0 +1,37 @@ +# overwrite stock lightdm greeter configuration +if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi +#if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-black-psycho-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi + +# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver +if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi + +# set wallpapper to armbian +keys=/etc/dconf/db/local.d/00-bg +profile=/etc/dconf/profile/user + +install -Dv /dev/null $keys +install -Dv /dev/null $profile + +echo "[org/gnome/desktop/background] +picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg' +picture-options='zoom' +primary-color='#456789' +secondary-color='#FFFFFF' + +[org/gnome/desktop/screensaver] +picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg' +picture-options='zoom' +primary-color='#456789' +secondary-color='#FFFFFF'" >> $keys + +echo "user-db:user +system-db:local" >> $profile + +dconf update + +#sudo apt-get -y remove gnome-shell-extension-desktop-icons + +#compile schemas +if [ -d /usr/share/glib-2.0/schemas ]; then + glib-compile-schemas /usr/share/glib-2.0/schemas +fi diff --git a/external/config/desktop/jammy/environments/gnome/only_for b/external/config/desktop/jammy/environments/gnome/only_for new file mode 100755 index 000000000000..54b43c7a58e9 --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/only_for @@ -0,0 +1 @@ +arm64, amd64 diff --git a/external/config/desktop/jammy/environments/gnome/orangepi/create_desktop_package.sh b/external/config/desktop/jammy/environments/gnome/orangepi/create_desktop_package.sh new file mode 100755 index 000000000000..65267a1d277f --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/orangepi/create_desktop_package.sh @@ -0,0 +1,164 @@ +# install lightdm greeter +cp -R "${EXTER}"/packages/blobs/desktop/lightdm "${destination}"/etc/orangepi + +# install default desktop settings +mkdir -p "${destination}"/etc/skel +cp -R "${EXTER}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel + +#install cinnamon desktop bar icons +mkdir -p "${destination}"/usr/share/icons/orangepi +cp "${EXTER}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/orangepi + +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/orangepi/ +cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi + +# install wallpapers +mkdir -p "${destination}"/usr/share/backgrounds/orangepi-lightdm/ +cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi-lightdm + +# install logo for login screen +mkdir -p "${destination}"/usr/share/pixmaps/orangepi +cp "${EXTER}"/packages/blobs/desktop/icons/orangepi.png "${destination}"/usr/share/pixmaps/orangepi + +#generate wallpaper list for background changer +mkdir -p "${destination}"/usr/share/gnome-background-properties +cat < "${destination}"/usr/share/gnome-background-properties/orangepi.xml + + + + + OrangePi black-pyscho + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi bluie-circle + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi blue-monday + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi blue-penguin + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi gray-resultado + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi green-penguin + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi green-retro + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi green-wall-penguin + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi 4k-neglated + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi neon-gray-penguin + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi plastic-love + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi purple-penguine + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi purplepunk-resultado + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi red-penguin-dark + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi red-penguin + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi light + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi dark + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi uc + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + + OrangePi clear + /usr/share/backgrounds/orangepi/orangepi-default.png + zoom + #ffffff + #000000 + + +EOF diff --git a/external/config/desktop/jammy/environments/gnome/support b/external/config/desktop/jammy/environments/gnome/support new file mode 100755 index 000000000000..03cd47015043 --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/support @@ -0,0 +1 @@ +csc diff --git a/external/config/desktop/jammy/environments/xfce/config_base/packages b/external/config/desktop/jammy/environments/xfce/config_base/packages index bc6d47fd65f0..b5bc22c6569d 100755 --- a/external/config/desktop/jammy/environments/xfce/config_base/packages +++ b/external/config/desktop/jammy/environments/xfce/config_base/packages @@ -34,10 +34,10 @@ fonts-nanum fonts-opensymbol fonts-stix fonts-symbola +fonts-ubuntu-console foomatic-db-compressed-ppds gdebi ghostscript-x -gir1.2-appindicator3-0.1 gnome-font-viewer gnome-screenshot gnome-user-docs-de @@ -69,7 +69,6 @@ language-pack-gnome-pt language-pack-gnome-ru language-pack-gnome-sl laptop-detect -libappindicator3-1 libatk-adaptor libfont-afm-perl libfontconfig1 @@ -125,7 +124,6 @@ system-config-printer system-config-printer-common terminator thunar-volman -ttf-ubuntu-font-family ubuntu-drivers-common update-inetd update-manager diff --git a/external/config/desktop/jammy/environments/xfce/debian/postinst b/external/config/desktop/jammy/environments/xfce/debian/postinst index f2d3e994a94a..6269956e8a9f 100755 --- a/external/config/desktop/jammy/environments/xfce/debian/postinst +++ b/external/config/desktop/jammy/environments/xfce/debian/postinst @@ -6,11 +6,11 @@ if [ -d /etc/orangepi/lightdm ]; then cp -R /etc/orangepi/lightdm /etc/; fi if [ -f /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ]; then sed -i 's/Xfce-dusk/NumixBlue/g' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml; fi # Adjust menu -if [ -f /etc/xdg/menus/xfce-applications.menu ]; then -sed -i -n '/Settings<\/Menuname>/{p;:a;N;/xfce4-session-logout.desktop<\/Filename>/!ba;s/.*\n/\ -\t\n\t\n \n orangepi-donate.desktop<\/Filename>\ -\n orangepi-support.desktop<\/Filename>\n/};p' /etc/xdg/menus/xfce-applications.menu -fi +#if [ -f /etc/xdg/menus/xfce-applications.menu ]; then +#sed -i -n '/Settings<\/Menuname>/{p;:a;N;/xfce4-session-logout.desktop<\/Filename>/!ba;s/.*\n/\ +#\t\n\t\n \n orangepi-donate.desktop<\/Filename>\ +#\n orangepi-support.desktop<\/Filename>\n/};p' /etc/xdg/menus/xfce-applications.menu +#fi # Hide few items if [ -f /usr/share/applications/display-im6.q16.desktop ]; then mv /usr/share/applications/display-im6.q16.desktop /usr/share/applications/display-im6.q16.desktop.hidden; fi diff --git a/external/config/desktop/jammy/environments/xfce/orangepi/create_desktop_package.sh b/external/config/desktop/jammy/environments/xfce/orangepi/create_desktop_package.sh index bbc20d2938e4..dda722527ae5 100755 --- a/external/config/desktop/jammy/environments/xfce/orangepi/create_desktop_package.sh +++ b/external/config/desktop/jammy/environments/xfce/orangepi/create_desktop_package.sh @@ -11,11 +11,11 @@ cp "${EXTER}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/sh # install wallpapers mkdir -p "${destination}"/usr/share/backgrounds/orangepi/ -cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/orangepi +cp "${EXTER}"/packages/blobs/desktop/desktop-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi # install wallpapers mkdir -p "${destination}"/usr/share/backgrounds/orangepi-lightdm/ -cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/orangepi-lightdm +cp "${EXTER}"/packages/blobs/desktop/lightdm-wallpapers/*.png "${destination}"/usr/share/backgrounds/orangepi-lightdm # install logo for login screen mkdir -p "${destination}"/usr/share/pixmaps/orangepi diff --git a/external/config/desktop/sid/appgroups/3dsupport/packages b/external/config/desktop/sid/appgroups/3dsupport/packages new file mode 100755 index 000000000000..c467dab2a35f --- /dev/null +++ b/external/config/desktop/sid/appgroups/3dsupport/packages @@ -0,0 +1,4 @@ +libglx-mesa0 +libgl1-mesa-dri +mesa-utils +mesa-utils-extra diff --git a/external/config/templates/Dockerfile b/external/config/templates/Dockerfile index daaff53a6890..0b57085d046e 100644 --- a/external/config/templates/Dockerfile +++ b/external/config/templates/Dockerfile @@ -10,20 +10,12 @@ RUN apt-get update && apt-get -y install \ && rm -rf /var/lib/apt/lists/* RUN sh -c " \ if [ $(dpkg --print-architecture) = amd64 ]; then \ - if [ x'' != x$http_proxy ]; then \ - curl -fsSL -x $http_proxy https://www.aptly.info/pubkey.txt | apt-key add - >/dev/null 2>&1; \ - else \ - curl -fsSL https://www.aptly.info/pubkey.txt | apt-key add - >/dev/null 2>&1; \ - fi; \ - echo \"deb http://repo.aptly.info/ nightly main\" > /etc/apt/sources.list.d/aptly.list; \ - dpkg --add-architecture i386 \ - && apt-get update \ + apt-get update \ && apt-get install -y --no-install-recommends \ lib32ncurses6 \ lib32stdc++6 \ lib32tinfo6 \ - libc6-i386 \ - zlib1g:i386; \ + libc6-i386; \ fi" RUN apt-get update \ && apt-get -y upgrade \ @@ -66,7 +58,8 @@ RUN apt-get update \ libbison-dev \ libc6-amd64-cross \ libc6-dev-armhf-cross \ - libfdt-dev libelf-dev \ + libfdt-dev \ + libelf-dev \ libfile-fcntllock-perl \ libfl-dev \ liblz4-tool \ @@ -127,4 +120,8 @@ RUN sed -i 's/\(^STATDOPTS=\).*/\1"--port 32765 --outgoing-port 32766"/' /etc/de ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' TERM=screen WORKDIR /root/orangepi +LABEL org.opencontainers.image.source="https://github.com/orangepi-xunlong/orangepi-build/blob/main/external/config/templates/Dockerfile" \ + + org.opencontainers.image.authors="Igor Pecovnik" \ + org.opencontainers.image.licenses="GPL-2.0" ENTRYPOINT [ "/bin/bash", "/root/orangepi/build.sh" ] diff --git a/scripts/configuration.sh b/scripts/configuration.sh index 4476a58e82cd..72437b34079e 100755 --- a/scripts/configuration.sh +++ b/scripts/configuration.sh @@ -61,7 +61,7 @@ case $REGIONAL_MIRROR in china) [[ -z $USE_MAINLINE_GOOGLE_MIRROR ]] && [[ -z $MAINLINE_MIRROR ]] && MAINLINE_MIRROR=tuna [[ -z $USE_GITHUB_UBOOT_MIRROR ]] && [[ -z $UBOOT_MIRROR ]] && UBOOT_MIRROR=gitee - [[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=fastgit + [[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=gitclone [[ -z $DOWNLOAD_MIRROR ]] && DOWNLOAD_MIRROR=china ;; *) @@ -110,16 +110,13 @@ MAINLINE_UBOOT_DIR="$SRC/u-boot" case $GITHUB_MIRROR in fastgit) - GITHUB_SOURCE='https://hub.fastgit.org/' + GITHUB_SOURCE='https://hub.fastgit.xyz' ;; gitclone) - GITHUB_SOURCE='https://gitclone.com/github.com/' - ;; - cnpmjs) - GITHUB_SOURCE='https://github.com.cnpmjs.org/' + GITHUB_SOURCE='https://gitclone.com/github.com' ;; *) - GITHUB_SOURCE='https://github.com/' + GITHUB_SOURCE='https://github.com' ;; esac @@ -601,6 +598,10 @@ fi if [[ "${ARCH}" == "amd64" ]]; then UBUNTU_MIRROR='archive.ubuntu.com/ubuntu' # ports are only for non-amd64, of course. + + if [[ -n ${CUSTOM_UBUNTU_MIRROR} ]]; then # ubuntu redirector doesn't work well on amd64 + UBUNTU_MIRROR="${CUSTOM_UBUNTU_MIRROR}" + fi fi # don't use mirrors that throws garbage on 404 diff --git a/scripts/distributions.sh b/scripts/distributions.sh index 09f956e0af56..ab777d5dcab8 100755 --- a/scripts/distributions.sh +++ b/scripts/distributions.sh @@ -137,7 +137,7 @@ install_common() #[Service] #ExecStartPre=/bin/sh -c 'exec /bin/sleep 10' #ExecStart= - #ExecStart=-/sbin/agetty --noissue --autologin root %I $TERM + #ExecStart=-/sbin/agetty --noissue --autologin root %I \$TERM #Type=idle #EOF #cp "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf "${SDCARD}"/etc/systemd/system/getty@.service.d/override.conf @@ -695,6 +695,7 @@ install_distribution_specific() sed '/security/ d' -i "${SDCARD}"/etc/apt/sources.list ;; + bionic|focal|hirsute|impish|jammy) # by using default lz4 initrd compression leads to corruption, go back to proven method diff --git a/scripts/general.sh b/scripts/general.sh index da25f891bdba..c50a7099c9f3 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -95,7 +95,7 @@ cleaning() ;; oldcache) # remove old `cache/rootfs` except for the newest 8 files - if [[ -d $EXTER/cache/rootfs && $(ls -1 $EXTER/cache/rootfs/*.lz4 2> /dev/null | wc -l) -gt ${ROOTFS_CACHE_MAX} ]]; then + if [[ -d $EXTER/cache/rootfs && $(ls -1 $EXTER/cache/rootfs/*.lz4 2> /dev/null | wc -l) -gt "${ROOTFS_CACHE_MAX}" ]]; then display_alert "Cleaning" "rootfs cache (old)" "info" (cd $EXTER/cache/rootfs; ls -t *.lz4 | sed -e "1,${ROOTFS_CACHE_MAX}d" | xargs -d '\n' rm -f) # Remove signatures if they are present. We use them for internal purpose @@ -435,7 +435,8 @@ fetch_from_repo() local ref_subdir=$4 # Set GitHub mirror before anything else touches $url - url=${url//'https://github.com/'/$GITHUB_SOURCE} + url=${url//'https://github.com/'/$GITHUB_SOURCE'/'} + # The 'offline' variable must always be set to 'true' or 'false' if [ "$OFFLINE_WORK" == "yes" ]; then local offline=true @@ -1367,7 +1368,7 @@ prepare_host() if [[ $(dpkg --print-architecture) == amd64 ]]; then - hostdeps+=" distcc lib32ncurses-dev lib32stdc++6 libc6-i386 zlib1g:i386" + hostdeps+=" distcc lib32ncurses-dev lib32stdc++6 libc6-i386" grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386 elif [[ $(dpkg --print-architecture) == arm64 ]]; then