Merge branch 'sbwml:master' into x86_64

pmkol · Sep 21, 2024 · 35043c5 · 35043c5
2 parents 0a953f1 + d925ae3
commit 35043c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/openwrt/build.sh b/openwrt/build.sh
@@ -370,9 +370,6 @@ elif [ ! "$ENABLE_GLIBC" = "y" ]; then
 fi
 [ "$(whoami)" = "runner" ] && endgroup
 
-# clean directory - github actions
-[ "$(whoami)" = "runner" ] && echo 'CONFIG_AUTOREMOVE=y' >> .config
-
 # uhttpd
 [ "$ENABLE_UHTTPD" = "y" ] && sed -i '/nginx/d' .config && echo 'CONFIG_PACKAGE_ariang=y' >> .config
 

diff --git a/openwrt/scripts/05-fix-source.sh b/openwrt/scripts/05-fix-source.sh
@@ -119,6 +119,7 @@ if [ "$KERNEL_CLANG_LTO" = "y" ]; then
 else
  curl -s https://$mirror/openwrt/patch/openwrt-6.x/perf/Makefile > package/devel/perf/Makefile
 fi
+[ "$ENABLE_MOLD" != y ] && sed -i 's/no-mold//g' package/devel/perf/Makefile
 
 # kselftests-bpf
 curl -s https://$mirror/openwrt/patch/packages-patches/kselftests-bpf/Makefile > package/devel/kselftests-bpf/Makefile

diff --git a/tags/kernel-6.6 b/tags/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .51
-LINUX_KERNEL_HASH-6.6.51 = 1c0c9a14650879c4913efdbac428ba31a540c3d987155ddf34d33e11eca008b3
+LINUX_VERSION-6.6 = .52
+LINUX_KERNEL_HASH-6.6.52 = 1591ab348399d4aa53121158525056a69c8cf0fe0e90935b0095e9a58e37b4b8