JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Deprecated WIREGUARD once and for all (#7452)

Browse Source 
* remove wireguard

* remove wireguard

* remove wireguard

* Update armsom-sige1.csc

* Update hinlink-hnas.csc

* Update hinlink-h28k.csc

* Update hinlink-h66k.csc

* Update mangopi-m28k.csc

* Update hinlink-h68k.csc
This commit is contained in:
Werner
2024-11-09 21:02:50 +01:00
committed by GitHub
parent 0397a2492d
commit 0afd94a84b
9 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/armsom-sige1.csc
View File

@@ -8,5 +8,4 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3528-armsom-sige1.dtb" BOOT_FDT_FILE="rockchip/rk3528-armsom-sige1.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"

1
config/boards/hinlink-h28k.csc
View File

@@ -8,7 +8,6 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb" BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
BOOT_SUPPORT_SPI="yes" BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes" BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"

1
config/boards/hinlink-h66k.csc
View File

@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb" BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"
BOOTFS_TYPE="fat" BOOTFS_TYPE="fat"

1
config/boards/hinlink-h68k.csc
View File

@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb" BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"
BOOTFS_TYPE="fat" BOOTFS_TYPE="fat"

1
config/boards/hinlink-hnas.csc
View File

@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb" BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"
BOOTFS_TYPE="fat" BOOTFS_TYPE="fat"

1
config/boards/hinlink-ht2.csc
View File

@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb" BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"
BOOTFS_TYPE="ext4" BOOTFS_TYPE="ext4"

1
config/boards/mangopi-m28k.csc
View File

@@ -8,6 +8,5 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop" BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb" BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb"
BOOT_SCENARIO="spl-blobs" BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt" IMAGE_PARTITION_TABLE="gpt"
BOOTFS_TYPE="ext4" BOOTFS_TYPE="ext4"

1
lib/functions/configuration/main-config.sh
View File

@@ -267,7 +267,6 @@ function do_main_configuration() {
[[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default) [[ -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 [[ -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 ATF_COMPILE=yes # @TODO: move to armhf/arm64
[[ -z $WIREGUARD ]] && WIREGUARD="yes"
[[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes" [[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes"
[[ -z $PLYMOUTH ]] && PLYMOUTH="yes" [[ -z $PLYMOUTH ]] && PLYMOUTH="yes"
[[ -z $AUFS ]] && AUFS="yes" [[ -z $AUFS ]] && AUFS="yes"

5
lib/functions/rootfs/distro-agnostic.sh
View File

@@ -352,11 +352,6 @@ function install_distribution_agnostic() {
chroot_sdcard_apt_get_remove --auto-remove plymouth chroot_sdcard_apt_get_remove --auto-remove plymouth
fi 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 # freeze armbian packages
if [[ "${BSPFREEZE:-"no"}" == yes ]]; then if [[ "${BSPFREEZE:-"no"}" == yes ]]; then
display_alert "Freezing Armbian packages" "$BOARD" "info" display_alert "Freezing Armbian packages" "$BOARD" "info"