From 9a55d82140913640cc853b16bb7233f8332c1d7b Mon Sep 17 00:00:00 2001 From: orangepi-xunlong <258384131@qq.com> Date: Tue, 16 Aug 2022 18:37:30 +0800 Subject: [PATCH] ubunt: jammy: Support install firefox-esr --- external/cache/debs/arm64/.gitignore | 1 + .../sources/families/include/rockchip64_common.inc | 14 ++++++++++++++ .../sources/families/include/sunxi64_common.inc | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/external/cache/debs/arm64/.gitignore b/external/cache/debs/arm64/.gitignore index 402ec48..7591452 100644 --- a/external/cache/debs/arm64/.gitignore +++ b/external/cache/debs/arm64/.gitignore @@ -1,2 +1,3 @@ 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 +firefox-esr_102.1.0esr+build1-0ubuntu0.22.04.1_arm64.deb diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc index 06f467d..941d36c 100644 --- a/external/config/sources/families/include/rockchip64_common.inc +++ b/external/config/sources/families/include/rockchip64_common.inc @@ -258,6 +258,20 @@ family_tweaks() fi + if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_firefox == yes ]]; then + + firefox_name="firefox-esr_102.1.0esr+build1-0ubuntu0.22.04.1_arm64.deb" + firefox_url="https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/pool/main/f/firefox-esr/" + firefox=${EXTER}/cache/debs/arm64/${firefox_name} + + if [[ ! -f $firefox ]]; then + wget -P ${EXTER}/cache/debs/arm64 ${firefox_url}/${firefox_name} + fi + + install_deb_chroot $firefox + + fi + rm $SDCARD/root/*.deb >/dev/null 2>&1 } diff --git a/external/config/sources/families/include/sunxi64_common.inc b/external/config/sources/families/include/sunxi64_common.inc index 757adb0..f982516 100644 --- a/external/config/sources/families/include/sunxi64_common.inc +++ b/external/config/sources/families/include/sunxi64_common.inc @@ -64,6 +64,20 @@ family_tweaks() fi + if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_firefox == yes ]]; then + + firefox_name="firefox-esr_102.1.0esr+build1-0ubuntu0.22.04.1_arm64.deb" + firefox_url="https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/pool/main/f/firefox-esr/" + firefox=${EXTER}/cache/debs/arm64/${firefox_name} + + if [[ ! -f $firefox ]]; then + wget -P ${EXTER}/cache/debs/arm64 ${firefox_url}/${firefox_name} + fi + + install_deb_chroot $firefox + + fi + rm $SDCARD/root/*.deb >/dev/null 2>&1 }