Merge branch 'armbian:main' into main

xaqbr · Jun 15, 2024 · c66e1e5 · c66e1e5
2 parents e996f54 + 5dcb33a
commit c66e1e5
Show file tree

Hide file tree

Showing 235 changed files with 53,143 additions and 39,501 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -14,16 +14,29 @@
 - all:
   - changed-files:
     - any-glob-to-any-file: ['patch/**/*','config/**/*']
-    - all-globs-to-all-files: ['!config/cli/*','!config/desktop/*','!config/distributions/*']
+    - any-glob-to-all-files: ['!config/cli/*','!config/desktop/*','!config/distributions/*']
+
 "Framework":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['lib/*','tools/*','config/cli*','packages/*','extensions/*']
-"Action scripts":
+    - any-glob-to-any-file: ['lib/*','tools/*','config/cli/*','packages/*','extensions/*']
+
+"Actions scripts":
 - all:
   - changed-files:
     - any-glob-to-any-file: ['.github/workflows/*']
+
 "Desktop":
-  - all:
+- all:
   - changed-files:
     - any-glob-to-any-file: ['config/desktop/*']
+
+"Patches":
+- all:
+  - changed-files:
+    - any-glob-to-any-file: ['patch/*']
+
+# Add 'Documentation' label to any change to .md files within the entire repository 
+"Documentation":
+- changed-files:
+  - any-glob-to-any-file: '**/*.md'
diff --git a/.github/labels.yml b/.github/labels.yml
@@ -52,9 +52,15 @@
 - name: "Framework"
   color: "bfd4f2"
   description: "Framework components"
-- name: "Action scripts"
+- name: "Actions scripts"
   color: "bfd4f2"
-  description: "GitHub Action scripts"
+  description: "GitHub Actions scripts"
+- name: "Patches"
+  color: "bfd4f2"
+  description: "Patches related to kernel, U-Boot, ..."
+- name: "Documentation"
+  color: "bfd4f2"
+  description: "Documentation changes or additions"
 - name: "Work in progress"
   color: "29E414"
   description: "Unfinished / work in progress"

diff --git a/config/boards/firefly-itx-3588j.csc b/config/boards/firefly-itx-3588j.csc
@@ -18,3 +18,23 @@ function post_family_config__firefly-itx-3588j_use_vendor_uboot() {
 	BOOTDIR="u-boot-${BOARD}"
 	BOOTPATCHDIR="u-boot-firefly-itx-3588j"
 }
+
+function post_family_tweaks_bsp__firefly-itx-3588j() {
+	display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"
+
+	# Bluetooth on this board is handled by a Broadcom (AP6275PR3) chip and requires
+	# a custom brcm_patchram_plus binary, plus a systemd service to run it at boot time
+	install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
+	cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/rk3588-bluetooth.service
+
+	# Reuse the service file, ttyS0 -> ttyS6; BCM4345C5.hcd -> BCM4362A2.hcd
+	sed -i 's/ttyS0/ttyS6/g' $destination/lib/systemd/system/rk3588-bluetooth.service
+	sed -i 's/BCM4345C5.hcd/BCM4362A2.hcd/g' $destination/lib/systemd/system/rk3588-bluetooth.service
+	return 0
+}
+
+function post_family_tweaks__firefly-itx-3588j_enable_services() {
+	display_alert "$BOARD" "Enabling rk3588-bluetooth.service" "info"
+	chroot_sdcard systemctl enable rk3588-bluetooth.service
+	return 0
+}
diff --git a/config/boards/jethubj200.wip b/config/boards/jethubj200.wip
@@ -0,0 +1,20 @@
+# Amlogic S905X3 quad core 4GB RAM SoC eMMC GBE USB2 SPI
+BOARD_NAME="JetHub D2 family"
+BOARDFAMILY="jethub"
+BOARD_MAINTAINER="adeepn"
+BOOTCONFIG="jethub_j200_defconfig"
+KERNEL_TARGET="current,edge"
+MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
+FULL_DESKTOP="yes"
+SERIALCON="ttyAML0"
+#BOOT_LOGO="desktop"
+
+BOOTBRANCH_BOARD="tag:v2024.01"
+BOOTPATCHDIR="v2024.01"
+
+BOOT_FDT_FILE="amlogic/meson-sm1-jethome-jethub-j200.dtb"
+
+# To enable the SPI NOR the -spi .dtb is required, because eMMC shares a pin with SPI on the D2. To use it:
+# fdtfile=amlogic/meson-sm1-jethome-jethub-j200-spinor.dtb # in armbianEnv.txt and reboot, then run armbian-install
+# After deploying to SPI-NOR/MTD, return back to the normal DTB, otherwise eMMC speed is impaired.
+#UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin.sd.bin:u-boot.bin u-boot-dtb.img u-boot.bin:u-boot-spi.bin"
diff --git a/config/boards/nanopi-r6c.csc b/config/boards/nanopi-r6c.csc
@@ -0,0 +1,55 @@
+# Rockchip RK3588S octa core 8GB RAM SoC eMMC 1x NVMe 1x USB3 1x USB2 1x 2.5GbE 1x GbE
+BOARD_NAME="NanoPi R6C"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="ColorfulRhino"
+BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor,current,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+IMAGE_PARTITION_TABLE="gpt"
+BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6c.dtb"
+BOOT_SCENARIO="spl-blobs"
+DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
+BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
+
+function post_family_tweaks__nanopi_r6c_naming_audios() {
+	display_alert "$BOARD" "Renaming NanoPi R6C HDMI audio interface to human-readable form" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	cat <<- EOF > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+		SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"'
+	EOF
+}
+
+function post_family_tweaks__nanopi_r6c_naming_udev_network_interfaces() {
+	display_alert "$BOARD" "Renaming NanoPi R6C network interfaces to 'wan' and 'lan'" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe1c0000.ethernet", NAME:="wan"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0003:31:00.0", NAME:="lan"
+	EOF
+}
+
+# Mainline U-Boot
+function post_family_config__nanopi_r6c_use_mainline_uboot() {
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTCONFIG="generic-rk3588_defconfig"               # Use generic defconfig which should boot all RK3588 boards
+	declare -g BOOTDELAY=1                                         # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"   # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07-rc4"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+}
diff --git a/config/boards/nanopi-r6s.csc b/config/boards/nanopi-r6s.csc
@@ -8,30 +8,29 @@ KERNEL_TARGET="legacy,vendor,edge"
 KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
+IMAGE_PARTITION_TABLE="gpt"
 BOOT_FDT_FILE="rockchip/rk3588s-nanopi-r6s.dtb"
 BOOT_SCENARIO="spl-blobs"
-IMAGE_PARTITION_TABLE="gpt"
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
+DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin'
+BL31_BLOB='rk35/rk3588_bl31_v1.45.elf'
 declare -g UEFI_EDK2_BOARD_ID="nanopi-r6s" # This _only_ used for uefi-edk2-rk3588 extension
 
-function post_family_tweaks__nanopir6s_naming_audios() {
-	display_alert "$BOARD" "Renaming nanopir6s audio" "info"
+function post_family_tweaks__nanopir6s_naming_udev_audios() {
+	display_alert "$BOARD" "Renaming NanoPi R6S HDMI audio" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
-
-	return 0
+	cat <<- EOF > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+		SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"'
+	EOF
 }
 
-function post_family_tweaks__nanopir6s_udev_network_interfaces() {
-	display_alert "$BOARD" "Renaming interfaces WAN LAN1 LAN2" "info"
+function post_family_tweaks__nanopir6s_naming_udev_network_interfaces() {
+	display_alert "$BOARD" "Renaming NanoPi R6S network interfaces to WAN LAN1 LAN2" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
-	cat << EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="fe1c0000.ethernet", NAME:="wan"
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0003:31:00.0", NAME:="lan1"
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0004:41:00.0", NAME:="lan2"
-EOF
-
+	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="fe1c0000.ethernet", NAME:="wan"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0003:31:00.0", NAME:="lan1"
+		SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8169", KERNELS=="0004:41:00.0", NAME:="lan2"
+	EOF
 }
diff --git a/config/desktop/bookworm/environments/budgie/config_base/packages b/config/desktop/bookworm/environments/budgie/config_base/packages
@@ -26,7 +26,6 @@ budgie-kangaroo-applet
 budgie-keyboard-autoswitch-applet
 budgie-network-manager-applet
 budgie-previews
-budgie-previews-applet
 budgie-quickchar
 budgie-quicknote-applet
 budgie-recentlyused-applet
@@ -38,9 +37,7 @@ budgie-trash-applet
 budgie-visualspace-applet
 budgie-wallstreet
 budgie-weathershow-applet
-budgie-window-mover-applet
 budgie-window-shuffler
-budgie-workspace-overview-applet
 budgie-workspace-stopwatch-applet
 cifs-utils
 colord
@@ -57,12 +54,10 @@ fontconfig
 fontconfig-config
 fonts-noto-mono
 fonts-ubuntu
-fonts-ubuntu-font-family-console
 foomatic-db-compressed-ppds
 gdebi
 ghostscript-x
 gist
-gnome-orca
 gnome-screenshot
 gnome-disk-utility
 gnome-system-monitor

diff --git a/config/desktop/bookworm/environments/budgie/debian/postinst b/config/desktop/bookworm/environments/budgie/debian/postinst
@@ -66,6 +66,9 @@ exec='/usr/bin/terminator'
 [org/cinnamon/desktop/default-applications/terminal]
 exec='/usr/bin/terminator'
 
+[org/gnome/settings-daemon/plugins/power]
+sleep-inactive-ac-timeout='0'
+
 [org/gnome/desktop/wm/preferences]
 button-layout='appmenu:minimize,maximize,close'
 num-workspaces=2

diff --git a/config/desktop/bookworm/environments/gnome/config_base/packages b/config/desktop/bookworm/environments/gnome/config_base/packages
@@ -24,10 +24,7 @@ gnome-system-monitor
 gnome-terminal
 gnome-session
 gnome-shell
-gnome-shell-extension-appindicator
 inputattach
-libasound2
-libasound2-plugins
 libnotify-bin
 libpulsedsp
 gdm3

diff --git a/config/desktop/bookworm/environments/gnome/debian/postinst b/config/desktop/bookworm/environments/gnome/debian/postinst
@@ -18,6 +18,9 @@ picture-options='zoom'
 primary-color='#456789'
 secondary-color='#FFFFFF'
 
+[org/gnome/settings-daemon/plugins/power]
+sleep-inactive-ac-timeout='0'
+
 [org/gnome/desktop/screensaver]
 picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
 picture-options='zoom'

diff --git a/config/desktop/bookworm/environments/mate/config_base/packages b/config/desktop/bookworm/environments/mate/config_base/packages
@@ -37,7 +37,6 @@ mate-desktop-environment-core
 mate-desktop-environment-extra
 mate-desktop-environment-extras
 mate-dock-applet
-mate-equake-applet
 mate-icon-theme
 mate-indicator-applet
 mate-indicator-applet-common

diff --git a/config/desktop/common/appgroups/browsers/packages b/config/desktop/common/appgroups/browsers/packages
@@ -1 +1,2 @@
 chromium-browser
+firefox
diff --git a/config/desktop/common/environments/budgie/config_base/packages b/config/desktop/common/environments/budgie/config_base/packages
@@ -25,7 +25,6 @@ budgie-kangaroo-applet
 budgie-keyboard-autoswitch-applet
 budgie-network-manager-applet
 budgie-previews
-budgie-previews-applet
 budgie-quickchar
 budgie-quicknote-applet
 budgie-recentlyused-applet

diff --git a/config/desktop/common/environments/budgie/debian/postinst b/config/desktop/common/environments/budgie/debian/postinst
@@ -47,6 +47,9 @@ picture-options='stretched'
 picture-uri='file:////usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
 primary-color='#008094'
 
+[org/gnome/settings-daemon/plugins/power]
+sleep-inactive-ac-timeout='0'
+
 [org/gnome/desktop/interface]
 cursor-theme='DMZ-White'
 document-font-name='Noto Sans UI 11'

diff --git a/config/desktop/common/environments/gnome/debian/postinst b/config/desktop/common/environments/gnome/debian/postinst
@@ -17,6 +17,9 @@ echo "
 [org/gnome/shell]
 favorite-apps = ['terminator.desktop', 'org.gnome.Nautilus.desktop', 'google-chrome.desktop', 'thunderbird.desktop', 'code.desktop', 'Zoom.desktop']
 
+[org/gnome/settings-daemon/plugins/power]
+sleep-inactive-ac-timeout='0'
+
 [org/gnome/desktop/background]
 picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
 picture-options='zoom'

diff --git a/config/desktop/common/environments/mate/config_base/packages b/config/desktop/common/environments/mate/config_base/packages
@@ -106,7 +106,6 @@ mate-desktop-environment-core
 mate-desktop-environment-extra
 mate-desktop-environment-extras
 mate-dock-applet
-mate-equake-applet
 mate-hud
 mate-icon-theme
 mate-indicator-applet

diff --git a/config/desktop/jammy/environments/kde-neon/support b/config/desktop/jammy/environments/kde-neon/support
diff --git a/config/desktop/jammy/environments/kde-neon/support b/config/desktop/jammy/environments/kde-neon/support
@@ -0,0 +1 @@
+eos
diff --git a/config/desktop/jammy/environments/kde-plasma/config_base/packages b/config/desktop/jammy/environments/kde-plasma/config_base/packages
@@ -37,7 +37,6 @@ foomatic-db-compressed-ppds
 gdebi
 ghostscript-x
 gist
-gnome-orca
 gnome-disk-utility
 gnome-screenshot
 gnome-user-docs-de
@@ -74,7 +73,6 @@ libatk-adaptor
 libcvc0
 libfont-afm-perl
 libfontconfig1
-libfontembed1
 libfontenc1
 libgail-common
 libgl1-mesa-dri
@@ -85,7 +83,6 @@ libproxy1-plugin-gsettings
 libproxy1-plugin-networkmanager
 libu2f-udev
 libwmf0.2-7-gtk
-libxapp1
 libxcursor1
 sddm
 mesa-utils
@@ -142,7 +139,6 @@ wswiss
 x11-apps
 x11-utils
 x11-xserver-utils
-xapp
 xapps-common
 xarchiver
 xbacklight

diff --git a/config/desktop/noble/environments/i3-wm/architectures b/config/desktop/noble/environments/i3-wm/architectures
@@ -0,0 +1 @@
+armhf, arm64, amd64, riscv64
diff --git a/config/desktop/noble/environments/i3-wm/armbian/create_desktop_package.sh b/config/desktop/noble/environments/i3-wm/armbian/create_desktop_package.sh
@@ -0,0 +1,14 @@
+# install lightdm greeter
+cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian
+
+# install default desktop settings
+mkdir -p "${destination}"/etc/skel
+cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
+
+# install logo for login screen
+mkdir -p "${destination}"/usr/share/pixmaps/armbian
+cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
+
+# install wallpapers
+mkdir -p "${destination}"/usr/share/backgrounds/armbian/
+cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/armbian/