adapted to latest master changes.

buildroot-external/configs/raspmatic_tinkerboard2_defconfig → buildroot-external/configs/raspmatic_tinkerboard2.config

@@ -2,22 +2,6 @@ BR2_aarch64=y
 BR2_cortex_a72_a53=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_GLIBC_UTILS=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_DL_DIR="$(TOPDIR)/../download"
-BR2_KERNEL_MIRROR="https://www.kernel.org/pub"
-BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
-BR2_CCACHE=y
-BR2_OPTIMIZE_2=y
-BR2_ENABLE_LTO=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_EQ3_PATH)/patches"
-BR2_RELRO_PARTIAL=y
-BR2_TARGET_GENERIC_HOSTNAME=""
-BR2_TARGET_GENERIC_ISSUE="Welcome to RaspberryMatic"
-BR2_TARGET_GENERIC_PASSWD_SHA512=y
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-# BR2_ENABLE_LOCALE_PURGE is not set
-BR2_TARGET_LOCALTIME="Europe/Berlin"
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_EQ3_PATH)/overlay/base $(BR2_EXTERNAL_EQ3_PATH)/overlay/base-raspmatic $(BR2_EXTERNAL_EQ3_PATH)/overlay/WebUI $(BR2_EXTERNAL_EQ3_PATH)/overlay/WebUI-raspmatic $(BR2_EXTERNAL_EQ3_PATH)/overlay/RFD"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_EQ3_PATH)/board/tinkerboard2/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_EQ3_PATH)/board/tinkerboard2/post-image.sh"
@@ -34,12 +18,6 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-tinker-2"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_EQ3_PATH)/Busybox.config"
-BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_ZSTD=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_JQ=y
 BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -51,8 +29,6 @@ BR2_PACKAGE_EXFAT=y
 BR2_PACKAGE_EXFAT_UTILS=y
 BR2_PACKAGE_F2FS_TOOLS=y
 BR2_PACKAGE_NTFS_3G=y
-BR2_PACKAGE_DEJAVU=y
-BR2_PACKAGE_LIBERATION=y
 BR2_PACKAGE_PSPLASH=y
 BR2_PACKAGE_PSPLASH_PATCH="$(BR2_EXTERNAL_EQ3_PATH)/patches/psplash/raspmatic"
 BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -64,7 +40,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
-BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_SMARTMONTOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -73,58 +48,16 @@ BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE=y
 BR2_PACKAGE_USB_MODESWITCH_DATA=y
 BR2_PACKAGE_USBMOUNT=y
-BR2_PACKAGE_NODEJS=y
-BR2_PACKAGE_NODEJS_NPM=y
-BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="async accepts mc charenc encodeurl inherits moment range-parser unorm adm-zip compress-commons end-of-stream ipaddr.js moment-timezone raw-body unpipe archiver concat-map escape-html is-buffer ms readable-stream url archiver-utils content-disposition etag isarray negotiator remove-trailing-separator util-deprecate array-flatten content-type express jmespath node-dir safe-buffer utils-merge async cookie finalhandler jsonfile node-localstorage sax uuid aws-sdk cookie-signature forwarded lazystream normalize-path send vary balanced-match core-util-is fresh lodash on-finished serve-static walkdir base64-js crc fs-extra loop-protect once setprototypeof winreg big-integer crc32-stream fs.realpath md5 parseurl slide wrappy bl cron glob media-typer path-is-absolute statuses write-file-atomic body-parser crypt graceful-fs merge-descriptors path-to-regexp string_decoder ws brace-expansion crypto-browserify http-errors methods process-nextick-args suncalc xml2js buffer debug iconv-lite mime proxy-addr tar-stream xmlbuilder buffer-crc32 depd ieee754 mime-db punycode type-is xtend buffer-shims destroy imurmurhash mime-types qs ultron zip-stream bytes ee-first inflight minimatch querystring universalify"
-BR2_PACKAGE_TCL=y
-# BR2_PACKAGE_TCL_SHLIB_ONLY is not set
-BR2_PACKAGE_EXPECT=y
-BR2_PACKAGE_TCLLIB=y
-BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_LIBOPENSSL_BIN=y
-BR2_PACKAGE_FONTCONFIG=y
 BR2_PACKAGE_LIBGPIOD=y
 BR2_PACKAGE_LIBGPIOD_TOOLS=y
-BR2_PACKAGE_LIBUSB_COMPAT=y
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_LIBNETFILTER_CONNTRACK=y
-BR2_PACKAGE_ICU=y
-BR2_PACKAGE_ONIGURUMA=y
-BR2_PACKAGE_MSMTP=y
-BR2_PACKAGE_AVAHI=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_CHRONY=y
-BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_IFPLUGD=y
-BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-BR2_PACKAGE_LIGHTTPD_PCRE=y
-BR2_PACKAGE_LIGHTTPD_ZLIB=y
-BR2_PACKAGE_NETSNMP=y
-BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible ucd-snmp/pass mibII/mta_sendmail etherlike-mib/dot3StatsTable disman/event-mib disman/event disman/schedule agentx tunnel misc/ipfwacc utilities target notification agent_mibs agent/extend"
-BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES=""
-BR2_PACKAGE_NMAP=y
-BR2_PACKAGE_NMAP_NCAT=y
-BR2_PACKAGE_NMAP_NMAP=y
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-BR2_PACKAGE_NTP_NTPDATE=y
-BR2_PACKAGE_OPENRESOLV=y
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_OPENVPN=y
-BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_SER2NET=y
-BR2_PACKAGE_SOCAT=y
-BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_WGET=y
-BR2_PACKAGE_WIREGUARD_TOOLS=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y
@@ -142,17 +75,6 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
 BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
-BR2_PACKAGE_XINETD=y
-# BR2_PACKAGE_URANDOM_SCRIPTS is not set
-BR2_PACKAGE_FILE=y
-BR2_PACKAGE_LOGROTATE=y
-BR2_PACKAGE_IRQBALANCE=y
-BR2_PACKAGE_KMOD_TOOLS=y
-BR2_PACKAGE_MONIT=y
-BR2_PACKAGE_NUT=y
-BR2_PACKAGE_TAR=y
-BR2_PACKAGE_UTIL_LINUX_BINARIES=y
-BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
 BR2_PACKAGE_UTIL_LINUX_RFKILL=y
 BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y
 BR2_TARGET_ROOTFS_EXT2=y
@@ -181,20 +103,9 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_EQ3_PATH)/board/tinkerboard2/boot.cmd"
 BR2_PACKAGE_MULTILIB32=y
-BR2_PACKAGE_MULTILIB32_DEFCONFIG="multilib32_arm_a53_defconfig"
+BR2_PACKAGE_MULTILIB32_CONFIG_FRAGMENT_FILE="multilib32_arm_a53_defconfig"
 BR2_PACKAGE_RECOVERY_SYSTEM=y
-BR2_PACKAGE_RECOVERY_SYSTEM_CONFIG="recovery_tinkerboard2_defconfig"
-BR2_PACKAGE_OCCU=y
-BR2_PACKAGE_OCCU_RF_PROTOCOL_HM_HMIP=y
-BR2_PACKAGE_OCCU_WEBUI=y
-BR2_PACKAGE_OCCU_WEBUI_REGAHSS_BETA=y
-BR2_PACKAGE_OCCU_HMSERVER=y
-BR2_PACKAGE_CLOUDMATIC=y
-BR2_PACKAGE_HMLANGW=y
-BR2_PACKAGE_LIBXMLPARSER=y
-BR2_PACKAGE_LIBXMLRPCXX=y
-BR2_PACKAGE_TCLRPC=y
-BR2_PACKAGE_TCLREGA=y
+BR2_PACKAGE_RECOVERY_SYSTEM_CONFIG_FRAGMENT_FILE="recovery_tinkerboard2.config"
 BR2_PACKAGE_RPI_RF_MOD=y
 BR2_PACKAGE_RPI_RF_MOD_DTS=y
 BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER=y
@@ -205,10 +116,3 @@ BR2_PACKAGE_STROMPI2D=y
 BR2_PACKAGE_PIDESKTOPD=y
 BR2_PACKAGE_ARGONONED=y
 BR2_PACKAGE_BLUETOOTH_TINKER=y
-BR2_PACKAGE_DETECT_RADIO_MODULE=y
-BR2_PACKAGE_DAEMONIZE=y
-BR2_PACKAGE_SSDPD=y
-BR2_PACKAGE_EQ3CONFIGD=y
-BR2_PACKAGE_NEOSERVER=y
-BR2_PACKAGE_TAILSCALE=y
-BR2_PACKAGE_JAVA_AZUL=y

buildroot-external/package/recovery-system/external/configs/recovery_tinkerboard2.config

@@ -0,0 +1,17 @@
+BR2_aarch64=y
+BR2_cortex_a72_a53=y
+BR2_ARM_FPU_NEON_VFPV4=y
+# BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
+BR2_ROOTFS_LIB_DIR="lib"
+BR2_ROOTFS_LIB32_DIR="lib32"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/tinkerboard2/post-build.sh"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="$(BR2_EXTERNAL_LINUX_KERNEL_CUSTOM_VERSION_VALUE)"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_EQ3_PATH)/board/tinkerboard2/kernel-patches"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_EQ3_PATH)/board/tinkerboard2/kernel_defconfig"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_EQ3_PATH)/kernel/global.config $(BR2_EXTERNAL_EQ3_PATH)/kernel/device-support.config $(BR2_EXTERNAL_EQ3_PATH)/kernel/security-arm64.config $(BR2_EXTERNAL_EQ3_PATH)/kernel/security.config $(BR2_EXTERNAL_EQ3_PATH)/board/tinkerboard2/kernel.config"
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+BR2_PACKAGE_MULTILIB32=y
+BR2_PACKAGE_MULTILIB32_CONFIG_FRAGMENT_FILE="multilib32_arm_a53_defconfig"