From aebfeb6f3ed003a308147b3ca9ebeb816b15d2ac Mon Sep 17 00:00:00 2001 From: orangepi-xunlong <258384131@qq.com> Date: Wed, 20 Apr 2022 19:34:24 +0800 Subject: [PATCH] Update some packages --- external/config/boards/orangepi3-lts.conf | 2 +- external/config/boards/orangepi3.conf | 2 +- .../config/cli/jammy/debootstrap/packages | 1 - .../jammy/main/config_cli_standard/packages | 1 - .../cli/jammy/main/config_desktop/packages | 1 - .../desktop/bullseye/appgroups/games/packages | 5 -- .../environments/xfce/config_base/packages | 26 ++++++---- .../buster/appgroups/desktop_tools/packages | 8 ++- .../desktop/buster/appgroups/editors/packages | 6 +-- .../buster/appgroups/internet/packages | 6 ++- .../buster/appgroups/multimedia/packages | 2 + .../buster/appgroups/programming/packages | 5 +- .../jammy/appgroups/emulators/only_for | 1 - .../jammy/appgroups/emulators/packages | 1 - .../emulators/sources/apt/box64.source | 1 - .../emulators/sources/apt/box64.source.gpg | 51 ------------------- .../environments/xfce/config_base/packages | 9 +++- .../kernel/linux-5.16-sun50iw9-current.config | 6 +-- .../kernel/linux-5.16-sunxi64-current.config | 4 +- .../sources/families/include/ffmepg_kodi.inc | 11 +++- .../orangepi/orangepi-hardware-optimization | 2 +- 21 files changed, 57 insertions(+), 94 deletions(-) delete mode 100755 external/config/desktop/bullseye/appgroups/games/packages delete mode 100755 external/config/desktop/jammy/appgroups/emulators/only_for delete mode 100755 external/config/desktop/jammy/appgroups/emulators/packages delete mode 100755 external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source delete mode 100755 external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source.gpg diff --git a/external/config/boards/orangepi3-lts.conf b/external/config/boards/orangepi3-lts.conf index 0bde323..b480eb9 100755 --- a/external/config/boards/orangepi3-lts.conf +++ b/external/config/boards/orangepi3-lts.conf @@ -7,4 +7,4 @@ MODULES="sprdbt_tty sprdwl_ng" MODULES_BLACKLIST_LEGACY="bcmdhd" ATFBRANCH="tag:v2.2" DISTRIB_TYPE_LEGACY="buster focal" -DISTRIB_TYPE_CURRENT="bullseye bookworm focal jammy" +DISTRIB_TYPE_CURRENT="bullseye focal jammy" diff --git a/external/config/boards/orangepi3.conf b/external/config/boards/orangepi3.conf index 2066bff..6b2b4c1 100644 --- a/external/config/boards/orangepi3.conf +++ b/external/config/boards/orangepi3.conf @@ -7,4 +7,4 @@ MODULES_BLACKLIST_LEGACY="bcmdhd" MODULES_BLACKLIST="btsdio" ATFBRANCH="tag:v2.2" DISTRIB_TYPE_LEGACY="buster focal" -DISTRIB_TYPE_CURRENT="bullseye bookworm focal jammy" +DISTRIB_TYPE_CURRENT="bullseye focal jammy" diff --git a/external/config/cli/jammy/debootstrap/packages b/external/config/cli/jammy/debootstrap/packages index 2c09bab..ec387f0 100755 --- a/external/config/cli/jammy/debootstrap/packages +++ b/external/config/cli/jammy/debootstrap/packages @@ -3,7 +3,6 @@ bzip2 ca-certificates console-setup cpio -crda cron dbus dbus-user-session diff --git a/external/config/cli/jammy/main/config_cli_standard/packages b/external/config/cli/jammy/main/config_cli_standard/packages index 6251409..b3f36e3 100755 --- a/external/config/cli/jammy/main/config_cli_standard/packages +++ b/external/config/cli/jammy/main/config_cli_standard/packages @@ -4,7 +4,6 @@ bridge-utils build-essential ca-certificates console-setup -crda dkms expect fbset diff --git a/external/config/cli/jammy/main/config_desktop/packages b/external/config/cli/jammy/main/config_desktop/packages index 5d9b402..b3aced6 100755 --- a/external/config/cli/jammy/main/config_desktop/packages +++ b/external/config/cli/jammy/main/config_desktop/packages @@ -4,7 +4,6 @@ bridge-utils build-essential ca-certificates console-setup -crda emacs-nox expect fbset diff --git a/external/config/desktop/bullseye/appgroups/games/packages b/external/config/desktop/bullseye/appgroups/games/packages deleted file mode 100755 index e95002d..0000000 --- a/external/config/desktop/bullseye/appgroups/games/packages +++ /dev/null @@ -1,5 +0,0 @@ -gnome-mahjongg -gnome-mines -gnome-sudoku -quadrapassel -sgt-puzzles diff --git a/external/config/desktop/bullseye/environments/xfce/config_base/packages b/external/config/desktop/bullseye/environments/xfce/config_base/packages index 0ad7869..7dc33c9 100644 --- a/external/config/desktop/bullseye/environments/xfce/config_base/packages +++ b/external/config/desktop/bullseye/environments/xfce/config_base/packages @@ -1,4 +1,6 @@ anacron +apt-config-auto-update +apt-xapian-index blueman bluez bluez-cups @@ -6,6 +8,7 @@ bluez-tools brltty brltty-x11 cifs-utils +colord cups cups-bsd cups-client @@ -35,20 +38,22 @@ fonts-ubuntu-font-family-console foomatic-db-compressed-ppds gdebi ghostscript-x +gist gnome-font-viewer gnome-orca -gnome-software gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps gstreamer1.0-pulseaudio gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf -gvfs +gvfs-backends hplip hunspell-en-us inputattach +inxi keyutils +laptop-detect libatk-adaptor libfont-afm-perl libfontconfig1 @@ -64,10 +69,10 @@ libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk +libxapp1 libxcursor1 lightdm lxtask -menulibre mesa-utils mousepad mousetweaks @@ -78,12 +83,12 @@ network-manager-openvpn network-manager-pptp network-manager-ssh network-manager-vpnc -arc-theme -papirus-icon-theme +numix-gtk-theme +numix-icon-theme +numix-icon-theme-circle openprinting-ppds p7zip-full pamix -plank pasystray pavucontrol pavucontrol-qt @@ -92,18 +97,23 @@ policykit-1 printer-driver-all profile-sync-daemon pulseaudio-module-bluetooth +redshift slick-greeter smbclient software-properties-gtk spice-vdagent system-config-printer +terminator thunar-volman +tree ttf-ubuntu-font-family -tumbler update-inetd viewnior x11-apps +x11-utils x11-xserver-utils +xapps-common +xarchiver xbacklight xcursor-themes xdg-user-dirs @@ -112,8 +122,6 @@ xfce4 xfce4-notifyd xfce4-screenshooter xfce4-terminal -xfce4-pulseaudio-plugin -xfce4-statusnotifier-plugin xfonts-100dpi xfonts-75dpi xfonts-base diff --git a/external/config/desktop/buster/appgroups/desktop_tools/packages b/external/config/desktop/buster/appgroups/desktop_tools/packages index 59ad3e2..23f24bf 100644 --- a/external/config/desktop/buster/appgroups/desktop_tools/packages +++ b/external/config/desktop/buster/appgroups/desktop_tools/packages @@ -1,6 +1,4 @@ +bleachbit +fbi gparted -catfish -xarchiver -gnome-calculator -xfce4-dict -synaptic +kazam diff --git a/external/config/desktop/buster/appgroups/editors/packages b/external/config/desktop/buster/appgroups/editors/packages index ae6070c..a69e7d2 100644 --- a/external/config/desktop/buster/appgroups/editors/packages +++ b/external/config/desktop/buster/appgroups/editors/packages @@ -1,3 +1,3 @@ -gimp -inkscape -tuxpaint +emacs +geany +vim diff --git a/external/config/desktop/buster/appgroups/internet/packages b/external/config/desktop/buster/appgroups/internet/packages index 0e8ab6a..0a4653e 100644 --- a/external/config/desktop/buster/appgroups/internet/packages +++ b/external/config/desktop/buster/appgroups/internet/packages @@ -1,3 +1,5 @@ -thunderbird +filezilla +putty +qbittorrent transmission -transmission-gtk +transmission-remote-gtk diff --git a/external/config/desktop/buster/appgroups/multimedia/packages b/external/config/desktop/buster/appgroups/multimedia/packages index b6d0c36..2fb300d 100644 --- a/external/config/desktop/buster/appgroups/multimedia/packages +++ b/external/config/desktop/buster/appgroups/multimedia/packages @@ -1 +1,3 @@ +gimp mpv +pithos diff --git a/external/config/desktop/buster/appgroups/programming/packages b/external/config/desktop/buster/appgroups/programming/packages index e769390..464eea8 100644 --- a/external/config/desktop/buster/appgroups/programming/packages +++ b/external/config/desktop/buster/appgroups/programming/packages @@ -1,2 +1,3 @@ -geany -thonny +build-essential +clang +meld diff --git a/external/config/desktop/jammy/appgroups/emulators/only_for b/external/config/desktop/jammy/appgroups/emulators/only_for deleted file mode 100755 index d400067..0000000 --- a/external/config/desktop/jammy/appgroups/emulators/only_for +++ /dev/null @@ -1 +0,0 @@ -arm64 diff --git a/external/config/desktop/jammy/appgroups/emulators/packages b/external/config/desktop/jammy/appgroups/emulators/packages deleted file mode 100755 index d248784..0000000 --- a/external/config/desktop/jammy/appgroups/emulators/packages +++ /dev/null @@ -1 +0,0 @@ -box64 diff --git a/external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source b/external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source deleted file mode 100755 index 20af820..0000000 --- a/external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source +++ /dev/null @@ -1 +0,0 @@ -deb http://ryanfortner.github.io/box64-debs/debian ./ diff --git a/external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source.gpg b/external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source.gpg deleted file mode 100755 index 56b6eb1..0000000 --- a/external/config/desktop/jammy/appgroups/emulators/sources/apt/box64.source.gpg +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=yWSi ------END PGP PUBLIC KEY BLOCK----- diff --git a/external/config/desktop/jammy/environments/xfce/config_base/packages b/external/config/desktop/jammy/environments/xfce/config_base/packages index b5bc22c..148b8f7 100755 --- a/external/config/desktop/jammy/environments/xfce/config_base/packages +++ b/external/config/desktop/jammy/environments/xfce/config_base/packages @@ -6,8 +6,8 @@ bluez-cups bluez-tools brltty brltty-x11 -caffeine cifs-utils +colord cups cups-bsd cups-client @@ -38,6 +38,7 @@ fonts-ubuntu-console foomatic-db-compressed-ppds gdebi ghostscript-x +gist gnome-font-viewer gnome-screenshot gnome-user-docs-de @@ -58,6 +59,7 @@ hplip hunspell-en-us indicator-printers inputattach +inxi kerneloops keyutils language-pack-gnome-de @@ -84,6 +86,7 @@ libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libu2f-udev libwmf0.2-7-gtk +libxapp1 libxcursor1 lightdm lightdm-settings @@ -124,6 +127,7 @@ system-config-printer system-config-printer-common terminator thunar-volman +tree ubuntu-drivers-common update-inetd update-manager @@ -140,7 +144,10 @@ wportuguese wspanish wswiss x11-apps +x11-utils x11-xserver-utils +xapp +xapps-common xarchiver xbacklight xcursor-themes diff --git a/external/config/kernel/linux-5.16-sun50iw9-current.config b/external/config/kernel/linux-5.16-sun50iw9-current.config index d352aa1..02589b0 100644 --- a/external/config/kernel/linux-5.16-sun50iw9-current.config +++ b/external/config/kernel/linux-5.16-sun50iw9-current.config @@ -5867,9 +5867,9 @@ CONFIG_EDAC_DMC520=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_HCTOSYS_DEVICE="rtc1" CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC_DEVICE="rtc1" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y @@ -5877,7 +5877,7 @@ CONFIG_RTC_NVMEM=y # RTC interfaces # CONFIG_RTC_INTF_SYSFS=y -# CONFIG_RTC_INTF_PROC is not set +CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # CONFIG_RTC_DRV_TEST is not set diff --git a/external/config/kernel/linux-5.16-sunxi64-current.config b/external/config/kernel/linux-5.16-sunxi64-current.config index 8398d9c..d23805d 100644 --- a/external/config/kernel/linux-5.16-sunxi64-current.config +++ b/external/config/kernel/linux-5.16-sunxi64-current.config @@ -5867,9 +5867,9 @@ CONFIG_EDAC_DMC520=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_HCTOSYS_DEVICE="rtc1" CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC_DEVICE="rtc1" # CONFIG_RTC_DEBUG is not set CONFIG_RTC_NVMEM=y diff --git a/external/config/sources/families/include/ffmepg_kodi.inc b/external/config/sources/families/include/ffmepg_kodi.inc index 37570f9..74ca43f 100644 --- a/external/config/sources/families/include/ffmepg_kodi.inc +++ b/external/config/sources/families/include/ffmepg_kodi.inc @@ -1,8 +1,15 @@ function ffmepg_kodi_install() { - chroot $SDCARD /bin/bash -c "apt install -q -y ffmpeg kodi libgles2 libjs-bootstrap lockfile-progs" - #chroot $SDCARD /bin/bash -c "apt install -q -y ffmpeg kodi libgles2 libjs-bootstrap >/dev/null 2>&1" + #chroot $SDCARD /bin/bash -c "apt-get clean" + #chroot $SDCARD /bin/bash -c "mv /var/lib/apt/lists /tmp" + #chroot $SDCARD /bin/bash -c "mkdir -p /var/lib/apt/lists/partial" + #chroot $SDCARD /bin/bash -c "apt-get clean" + + chroot $SDCARD /bin/bash -c "apt-get -q update" + chroot $SDCARD /bin/bash -c "apt-get install -q -y ffmpeg kodi libgles2 libjs-bootstrap lockfile-progs" + #chroot $SDCARD /bin/bash -c "apt-get -q update >/dev/null 2>&1" + #chroot $SDCARD /bin/bash -c "apt-get install -q -y ffmpeg kodi libgles2 libjs-bootstrap >/dev/null 2>&1" dpkg_install_deb_chroot "$EXTER/cache/sources/ffmpeg_kodi_debian11/ffmpeg/libavcodec58_4.3.3-0+deb11u1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/ffmpeg_kodi_debian11/ffmpeg/libavdevice58_4.3.3-0+deb11u1_arm64.deb" 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 ee6058f..4beb7ab 100755 --- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization +++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization @@ -129,7 +129,7 @@ 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:0,0 > /dev/null 2>&1 aplay /usr/share/sounds/alsa/audio.wav -D hw:1,0 > /dev/null 2>&1 fi