From 5c7a012e06a39e140856a193ac8e21daa8174eed Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Wed, 10 Apr 2024 09:00:37 +0200 Subject: [PATCH] Move common part to common config file The common config that is included in the snapshot builds is not always recommend to use, so the config has been moved to config/common/ config file. --- configs/ath79/generic/uap-ac-lr/basic | 16 +--------------- configs/ath79/generic/uap-ac-lr/extended | 14 -------------- configs/ath79/mikrotik/extended | 14 -------------- configs/lantiq/xrx200/extended | 14 -------------- configs/ramips/mt7621/extended | 14 -------------- 5 files changed, 1 insertion(+), 71 deletions(-) diff --git a/configs/ath79/generic/uap-ac-lr/basic b/configs/ath79/generic/uap-ac-lr/basic index facd0c8..15b8613 100644 --- a/configs/ath79/generic/uap-ac-lr/basic +++ b/configs/ath79/generic/uap-ac-lr/basic @@ -2,28 +2,14 @@ # STEPS: # curl -SL https://downloads.openwrt.org/snapshots/targets/ath79/generic/config.buildinfo > .config # sed -i '/CONFIG_TARGET_DEVICE_/d' .config; sed -i 's/CONFIG_TARGET_MULTI_PROFILE=y/CONFIG_TARGET_MULTI_PROFILE=n/g' .config -# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/ath79/generic/uap-ac-lr/extended >> .config +# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/ath79/generic/uap-ac-lr/basic >> .config CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_generic=y CONFIG_TARGET_ath79_generic_DEVICE_ubnt_unifiac-lr=y -CONFIG_ALL_KMODS=y -CONFIG_ALL_NONSHARED=y CONFIG_DEVEL=y CONFIG_TARGET_PER_DEVICE_ROOTFS=y CONFIG_AUTOREMOVE=y -CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y -# CONFIG_BPF_TOOLCHAIN_NONE is not set -CONFIG_BUILDBOT=y -CONFIG_COLLECT_KERNEL_DEBUG=y -CONFIG_HAS_BPF_TOOLCHAIN=y -CONFIG_IB=y -CONFIG_JSON_CYCLONEDX_SBOM=y CONFIG_KERNEL_WERROR=y -CONFIG_MAKE_TOOLCHAIN=y -CONFIG_REPRODUCIBLE_DEBUG_INFO=y -CONFIG_SDK=y -CONFIG_SDK_LLVM_BPF=y -CONFIG_USE_LLVM_BUILD=y # LuCI CONFIG_PACKAGE_cgi-io=y diff --git a/configs/ath79/generic/uap-ac-lr/extended b/configs/ath79/generic/uap-ac-lr/extended index 97ad37b..87875e1 100644 --- a/configs/ath79/generic/uap-ac-lr/extended +++ b/configs/ath79/generic/uap-ac-lr/extended @@ -125,17 +125,3 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m ## CONFIG_PACKAGE_wpad-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-openssl is not set - -CONFIG_ALL_KMODS=y -CONFIG_ALL_NONSHARED=y -CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y -# CONFIG_BPF_TOOLCHAIN_NONE is not set -CONFIG_COLLECT_KERNEL_DEBUG=y -CONFIG_HAS_BPF_TOOLCHAIN=y -CONFIG_IB=y -CONFIG_SDK=y -CONFIG_SDK_LLVM_BPF=y -CONFIG_USE_LLVM_BUILD=y -CONFIG_DEVEL=y -CONFIG_JSON_CYCLONEDX_SBOM=y -CONFIG_MAKE_TOOLCHAIN=y diff --git a/configs/ath79/mikrotik/extended b/configs/ath79/mikrotik/extended index 62a3ff6..5ece916 100644 --- a/configs/ath79/mikrotik/extended +++ b/configs/ath79/mikrotik/extended @@ -124,17 +124,3 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m ## CONFIG_PACKAGE_wpad-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-openssl is not set -# -CONFIG_ALL_KMODS=y -CONFIG_ALL_NONSHARED=y -CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y -# CONFIG_BPF_TOOLCHAIN_NONE is not set -CONFIG_COLLECT_KERNEL_DEBUG=y -CONFIG_HAS_BPF_TOOLCHAIN=y -CONFIG_IB=y -CONFIG_SDK=y -CONFIG_SDK_LLVM_BPF=y -CONFIG_USE_LLVM_BUILD=y -CONFIG_DEVEL=y -CONFIG_JSON_CYCLONEDX_SBOM=y -CONFIG_MAKE_TOOLCHAIN=y diff --git a/configs/lantiq/xrx200/extended b/configs/lantiq/xrx200/extended index 7dd4902..953ca41 100644 --- a/configs/lantiq/xrx200/extended +++ b/configs/lantiq/xrx200/extended @@ -73,17 +73,3 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m ## usteer # CONFIG_PACKAGE_usteer=y # CONFIG_PACKAGE_luci-app-usteer=y -# -CONFIG_ALL_KMODS=y -CONFIG_ALL_NONSHARED=y -CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y -# CONFIG_BPF_TOOLCHAIN_NONE is not set -CONFIG_COLLECT_KERNEL_DEBUG=y -CONFIG_HAS_BPF_TOOLCHAIN=y -CONFIG_IB=y -CONFIG_SDK=y -CONFIG_SDK_LLVM_BPF=y -CONFIG_USE_LLVM_BUILD=y -CONFIG_DEVEL=y -CONFIG_JSON_CYCLONEDX_SBOM=y -CONFIG_MAKE_TOOLCHAIN=y diff --git a/configs/ramips/mt7621/extended b/configs/ramips/mt7621/extended index 39e62a5..93b8383 100644 --- a/configs/ramips/mt7621/extended +++ b/configs/ramips/mt7621/extended @@ -128,17 +128,3 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m ## CONFIG_PACKAGE_wpad-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-mbedtls is not set ## CONFIG_PACKAGE_wpad-basic-openssl is not set -# -CONFIG_ALL_KMODS=y -CONFIG_ALL_NONSHARED=y -CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y -# CONFIG_BPF_TOOLCHAIN_NONE is not set -CONFIG_COLLECT_KERNEL_DEBUG=y -CONFIG_HAS_BPF_TOOLCHAIN=y -CONFIG_IB=y -CONFIG_SDK=y -CONFIG_SDK_LLVM_BPF=y -CONFIG_USE_LLVM_BUILD=y -CONFIG_DEVEL=y -CONFIG_JSON_CYCLONEDX_SBOM=y -CONFIG_MAKE_TOOLCHAIN=y