Merge branch 'main' into artilleryx4

eazrael · Jun 22, 2024 · 564a468 · 564a468
2 parents b97515f + 75ce67f
commit 564a468
Show file tree

Hide file tree

Showing 99 changed files with 4,446 additions and 494 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -14,27 +14,27 @@
 - all:
   - changed-files:
     - any-glob-to-any-file: ['patch/**/*','config/**/*']
-    - any-glob-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/*']
+    - any-glob-to-any-file: ['lib/**/*','tools/**/*','config/cli/**/*','packages/**/*','extensions/**/*']
 
 "Actions scripts":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['.github/workflows/*']
+    - any-glob-to-any-file: ['.github/workflows/**/*']
 
 "Desktop":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['config/desktop/*']
+    - any-glob-to-any-file: ['config/desktop/**/*']
 
 "Patches":
 - all:
   - changed-files:
-    - any-glob-to-any-file: ['patch/*']
+    - any-glob-to-any-file: ['patch/**/*']
 
 # Add 'Documentation' label to any change to .md files within the entire repository 
 "Documentation":

diff --git a/config/boards/lckfb-taishanpi.csc b/config/boards/lckfb-taishanpi.csc
@@ -0,0 +1,21 @@
+# Rockchip RK3566 quad core 1GB-2GB GBE eMMC USB3 WiFi
+BOARD_NAME="LCKFB Taishan Pi"
+BOARDFAMILY="rk35xx"
+BOARD_MAINTAINER=""
+BOOTCONFIG="radxa-zero3-rk3566_defconfig"
+KERNEL_TARGET="legacy,vendor"
+BOOT_FDT_FILE="rockchip/rk3566-taishanpi-v10.dtb"
+BOOT_SCENARIO="spl-blobs"
+IMAGE_PARTITION_TABLE="gpt"
+
+# Override family config for this board; let's avoid conditionals in family config.
+function post_family_config__tspi_use_radxa_vendor() {
+	BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	BOOTBRANCH='branch:rk35xx-2024.01'
+	BOOTPATCHDIR="u-boot-radxa-latest"
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
+}
diff --git a/config/boards/station-m2.csc b/config/boards/station-m2.csc
@@ -2,29 +2,34 @@
 BOARD_NAME="Station M2"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
-BOOTCONFIG="firefly-m2-rk3568_defconfig"
+BOOTCONFIG="station-m2-rk3566_defconfig"
 KERNEL_TARGET="legacy,vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"
-SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
+BOOT_SCENARIO="spl-blobs"
 ASOUND_STATE="asound.state.station-m2"
 IMAGE_PARTITION_TABLE="gpt"
 
 function post_family_tweaks__station_m2() {
     display_alert "$BOARD" "Installing board tweaks" "info"
 
-	cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
 	cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
 
 	return 0
 }
 
 # Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__stationm2_use_vendor_uboot() {
-	BOOTSOURCE='https://github.com/150balbes/u-boot-rk'
-	BOOTBRANCH='branch:rk356x'
-	BOOTDIR="u-boot-${BOARD}"
-	BOOTPATCHDIR="u-boot-station-p2"
+function post_family_config__stationm2_use_radxa_vendor_uboot() {
+	BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	BOOTBRANCH='branch:rk35xx-2024.01'
+	BOOTPATCHDIR="u-boot-radxa-latest"
+
+	UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
+
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	function write_uboot_platform() {
+		dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
+	}
 }
diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages
@@ -1,8 +1,6 @@
 alsa-utils
 bc
 bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
@@ -30,8 +28,6 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc

diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages
@@ -1,25 +1,22 @@
 alsa-utils
+bash-completion
 bc
-bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
 dbus-user-session
 dialog
 debconf-utils
 debsums
-device-tree-compiler
 dosfstools
-ethtool
 fake-hwclock
 fdisk
 figlet
 htop
 inetutils-ping
 init
 initramfs-tools
+iproute2
 iw
 jq
 logrotate
@@ -30,22 +27,17 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc
 rsync
 rsyslog
 sudo
 systemd-resolved
-sysfsutils
-sysstat
 toilet
 tzdata
 u-boot-tools
 usbutils
-vlan
 wget
 wireless-tools
 wireguard-tools

diff --git a/config/cli/common/main/packages.additional b/config/cli/common/main/packages.additional
@@ -3,12 +3,14 @@ apt-utils
 aptitude
 automake
 avahi-autoipd
-bash-completion
 bison
 btrfs-progs
 build-essential
+command-not-found
 cracklib-runtime
+device-tree-compiler
 dkms
+ethtool
 evtest
 expect
 f2fs-tools
@@ -23,7 +25,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +38,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils
@@ -51,7 +51,8 @@ screen
 software-properties-common
 smartmontools
 stress
-sudo
+sysfsutils
+sysstat
 unattended-upgrades
 unicode-data
 unzip

diff --git a/config/cli/jammy/main/packages b/config/cli/jammy/main/packages
@@ -1,8 +1,6 @@
 alsa-utils
 bc
 bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
@@ -30,8 +28,6 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc

diff --git a/config/cli/noble/main/packages.additional b/config/cli/noble/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +36,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/cli/sid/main/packages.additional b/config/cli/sid/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +36,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/cli/trixie/main/packages.additional b/config/cli/trixie/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
@@ -37,7 +36,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/desktop/bookworm/environments/budgie/config_base/packages b/config/desktop/bookworm/environments/budgie/config_base/packages
@@ -88,7 +88,6 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxapp1
 libxcursor1
@@ -101,9 +100,6 @@ nemo-data
 nemo-fileroller
 nemo-font-manager
 nemo-gtkhash
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/cinnamon/config_base/packages b/config/desktop/bookworm/environments/cinnamon/config_base/packages
@@ -76,10 +76,6 @@ nemo-data
 nemo-fileroller
 nemo-font-manager
 nemo-gtkhash
-network-manager-gnome
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/gnome/config_base/packages b/config/desktop/bookworm/environments/gnome/config_base/packages
@@ -30,8 +30,6 @@ libpulsedsp
 gdm3
 lm-sensors
 nautilus
-network-manager-gnome
-network-manager-openvpn-gnome
 pavucontrol
 #printer-driver-all
 profile-sync-daemon

diff --git a/config/desktop/bookworm/environments/i3-wm/config_base/packages b/config/desktop/bookworm/environments/i3-wm/config_base/packages
@@ -77,7 +77,6 @@ libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcb-cursor0
 libxcursor1
@@ -87,8 +86,6 @@ lightdm-gtk-greeter-settings
 lightdm-settings
 lxappearance
 mousetweaks
-network-manager-openvpn-gnome
-network-manager-vpnc
 nitrogen
 numix-gtk-theme
 openprinting-ppds

diff --git a/config/desktop/bookworm/environments/kde-plasma/config_base/packages b/config/desktop/bookworm/environments/kde-plasma/config_base/packages
@@ -61,16 +61,12 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
 mousepad
 mousetweaks
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/mate/config_base/packages b/config/desktop/bookworm/environments/mate/config_base/packages
@@ -76,7 +76,6 @@ mate-window-applets-common
 mate-window-buttons-applet
 mate-window-menu-applet
 mate-window-title-applet
-network-manager-gnome
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/xfce/config_base/packages b/config/desktop/bookworm/environments/xfce/config_base/packages
@@ -52,7 +52,6 @@ libgtk2.0-bin
 libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 lightdm
@@ -61,10 +60,6 @@ lxtask
 mesa-utils
 mousepad
 mousetweaks
-network-manager-gnome
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/xmonad/config_base/packages b/config/desktop/bookworm/environments/xmonad/config_base/packages
@@ -64,7 +64,6 @@ libgnome-bluetooth13
 libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxapp1
 libxcursor1
@@ -73,8 +72,6 @@ lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
 lightdm-settings
 mousetweaks
-network-manager-openvpn-gnome
-network-manager-vpnc
 nitrogen
 numix-gtk-theme
 openprinting-ppds