From 9ac00a9ca6e573eec7a1a61f44b84f1efd068996 Mon Sep 17 00:00:00 2001 From: orangepi-xunlong <258384131@qq.com> Date: Fri, 20 May 2022 14:52:43 +0800 Subject: [PATCH] Update for jammy and focal --- external/cache/debs/arm64/.gitignore | 2 + .../focal/appgroups/3dsupport/packages | 2 +- .../appgroups/3dsupport/sources/apt/oibaf.gpg | Bin 5934 -> 0 bytes .../3dsupport/sources/apt/oibaf.source | 1 - .../sources/apt/chromium-browser.source | 1 - .../environments/xfce/config_base/packages | 19 +----- .../jammy/appgroups/3dsupport/packages | 3 +- .../3dsupport/sources/apt/oibaf.source | 1 - .../desktop/jammy/appgroups/browsers/packages | 1 - .../sources/apt/chromium-browser.source | 1 - .../environments/xfce/config_base/packages | 18 ++---- .../families/include/sunxi64_common.inc | 17 +++++ external/packages/blobs/audio_wav/mute.wav | Bin 0 -> 1972332 bytes .../orangepi/orangepi-hardware-optimization | 5 +- scripts/compilation.sh | 7 ++- scripts/desktop.sh | 59 +++++++++++------- scripts/distributions.sh | 3 +- 17 files changed, 73 insertions(+), 67 deletions(-) create mode 100644 external/cache/debs/arm64/.gitignore delete mode 100755 external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg delete mode 100644 external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source delete mode 100644 external/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source delete mode 100755 external/config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source delete mode 100755 external/config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source create mode 100644 external/packages/blobs/audio_wav/mute.wav diff --git a/external/cache/debs/arm64/.gitignore b/external/cache/debs/arm64/.gitignore new file mode 100644 index 0000000..402ec48 --- /dev/null +++ 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 diff --git a/external/config/desktop/focal/appgroups/3dsupport/packages b/external/config/desktop/focal/appgroups/3dsupport/packages index b6400d8..cdc1eea 100644 --- 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 diff --git a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg deleted file mode 100755 index b5a8ebbf68cee1e03552ce2cb35fb2287b68fbe0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5934 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 diff --git a/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source b/external/config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source deleted file mode 100644 index 71c9724..0000000 --- a/external/config/desktop/focal/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/ focal main diff --git a/external/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source b/external/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source deleted file mode 100644 index 428bf80..0000000 --- a/external/config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source +++ /dev/null @@ -1 +0,0 @@ -ppa:saiarcot895/chromium-dev diff --git a/external/config/desktop/focal/environments/xfce/config_base/packages b/external/config/desktop/focal/environments/xfce/config_base/packages index b170697..2582591 100644 --- 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 diff --git a/external/config/desktop/jammy/appgroups/3dsupport/packages b/external/config/desktop/jammy/appgroups/3dsupport/packages index b6400d8..4364640 100755 --- 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 diff --git a/external/config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source b/external/config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source deleted file mode 100755 index 2e6ad7c..0000000 --- a/external/config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source +++ /dev/null @@ -1 +0,0 @@ -ppa:oibaf/graphics-drivers \ 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 6821f12..f99c9a1 100755 --- a/external/config/desktop/jammy/appgroups/browsers/packages +++ b/external/config/desktop/jammy/appgroups/browsers/packages @@ -1,2 +1 @@ chromium-browser -firefox diff --git a/external/config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source b/external/config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source deleted file mode 100755 index 428bf80..0000000 --- a/external/config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source +++ /dev/null @@ -1 +0,0 @@ -ppa:saiarcot895/chromium-dev diff --git a/external/config/desktop/jammy/environments/xfce/config_base/packages b/external/config/desktop/jammy/environments/xfce/config_base/packages index 148b8f7..4b2d39f 100755 --- 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 diff --git a/external/config/sources/families/include/sunxi64_common.inc b/external/config/sources/families/include/sunxi64_common.inc index 284b8e3..c432b37 100644 --- 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() diff --git a/external/packages/blobs/audio_wav/mute.wav b/external/packages/blobs/audio_wav/mute.wav new file mode 100644 index 0000000000000000000000000000000000000000..fcb02805b2fcb35806f83fbbfa1c7d38ef3dc610 GIT binary patch literal 1972332 zcmeIuF$%&^5Cy4zaefB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 n2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+z`q1OO#Kr~ literal 0 HcmV?d00001 diff --git a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization index 4beb7ab..1fe992d 100755 --- 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 diff --git a/scripts/compilation.sh b/scripts/compilation.sh index 463a117..f593545 100755 --- a/scripts/compilation.sh +++ b/scripts/compilation.sh @@ -160,7 +160,7 @@ compile_uboot() # create directory structure for the .deb package uboottempdir=$(mktemp -d) chmod 700 ${uboottempdir} - trap "rm -rf \"${uboottempdir}\" ; exit 0" 0 1 2 3 15 + trap "ret=\$?; rm -rf \"${uboottempdir}\" ; exit \$ret" 0 1 2 3 15 local uboot_name=${CHOSEN_UBOOT}_${REVISION}_${ARCH} rm -rf $uboottempdir/$uboot_name mkdir -p $uboottempdir/$uboot_name/usr/lib/{u-boot,$uboot_name} $uboottempdir/$uboot_name/DEBIAN @@ -325,7 +325,7 @@ create_linux-source_package () ts=$(date +%s) local sources_pkg_dir tmp_src_dir tmp_src_dir=$(mktemp -d) - trap "rm -rf \"${tmp_src_dir}\" ; exit 0" 0 1 2 3 15 + trap "ret=\$?; rm -rf \"${tmp_src_dir}\" ; exit \$ret" 0 1 2 3 15 sources_pkg_dir=${tmp_src_dir}/${CHOSEN_KSRC}_${REVISION}_all mkdir -p "${sources_pkg_dir}"/usr/src/ \ "${sources_pkg_dir}"/usr/share/doc/linux-source-${version}-${LINUXFAMILY} \ @@ -495,6 +495,7 @@ CUSTOM_KERNEL_CONFIG ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} if [[ ${PIPESTATUS[0]} -ne 0 || ! -f arch/$ARCHITECTURE/boot/$KERNEL_IMAGE_TYPE ]]; then + grep -i error $DEST/${LOG_SUBPATH}/compilation.log exit_with_error "Kernel was not built" "@host" fi @@ -580,7 +581,7 @@ compile_firmware() firmwaretempdir=$(mktemp -d) chmod 700 ${firmwaretempdir} - trap "rm -rf \"${firmwaretempdir}\" ; exit 0" 0 1 2 3 15 + trap "ret=\$?; rm -rf \"${firmwaretempdir}\" ; exit \$ret" 0 1 2 3 15 plugin_dir="orangepi-firmware${FULL}" mkdir -p "${firmwaretempdir}/${plugin_dir}/lib/firmware" diff --git a/scripts/desktop.sh b/scripts/desktop.sh index f6c6620..486a77f 100755 --- a/scripts/desktop.sh +++ b/scripts/desktop.sh @@ -199,36 +199,45 @@ add_apt_sources() { get_all_potential_paths "${DESKTOP_ENVIRONMENTS_SEARCH_RELATIVE_DIRS}" "." "sources/apt" get_all_potential_paths "${DESKTOP_APPGROUPS_SEARCH_RELATIVE_DIRS}" "${DESKTOP_APPGROUPS_SELECTED}" "sources/apt" - display_alert "ADDING ADDITIONAL APT SOURCES" + display_alert "Adding additional apt sources" for apt_sources_dirpath in ${potential_paths}; do if [[ -d "${apt_sources_dirpath}" ]]; then for apt_source_filepath in "${apt_sources_dirpath}/"*.source; do - local new_apt_source="$(cat "${apt_source_filepath}")" - display_alert "Adding APT Source ${new_apt_source}" - # -y -> Assumes yes to all queries - # -n -> Do not update package cache after adding - run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\"" - display_alert "Return code : $?" - - # temporally exception for jammy - [[ $RELEASE == "jammy" ]] && find "${SDCARD}/etc/apt/sources.list.d/." -type f \( -name "*.list" ! -name "armbian.list" \) -print0 | xargs -0 sed -i 's/jammy/hirsute/g' - + apt_source_filepath=$(echo $apt_source_filepath | sed -re 's/(^.*[^/])\.[^./]*$/\1/') + local new_apt_source="$(cat "${apt_source_filepath}.source")" local apt_source_gpg_filepath="${apt_source_filepath}.gpg" - # PPA provide GPG keys automatically, it seems. - # But other repositories (Docker for example) require the - # user to import GPG keys manually - # Myy : FIXME We need some automatic Git warnings when someone - # add a GPG key, since trusting the wrong keys could lead to - # serious issues. - if [[ -f "${apt_source_gpg_filepath}" ]]; then - display_alert "Adding GPG Key ${apt_source_gpg_filepath}" - local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})" - cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}" - run_on_sdcard "apt-key add \"/tmp/${apt_source_gpg_filename}\"" - echo "APT Key returned : $?" + # extract filenames + local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})" + local apt_source_filename="$(basename ${apt_source_filepath}).list" + + display_alert "Adding APT Source ${new_apt_source}" + + if [[ "${new_apt_source}" == ppa* ]] ; then + # ppa with software-common-properties + run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\"" + # add list with apt-add + # -y -> Assumes yes to all queries + # -n -> Do not update package cache after adding + if [[ -f "${apt_source_gpg_filepath}" ]]; then + display_alert "Adding GPG Key ${apt_source_gpg_filepath}" + cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}" + run_on_sdcard "apt-key add \"/tmp/${apt_source_gpg_filename}\"" + echo "APT Key returned : $?" + fi + else + # installation without software-common-properties, sources.list + key.gpg + echo "${new_apt_source}" > "${SDCARD}/etc/apt/sources.list.d/${apt_source_filename}" + if [[ -f "${apt_source_gpg_filepath}" ]]; then + display_alert "Adding GPG Key ${apt_source_gpg_filepath}" +# local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})" + mkdir -p "${SDCARD}"/usr/share/keyrings/ + cp "${apt_source_gpg_filepath}" "${SDCARD}"/usr/share/keyrings/ + fi + fi + done fi done @@ -242,8 +251,10 @@ add_desktop_package_sources() { # Myy : I see Snap and Flatpak coming up in the next releases # so... let's prepare for that + add_apt_sources - run_on_sdcard "apt-get -y -q update" + + ls -l "${SDCARD}/usr/share/keyrings" >> "${DEST}"/${LOG_SUBPATH}/install.log ls -l "${SDCARD}/etc/apt/sources.list.d" >> "${DEST}"/${LOG_SUBPATH}/install.log cat "${SDCARD}/etc/apt/sources.list" >> "${DEST}"/${LOG_SUBPATH}/install.log diff --git a/scripts/distributions.sh b/scripts/distributions.sh index 2e83b53..ecaf105 100755 --- a/scripts/distributions.sh +++ b/scripts/distributions.sh @@ -435,8 +435,9 @@ POST_INSTALL_KERNEL_DEBS # copy boot splash images cp "${EXTER}"/packages/blobs/splash/orangepi-u-boot.bmp "${SDCARD}"/boot/boot.bmp - # copy audio.wav + # copy audio.wav and mute.wav cp "${EXTER}"/packages/blobs/audio_wav/audio.wav "${SDCARD}"/usr/share/sounds/alsa/ + cp "${EXTER}"/packages/blobs/audio_wav/mute.wav "${SDCARD}"/usr/share/sounds/alsa/ # copy watchdog test programm cp "${EXTER}"/packages/blobs/watchdog/watchdog_test_${ARCH} "${SDCARD}"/usr/local/bin/watchdog_test