Update for jammy and focal

2026-10-07 19:06:38 +07:00 · 2022-05-20 14:52:43 +08:00
parent 8a7661b3af
commit 9ac00a9ca6
17 changed files with 73 additions and 67 deletions
--- a/external/cache/debs/arm64/.gitignore
+++ b/external/cache/debs/arm64/.gitignore
@@ -0,0 +1,2 @@
+chromium-browser_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb
+chromium-codecs-ffmpeg-extra_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb
--- a/external/config/desktop/focal/appgroups/3dsupport/packages
+++ b/external/config/desktop/focal/appgroups/3dsupport/packages
@@ -1,3 +1,3 @@
-glmark2
+glmark2-es2
 mesa-utils
 mesa-utils-extra
--- a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg
+++ b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg
--- a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
+++ b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main
--- a/external/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source
+++ b/external/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source
@@ -1 +0,0 @@
-ppa:saiarcot895/chromium-dev
--- a/external/config/desktop/focal/environments/xfce/config_base/packages
+++ b/external/config/desktop/focal/environments/xfce/config_base/packages
@@ -41,13 +41,7 @@ ghostscript-x
 gir1.2-appindicator3-0.1
 gnome-font-viewer
 gnome-screenshot
-gnome-user-docs-de
-gnome-user-docs-es
-gnome-user-docs-fr
-gnome-user-docs-it
-gnome-user-docs-pt
-gnome-user-docs-ru
-gnome-user-docs-sl
+gnome-user-docs-zh-hans
 gnome-system-monitor
 gstreamer1.0-packagekit
 gstreamer1.0-plugins-base-apps
@@ -62,14 +56,9 @@ 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
+language-pack-gnome-zh-hans
+language-pack-gnome-zh-hant
 language-selector-gnome
 laptop-detect
 libappindicator3-1
@@ -171,6 +160,4 @@ xterm
 xtermcontrol
 xtermset
 xwallpaper
-wngerman
-wogerman
 zip
--- a/external/config/desktop/jammy/appgroups/3dsupport/packages
+++ b/external/config/desktop/jammy/appgroups/3dsupport/packages
@@ -1,3 +1,2 @@
-glmark2
+glmark2-es2
 mesa-utils
-mesa-utils-extra
--- a/external/config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source
+++ b/external/config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source
@@ -1 +0,0 @@
-ppa:oibaf/graphics-drivers
--- a/external/config/desktop/jammy/appgroups/browsers/packages
+++ b/external/config/desktop/jammy/appgroups/browsers/packages
@@ -1,2 +1 @@
 chromium-browser
-firefox
--- a/external/config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source
+++ b/external/config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source
@@ -1 +0,0 @@
-ppa:saiarcot895/chromium-dev
--- a/external/config/desktop/jammy/environments/xfce/config_base/packages
+++ b/external/config/desktop/jammy/environments/xfce/config_base/packages
@@ -41,12 +41,7 @@ ghostscript-x
 gist
 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
+gnome-user-docs-zh-hans
 gnome-system-monitor
 gstreamer1.0-packagekit
 gstreamer1.0-plugins-base-apps
@@ -62,14 +57,10 @@ inputattach
 inxi
 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
+language-pack-gnome-zh-hans
+language-pack-gnome-zh-hant
+language-selector-gnome
 laptop-detect
 libatk-adaptor
 libfont-afm-perl
@@ -114,6 +105,7 @@ pavucontrol-qt
 pavumeter
 pinta
 policykit-1
+policykit-1-gnome
 policykit-desktop-privileges
 printer-driver-all
 profile-sync-daemon
--- a/external/config/sources/families/include/sunxi64_common.inc
+++ b/external/config/sources/families/include/sunxi64_common.inc
@@ -47,6 +47,23 @@ family_tweaks()
 		rm $SDCARD/root/*.deb >/dev/null 2>&1
 	fi

+	if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_chromium == yes ]]; then
+
+		chromium_name="chromium-browser_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb"
+		chromium_extra_name="chromium-codecs-ffmpeg-extra_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb"
+		chromium_url="http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/pool/main/c/chromium-browser"
+		chromium=${EXTER}/cache/debs/arm64/${chromium_name}
+		chromium_extra=${EXTER}/cache/debs/arm64/${chromium_extra_name}
+
+		if [[ ! -f $chromium_extra ]]; then
+			wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_name}
+			wget -P ${EXTER}/cache/debs/arm64 ${chromium_url}/${chromium_extra_name}
+		fi
+
+		dpkg_install_deb_chroot $chromium_extra
+		dpkg_install_deb_chroot $chromium
+
+	fi
 }

 write_uboot_platform()
--- a/external/packages/blobs/audio_wav/mute.wav
+++ b/external/packages/blobs/audio_wav/mute.wav
--- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
+++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
@@ -129,8 +129,9 @@ prepare_board() {
 		orangepizero2|orangepizero2-lts|orangepizero2-b|orangepi400)
 			if [[ $BRANCH == current ]]; then
 				# Initial hdmi audio
-				#aplay /usr/share/sounds/alsa/audio.wav -D hw:0,0 > /dev/null 2>&1
-				aplay /usr/share/sounds/alsa/audio.wav -D hw:1,0 > /dev/null 2>&1
+				aplay /usr/share/sounds/alsa/mute.wav -D hw:0,0 > /dev/null 2>&1
+				aplay /usr/share/sounds/alsa/mute.wav -D hw:1,0 > /dev/null 2>&1
+				aplay /usr/share/sounds/alsa/mute.wav -D hw:0,0 > /dev/null 2>&1
 			fi

 			if [[ $BRANCH == legacy ]]; then
				`@@ -1 +0,0 @@`
				`deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main`