From 23072652ae0501041ec5dc80b6316d5b568d3849 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Tue, 2 Jul 2024 16:51:01 +0200
Subject: [PATCH] Add back optimize features; set autoremove as default

---
 README.md                  | 2 ++
 configs/common/basic       | 1 +
 configs/common/dumb_ap     | 1 +
 configs/common/main-router | 1 +
 configs/common/optimize    | 8 ++++----
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index db9edda..f1d7424 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,8 @@ Optional: comment modules:
 
 ```shell
 for m in $(grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m'); do module=$(echo $m| cut -f1 -d'='); sed -i "s/$m/\# $module is not set/g" .config; done
+# or
+grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done
 ```
 
 Then:
diff --git a/configs/common/basic b/configs/common/basic
index 8516582..394d3c5 100644
--- a/configs/common/basic
+++ b/configs/common/basic
@@ -34,3 +34,4 @@ CONFIG_PACKAGE_auc=y
 # Disable CONFIG_ALL_KMODS
 # More: https://github.com/openwrt/openwrt/commit/dadad6bb731ff1025125c619da7ccc196ad6ea01
 # CONFIG_ALL_KMODS is not set
+CONFIG_AUTOREMOVE=y
diff --git a/configs/common/dumb_ap b/configs/common/dumb_ap
index dde747e..ce0c155 100644
--- a/configs/common/dumb_ap
+++ b/configs/common/dumb_ap
@@ -112,3 +112,4 @@ CONFIG_PACKAGE_libbpf=y
 
 CONFIG_ALL_KMODS=y
 CONFIG_ALL_NONSHARED=y
+CONFIG_AUTOREMOVE=y
diff --git a/configs/common/main-router b/configs/common/main-router
index 7ea86b5..d0f4db3 100644
--- a/configs/common/main-router
+++ b/configs/common/main-router
@@ -107,3 +107,4 @@ CONFIG_PACKAGE_wpad-mbedtls=y
 
 CONFIG_ALL_KMODS=y
 CONFIG_ALL_NONSHARED=y
+CONFIG_AUTOREMOVE=y
diff --git a/configs/common/optimize b/configs/common/optimize
index b49d969..a0dcae8 100644
--- a/configs/common/optimize
+++ b/configs/common/optimize
@@ -12,10 +12,10 @@ CONFIG_GCC_VERSION="14.1.0"
 CONFIG_ZLIB_OPTIMIZE_SPEED=y
 CONFIG_ZSTD_OPTIMIZE_O3=y
 
-# CONFIG_GCC_USE_GRAPHITE=y
-# CONFIG_USE_GC_SECTIONS=y
-# CONFIG_USE_LTO=y
-# CONFIG_USE_MOLD=y
+CONFIG_GCC_USE_GRAPHITE=y
+CONFIG_USE_GC_SECTIONS=y
+CONFIG_USE_LTO=y
+CONFIG_USE_MOLD=y
 
 # CONFIG_KERNEL_CC_STACKPROTECTOR_STRONG is not set
 # CONFIG_USE_GCC_GGV is not set