From cce7a2fe97b7c6f25663f24b5cfe842848b4bc67 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:53:33 +0100 Subject: [PATCH 1/9] remove wireguard --- lib/functions/rootfs/distro-agnostic.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh index 273b27182ea0..782c5b155a44 100644 --- a/lib/functions/rootfs/distro-agnostic.sh +++ b/lib/functions/rootfs/distro-agnostic.sh @@ -352,11 +352,6 @@ function install_distribution_agnostic() { chroot_sdcard_apt_get_remove --auto-remove plymouth fi - # install wireguard tools - if [[ $WIREGUARD == yes ]]; then - install_deb_chroot "wireguard-tools" "remote" # @TODO: move this to some image pkg list in config - fi - # freeze armbian packages if [[ "${BSPFREEZE:-"no"}" == yes ]]; then display_alert "Freezing Armbian packages" "$BOARD" "info" From b160e8ebdc3ad40b6b45793f9982f9ac907a726d Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:54:22 +0100 Subject: [PATCH 2/9] remove wireguard --- lib/functions/configuration/main-config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 2833ce4f8d18..eeeef1cc7d10 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -267,7 +267,6 @@ function do_main_configuration() { [[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default) [[ -z $ARCH ]] && ARCH=arm64 # makes little sense to default to anything... # @TODO: remove, but check_config_userspace_release_and_desktop requires it ATF_COMPILE=yes # @TODO: move to armhf/arm64 - [[ -z $WIREGUARD ]] && WIREGUARD="yes" [[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes" [[ -z $PLYMOUTH ]] && PLYMOUTH="yes" [[ -z $AUFS ]] && AUFS="yes" From e033658baa837086985579018132ba62cdd8a500 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:55:19 +0100 Subject: [PATCH 3/9] remove wireguard --- config/boards/hinlink-ht2.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/hinlink-ht2.csc b/config/boards/hinlink-ht2.csc index 4d1fada107ba..fa9cd94ee9be 100644 --- a/config/boards/hinlink-ht2.csc +++ b/config/boards/hinlink-ht2.csc @@ -8,6 +8,5 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" IMAGE_PARTITION_TABLE="gpt" BOOTFS_TYPE="ext4" From 175d0bc540aa84d7e42e350f03164d421e3208fb Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:56:49 +0100 Subject: [PATCH 4/9] Update armsom-sige1.csc --- config/boards/armsom-sige1.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/armsom-sige1.csc b/config/boards/armsom-sige1.csc index a663cedd56fc..5de474efa247 100644 --- a/config/boards/armsom-sige1.csc +++ b/config/boards/armsom-sige1.csc @@ -8,5 +8,4 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3528-armsom-sige1.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" IMAGE_PARTITION_TABLE="gpt" From 5c1e48b9ed032447422edfb483b05ceb713cad33 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:57:01 +0100 Subject: [PATCH 5/9] Update hinlink-hnas.csc --- config/boards/hinlink-hnas.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/hinlink-hnas.csc b/config/boards/hinlink-hnas.csc index 1d32a61310f8..5daae3e398b7 100644 --- a/config/boards/hinlink-hnas.csc +++ b/config/boards/hinlink-hnas.csc @@ -8,6 +8,5 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" IMAGE_PARTITION_TABLE="gpt" BOOTFS_TYPE="fat" From fc090d48cbce1aa8a781cadc0da7cb4664a63f4b Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:57:08 +0100 Subject: [PATCH 6/9] Update hinlink-h28k.csc --- config/boards/hinlink-h28k.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/hinlink-h28k.csc b/config/boards/hinlink-h28k.csc index 665c44257f28..24557d42c469 100644 --- a/config/boards/hinlink-h28k.csc +++ b/config/boards/hinlink-h28k.csc @@ -8,7 +8,6 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" BOOT_SUPPORT_SPI="yes" BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" From 3e665dc5a5cb851ed41aa5d6145b6892de42c881 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:57:21 +0100 Subject: [PATCH 7/9] Update hinlink-h66k.csc --- config/boards/hinlink-h66k.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/hinlink-h66k.csc b/config/boards/hinlink-h66k.csc index 48e0a11a4968..94ebf1b65f24 100644 --- a/config/boards/hinlink-h66k.csc +++ b/config/boards/hinlink-h66k.csc @@ -8,6 +8,5 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" IMAGE_PARTITION_TABLE="gpt" BOOTFS_TYPE="fat" From 493af0f98ad435426e487aedb6d65757fd81f151 Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:57:33 +0100 Subject: [PATCH 8/9] Update mangopi-m28k.csc --- config/boards/mangopi-m28k.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/mangopi-m28k.csc b/config/boards/mangopi-m28k.csc index 429a1e0f8c1d..8821cf03d93d 100644 --- a/config/boards/mangopi-m28k.csc +++ b/config/boards/mangopi-m28k.csc @@ -8,6 +8,5 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" IMAGE_PARTITION_TABLE="gpt" BOOTFS_TYPE="ext4" From 504ff48d19d5ce187c8b199a1072af8b2157c86f Mon Sep 17 00:00:00 2001 From: Werner Date: Fri, 8 Nov 2024 05:57:44 +0100 Subject: [PATCH 9/9] Update hinlink-h68k.csc --- config/boards/hinlink-h68k.csc | 1 - 1 file changed, 1 deletion(-) diff --git a/config/boards/hinlink-h68k.csc b/config/boards/hinlink-h68k.csc index eeb374c9b833..8c874cc224c8 100644 --- a/config/boards/hinlink-h68k.csc +++ b/config/boards/hinlink-h68k.csc @@ -8,6 +8,5 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb" BOOT_SCENARIO="spl-blobs" -WIREGUARD="no" IMAGE_PARTITION_TABLE="gpt" BOOTFS_TYPE="fat"