From d7651f5ed9000376f63047c22dc07daee93848a8 Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 17 Jul 2024 09:20:12 +0800 Subject: [PATCH 1/2] linux-6.6: bump to 6.6.40 Signed-off-by: sbwml --- tags/kernel-6.6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tags/kernel-6.6 b/tags/kernel-6.6 index 9661cd01d..a736da59c 100644 --- a/tags/kernel-6.6 +++ b/tags/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .37 -LINUX_KERNEL_HASH-6.6.37 = f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 +LINUX_VERSION-6.6 = .40 +LINUX_KERNEL_HASH-6.6.40 = 5c3a3c03c055b8d601a6d7f80d1465ada6b83a12299f6ace2027b47f0baff538 From 46336798db592adc852e433872471912f1be4c31 Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 17 Jul 2024 09:22:25 +0800 Subject: [PATCH 2/2] OpenWrt 23.05.4 Signed-off-by: sbwml --- ...add-MODULE_ALLOW_BTF_MISMATCH-option.patch | 10 +-- ...2-rootfs-add-upx-compression-support.patch | 6 +- ...-Add-support-for-llvm-clang-compiler.patch | 6 +- ...ath-Add-libquadmath-to-the-toolchain.patch | 7 +- ...ermissions-for-UCI-configuration-fil.patch | 6 +- ...kernel-add-out-of-tree-kernel-config.patch | 6 +- ...rt-for-local-kmod-installation-sourc.patch | 10 +-- ...t-to-use-the-mold-linker-for-package.patch | 8 +- ...wide-opt-out-of-tree-wide-mold-usage.patch | 16 ++-- ...lchain-add-mold-as-additional-linker.patch | 8 +- .../0004-tools-add-mold-a-modern-linker.patch | 12 +-- ...TRIP_ARGS-with-SSTRIP_DISCARD_TRAILI.patch | 8 +- ...b-to-use-the-mold-linker-for-package.patch | 8 +- ...les-prepare-to-use-different-linkers.patch | 6 +- ...=> 0008-tools-mold-update-to-2.32.1.patch} | 14 ++-- ...vim-fix-renamed-defaults-config-file.patch | 75 +++++++++++++++++++ openwrt/scripts/05-fix-source.sh | 2 +- tags/v23 | 2 +- 18 files changed, 144 insertions(+), 66 deletions(-) rename openwrt/patch/openwrt-6.x/mold/{0008-tools-mold-update-to-2.30.0.patch => 0008-tools-mold-update-to-2.32.1.patch} (72%) create mode 100644 openwrt/patch/vim/0001-vim-fix-renamed-defaults-config-file.patch diff --git a/openwrt/patch/generic/0001-kernel-add-MODULE_ALLOW_BTF_MISMATCH-option.patch b/openwrt/patch/generic/0001-kernel-add-MODULE_ALLOW_BTF_MISMATCH-option.patch index 7e1d55c8d..672f07bce 100644 --- a/openwrt/patch/generic/0001-kernel-add-MODULE_ALLOW_BTF_MISMATCH-option.patch +++ b/openwrt/patch/generic/0001-kernel-add-MODULE_ALLOW_BTF_MISMATCH-option.patch @@ -1,7 +1,7 @@ -From c07038da27cefa5a93e433909b9aca594386ddc1 Mon Sep 17 00:00:00 2001 +From b0f013ccfa66842e9739c6e11b81eadc44a2f8eb Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 16 May 2023 12:38:53 +0800 -Subject: [PATCH] kernel: add MODULE_ALLOW_BTF_MISMATCH option +Subject: [PATCH 1/7] kernel: add MODULE_ALLOW_BTF_MISMATCH option BTF mismatch can occur for a separately-built module even when the ABI is otherwise compatible and nothing else would prevent successfully @@ -16,10 +16,10 @@ Signed-off-by: Tianling Shen 1 file changed, 10 insertions(+) diff --git a/config/Config-kernel.in b/config/Config-kernel.in -index c1bc798..328a349 100644 +index ea828ae..a262d59 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in -@@ -374,6 +374,16 @@ config KERNEL_DEBUG_INFO_BTF +@@ -364,6 +364,16 @@ config KERNEL_DEBUG_INFO_BTF Required to run BPF CO-RE applications. @@ -37,5 +37,5 @@ index c1bc798..328a349 100644 bool "Reduce debugging information" default y -- -2.34.8 +2.43.5 diff --git a/openwrt/patch/generic/0002-rootfs-add-upx-compression-support.patch b/openwrt/patch/generic/0002-rootfs-add-upx-compression-support.patch index 6f05409eb..9a334425a 100644 --- a/openwrt/patch/generic/0002-rootfs-add-upx-compression-support.patch +++ b/openwrt/patch/generic/0002-rootfs-add-upx-compression-support.patch @@ -1,7 +1,7 @@ -From 1ef366ede35af39fab592543f3d9faa63f90ecb8 Mon Sep 17 00:00:00 2001 +From 79765552324d8c08e31e7ab80a53b1a29654d473 Mon Sep 17 00:00:00 2001 From: sbwml Date: Sun, 7 Apr 2024 04:08:40 +0800 -Subject: [PATCH] rootfs: add upx compression support +Subject: [PATCH 2/7] rootfs: add upx compression support * When the upx_list.txt file exists in the source code root directory, it will be compressed by upx. @@ -34,5 +34,5 @@ index f2ed648..eb69a99 100644 $(call mklibs,$(1)) $(if $(SOURCE_DATE_EPOCH),find $(1)/ -mindepth 1 -execdir touch -hcd "@$(SOURCE_DATE_EPOCH)" "{}" +) -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/generic/0003-kernel-Add-support-for-llvm-clang-compiler.patch b/openwrt/patch/generic/0003-kernel-Add-support-for-llvm-clang-compiler.patch index aff4cbd8a..cfb799e0d 100644 --- a/openwrt/patch/generic/0003-kernel-Add-support-for-llvm-clang-compiler.patch +++ b/openwrt/patch/generic/0003-kernel-Add-support-for-llvm-clang-compiler.patch @@ -1,7 +1,7 @@ -From 565a2dcf90271ab7494c744a20f21097f60de0b8 Mon Sep 17 00:00:00 2001 +From 59e101ebf7ac9ffe7b9dfd82a6e41050dbc5d13f Mon Sep 17 00:00:00 2001 From: sbwml Date: Mon, 6 May 2024 03:21:07 +0800 -Subject: [PATCH] kernel: Add support for llvm/clang compiler +Subject: [PATCH 3/7] kernel: Add support for llvm/clang compiler Signed-off-by: sbwml --- @@ -98,5 +98,5 @@ index c391d32..802e33a 100644 __unknown_flags=$(filter-out no-iremap no-mips16 gc-sections no-gc-sections lto no-lto,$(PKG_BUILD_FLAGS)) ifneq ($(__unknown_flags),) -- -2.42.0 +2.43.5 diff --git a/openwrt/patch/generic/0004-libquadmath-Add-libquadmath-to-the-toolchain.patch b/openwrt/patch/generic/0004-libquadmath-Add-libquadmath-to-the-toolchain.patch index 91abdc1b7..be2aec5fe 100644 --- a/openwrt/patch/generic/0004-libquadmath-Add-libquadmath-to-the-toolchain.patch +++ b/openwrt/patch/generic/0004-libquadmath-Add-libquadmath-to-the-toolchain.patch @@ -1,7 +1,7 @@ -From 76c863fe607d7f457f6d1e9ca26f634383fb5f57 Mon Sep 17 00:00:00 2001 +From 6547a0bb12550411d4bf880e718759d5ea81db1e Mon Sep 17 00:00:00 2001 From: Carlos Miguel Ferreira Date: Wed, 12 Jun 2024 01:20:59 +0100 -Subject: [PATCH] libquadmath: Add libquadmath to the toolchain +Subject: [PATCH 4/7] libquadmath: Add libquadmath to the toolchain This commit makes the libquadmath library available to the GCC toolchain. This library is important for libraries such as @@ -87,3 +87,6 @@ index f9f8ac9..8066e35 100644 $(eval $(call BuildPackage,libstdcpp)) $(eval $(call BuildPackage,libasan)) $(eval $(call BuildPackage,libtsan)) +-- +2.43.5 + diff --git a/openwrt/patch/generic/0005-rootfs-add-r-w-permissions-for-UCI-configuration-fil.patch b/openwrt/patch/generic/0005-rootfs-add-r-w-permissions-for-UCI-configuration-fil.patch index 64a2300b8..18bec73ed 100644 --- a/openwrt/patch/generic/0005-rootfs-add-r-w-permissions-for-UCI-configuration-fil.patch +++ b/openwrt/patch/generic/0005-rootfs-add-r-w-permissions-for-UCI-configuration-fil.patch @@ -1,7 +1,7 @@ -From af683d8e4a586ad454224d2c67757e71361c4a3a Mon Sep 17 00:00:00 2001 +From 42f9a52f66ef69a0085055facf8a14cab3f279ce Mon Sep 17 00:00:00 2001 From: sbwml Date: Sun, 30 Jun 2024 21:58:24 +0800 -Subject: [PATCH] rootfs: add r/w permissions for UCI configuration files +Subject: [PATCH 5/7] rootfs: add r/w permissions for UCI configuration files Signed-off-by: sbwml --- @@ -21,5 +21,5 @@ index eb69a99..f8bc2ed 100644 $(call mklibs,$(1)) $(if $(SOURCE_DATE_EPOCH),find $(1)/ -mindepth 1 -execdir touch -hcd "@$(SOURCE_DATE_EPOCH)" "{}" +) -- -2.42.0 +2.43.5 diff --git a/openwrt/patch/generic/0006-build-kernel-add-out-of-tree-kernel-config.patch b/openwrt/patch/generic/0006-build-kernel-add-out-of-tree-kernel-config.patch index be2a38697..c309684b6 100644 --- a/openwrt/patch/generic/0006-build-kernel-add-out-of-tree-kernel-config.patch +++ b/openwrt/patch/generic/0006-build-kernel-add-out-of-tree-kernel-config.patch @@ -1,7 +1,7 @@ -From 8efa075165c3ebb21cb0f7d4eea155b337e60b09 Mon Sep 17 00:00:00 2001 +From 3f003e591567a7640b2d61f0bffc11ac9ff7c7dc Mon Sep 17 00:00:00 2001 From: sbwml Date: Sun, 7 Jul 2024 18:51:18 +0800 -Subject: [PATCH] build: kernel: add out-of-tree kernel config +Subject: [PATCH 6/7] build: kernel: add out-of-tree kernel config Signed-off-by: sbwml --- @@ -111,5 +111,5 @@ index b8a1479..408bf2f 100644 define Kernel/Configure/Default -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/generic/0007-rootfs-Add-support-for-local-kmod-installation-sourc.patch b/openwrt/patch/generic/0007-rootfs-Add-support-for-local-kmod-installation-sourc.patch index 5aabd8d44..70a36db41 100644 --- a/openwrt/patch/generic/0007-rootfs-Add-support-for-local-kmod-installation-sourc.patch +++ b/openwrt/patch/generic/0007-rootfs-Add-support-for-local-kmod-installation-sourc.patch @@ -1,7 +1,7 @@ -From 2d904d33f186881bfd14aec41a72e3e29004842a Mon Sep 17 00:00:00 2001 +From 910f99cb7ede0303321b1062507681685b660925 Mon Sep 17 00:00:00 2001 From: sbwml Date: Sun, 14 Jul 2024 12:43:06 +0800 -Subject: [PATCH] rootfs: Add support for local kmod installation sources +Subject: [PATCH 7/7] rootfs: Add support for local kmod installation sources * CONFIG_TARGET_ROOTFS_LOCAL_PACKAGES=y @@ -12,10 +12,10 @@ Signed-off-by: sbwml 2 files changed, 14 insertions(+) diff --git a/config/Config-images.in b/config/Config-images.in -index ea7b3d3..09bfc3e 100644 +index c32fa00..79d89f5 100644 --- a/config/Config-images.in +++ b/config/Config-images.in -@@ -317,4 +317,12 @@ menu "Target Images" +@@ -318,4 +318,12 @@ menu "Target Images" across reboots. When enabled, /var/run will still be linked to /tmp/run. @@ -46,5 +46,5 @@ index f8bc2ed..06662d4 100644 $(call mklibs,$(1)) $(if $(SOURCE_DATE_EPOCH),find $(1)/ -mindepth 1 -execdir touch -hcd "@$(SOURCE_DATE_EPOCH)" "{}" +) -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0001-build-add-support-to-use-the-mold-linker-for-package.patch b/openwrt/patch/openwrt-6.x/mold/0001-build-add-support-to-use-the-mold-linker-for-package.patch index e508e0786..8a416e299 100644 --- a/openwrt/patch/openwrt-6.x/mold/0001-build-add-support-to-use-the-mold-linker-for-package.patch +++ b/openwrt/patch/openwrt-6.x/mold/0001-build-add-support-to-use-the-mold-linker-for-package.patch @@ -1,4 +1,4 @@ -From 18d4007ad731dfa625a6c03d1a946c453d7b92f2 Mon Sep 17 00:00:00 2001 +From 92b82f0545fa658e358a85db8c7acee706c5c520 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 27 Jan 2023 16:35:46 +0100 Subject: [PATCH 1/8] build: add support to use the mold linker for packages @@ -12,10 +12,10 @@ Signed-off-by: Andre Heider 1 file changed, 5 insertions(+) diff --git a/include/package.mk b/include/package.mk -index c391d320aa..1791d6d9d4 100644 +index 802e33a..6988e5f 100644 --- a/include/package.mk +++ b/include/package.mk -@@ -55,6 +55,11 @@ ifeq ($(call pkg_build_flag,lto,$(if $(CONFIG_USE_LTO),1,0)),1) +@@ -59,6 +59,11 @@ ifeq ($(call pkg_build_flag,lto,$(if $(CONFIG_USE_LTO),1,0)),1) TARGET_CXXFLAGS+= -flto=auto -fno-fat-lto-objects TARGET_LDFLAGS+= -flto=auto -fuse-linker-plugin endif @@ -28,5 +28,5 @@ index c391d320aa..1791d6d9d4 100644 include $(INCLUDE_DIR)/hardening.mk include $(INCLUDE_DIR)/prereq.mk -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0002-treewide-opt-out-of-tree-wide-mold-usage.patch b/openwrt/patch/openwrt-6.x/mold/0002-treewide-opt-out-of-tree-wide-mold-usage.patch index fb91d1e3f..2c450056f 100644 --- a/openwrt/patch/openwrt-6.x/mold/0002-treewide-opt-out-of-tree-wide-mold-usage.patch +++ b/openwrt/patch/openwrt-6.x/mold/0002-treewide-opt-out-of-tree-wide-mold-usage.patch @@ -1,4 +1,4 @@ -From b7619a40b1497d974fef2bcc07bfef6da93e049a Mon Sep 17 00:00:00 2001 +From 149aef90a292c51bd820554ad7cc4c233f400c97 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 27 Jan 2023 18:22:43 +0100 Subject: [PATCH 2/8] treewide: opt-out of tree-wide mold usage @@ -15,10 +15,10 @@ Signed-off-by: Andre Heider 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/package.mk b/include/package.mk -index 1791d6d9d4..61a26f0c43 100644 +index 6988e5f..e992f37 100644 --- a/include/package.mk +++ b/include/package.mk -@@ -24,7 +24,7 @@ PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL),$(MAKE_J),-j1) +@@ -28,7 +28,7 @@ ifneq (,$(findstring clang,$(KERNEL_CC))) endif PKG_BUILD_FLAGS?= @@ -28,7 +28,7 @@ index 1791d6d9d4..61a26f0c43 100644 $(error unknown PKG_BUILD_FLAGS: $(__unknown_flags)) endif diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile -index 865feee9ad..44dafe1ef1 100644 +index 865feee..44dafe1 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -25,7 +25,7 @@ ifneq ($(BUILD_VARIANT),none) @@ -41,7 +41,7 @@ index 865feee9ad..44dafe1ef1 100644 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/lantiq/ltq-ifxos/Makefile b/package/kernel/lantiq/ltq-ifxos/Makefile -index d941a9d56f..97f7ca78ce 100644 +index d941a9d..97f7ca7 100644 --- a/package/kernel/lantiq/ltq-ifxos/Makefile +++ b/package/kernel/lantiq/ltq-ifxos/Makefile @@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=LICENSE @@ -53,7 +53,7 @@ index d941a9d56f..97f7ca78ce 100644 include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/lantiq/ltq-vdsl-vr11-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-vr11-mei/Makefile -index f2dcf8db84..7b8a948179 100644 +index f2dcf8d..7b8a948 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr11-mei/Makefile +++ b/package/kernel/lantiq/ltq-vdsl-vr11-mei/Makefile @@ -25,6 +25,7 @@ PKG_EXTMOD_SUBDIRS:=src @@ -65,7 +65,7 @@ index f2dcf8db84..7b8a948179 100644 include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/lantiq/ltq-vdsl-vr11/Makefile b/package/kernel/lantiq/ltq-vdsl-vr11/Makefile -index 8284cba9a7..11f96d744a 100644 +index 8284cba..11f96d7 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr11/Makefile +++ b/package/kernel/lantiq/ltq-vdsl-vr11/Makefile @@ -23,6 +23,7 @@ PKG_LICENSE:=GPL-2.0 BSD-2-Clause @@ -77,5 +77,5 @@ index 8284cba9a7..11f96d744a 100644 include $(INCLUDE_DIR)/package.mk -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0003-toolchain-add-mold-as-additional-linker.patch b/openwrt/patch/openwrt-6.x/mold/0003-toolchain-add-mold-as-additional-linker.patch index a53e07e98..819280982 100644 --- a/openwrt/patch/openwrt-6.x/mold/0003-toolchain-add-mold-as-additional-linker.patch +++ b/openwrt/patch/openwrt-6.x/mold/0003-toolchain-add-mold-as-additional-linker.patch @@ -1,4 +1,4 @@ -From a667acae2ed1d0a99a52e07916b01f42bc9f8f9d Mon Sep 17 00:00:00 2001 +From 6a9bd83f7b3f513bebb142ef07392cf5ed218a65 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 27 Jan 2023 17:53:02 +0100 Subject: [PATCH 3/8] toolchain: add mold as additional linker @@ -13,7 +13,7 @@ Signed-off-by: Andre Heider create mode 100644 toolchain/mold/Makefile diff --git a/toolchain/Makefile b/toolchain/Makefile -index c0046293c9..09c16f72a7 100644 +index c004629..09c16f7 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@ index c0046293c9..09c16f72a7 100644 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) diff --git a/toolchain/mold/Makefile b/toolchain/mold/Makefile new file mode 100644 -index 0000000000..a2acba89d3 +index 0000000..a2acba8 --- /dev/null +++ b/toolchain/mold/Makefile @@ -0,0 +1,22 @@ @@ -54,5 +54,5 @@ index 0000000000..a2acba89d3 + +$(eval $(call HostBuild)) -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0004-tools-add-mold-a-modern-linker.patch b/openwrt/patch/openwrt-6.x/mold/0004-tools-add-mold-a-modern-linker.patch index 64a2ddbc9..d9a61ac29 100644 --- a/openwrt/patch/openwrt-6.x/mold/0004-tools-add-mold-a-modern-linker.patch +++ b/openwrt/patch/openwrt-6.x/mold/0004-tools-add-mold-a-modern-linker.patch @@ -1,4 +1,4 @@ -From a500032a30152630e058c3ee6afbbe787325db43 Mon Sep 17 00:00:00 2001 +From 5c32e0a110bd6269136ff90ade852c783d169ecf Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 27 Jan 2023 17:53:02 +0100 Subject: [PATCH 4/8] tools: add mold, a modern linker @@ -19,10 +19,10 @@ Signed-off-by: Andre Heider create mode 100644 tools/mold/Makefile diff --git a/tools/Makefile b/tools/Makefile -index 40c3ec1ab0..bf525d34a0 100644 +index feae919..231706c 100644 --- a/tools/Makefile +++ b/tools/Makefile -@@ -83,6 +83,7 @@ tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_tegra),y) += cbootimage +@@ -84,6 +84,7 @@ tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_tegra),y) += cbootimage tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USES_MINOR),y) += kernel2minor tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USE_SPARSE),y) += sparse tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USE_LLVM_BUILD),y) += llvm-bpf @@ -30,7 +30,7 @@ index 40c3ec1ab0..bf525d34a0 100644 # builddir dependencies $(curdir)/autoconf/compile := $(curdir)/m4/compile -@@ -114,6 +115,7 @@ $(curdir)/meson/compile := $(curdir)/ninja/compile +@@ -115,6 +116,7 @@ $(curdir)/meson/compile := $(curdir)/ninja/compile $(curdir)/missing-macros/compile := $(curdir)/autoconf/compile $(curdir)/mkimage/compile += $(curdir)/bison/compile $(curdir)/libressl/compile $(curdir)/mklibs/compile := $(curdir)/libtool/compile @@ -40,7 +40,7 @@ index 40c3ec1ab0..bf525d34a0 100644 $(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile diff --git a/tools/mold/Makefile b/tools/mold/Makefile new file mode 100644 -index 0000000000..e8fcecbfed +index 0000000..e8fcecb --- /dev/null +++ b/tools/mold/Makefile @@ -0,0 +1,22 @@ @@ -67,5 +67,5 @@ index 0000000000..e8fcecbfed + +$(eval $(call HostBuild)) -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0005-build-replace-SSTRIP_ARGS-with-SSTRIP_DISCARD_TRAILI.patch b/openwrt/patch/openwrt-6.x/mold/0005-build-replace-SSTRIP_ARGS-with-SSTRIP_DISCARD_TRAILI.patch index 13fae5050..d4554926d 100644 --- a/openwrt/patch/openwrt-6.x/mold/0005-build-replace-SSTRIP_ARGS-with-SSTRIP_DISCARD_TRAILI.patch +++ b/openwrt/patch/openwrt-6.x/mold/0005-build-replace-SSTRIP_ARGS-with-SSTRIP_DISCARD_TRAILI.patch @@ -1,4 +1,4 @@ -From 55d51626b8a3fd48a980e5d033ecdbef071137c4 Mon Sep 17 00:00:00 2001 +From 9cadac681ca14daeb97a8ebfaa32d13c0a375ff2 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 28 Jan 2023 21:16:16 +0100 Subject: [PATCH 5/8] build: replace SSTRIP_ARGS with @@ -16,7 +16,7 @@ Signed-off-by: Andre Heider 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/Config-build.in b/config/Config-build.in -index fe16d81d36..a96ed2f63b 100644 +index fe16d81..a96ed2f 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -190,7 +190,6 @@ menu "Global build settings" @@ -46,7 +46,7 @@ index fe16d81d36..a96ed2f63b 100644 config STRIP_KERNEL_EXPORTS bool "Strip unnecessary exports from the kernel image" diff --git a/rules.mk b/rules.mk -index 58c53705a2..c768ccc9b3 100644 +index 58c5370..c768ccc 100644 --- a/rules.mk +++ b/rules.mk @@ -325,7 +325,7 @@ else @@ -59,5 +59,5 @@ index 58c53705a2..c768ccc9b3 100644 endif RSTRIP= \ -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0006-config-add-a-knob-to-use-the-mold-linker-for-package.patch b/openwrt/patch/openwrt-6.x/mold/0006-config-add-a-knob-to-use-the-mold-linker-for-package.patch index 878fefc14..825d61c40 100644 --- a/openwrt/patch/openwrt-6.x/mold/0006-config-add-a-knob-to-use-the-mold-linker-for-package.patch +++ b/openwrt/patch/openwrt-6.x/mold/0006-config-add-a-knob-to-use-the-mold-linker-for-package.patch @@ -1,4 +1,4 @@ -From 9826d03b0c6829bf72f11a2eed85fc07abaf3f67 Mon Sep 17 00:00:00 2001 +From 9494bba487dc290f0fa3cf51f3deac8ea4bd8080 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 27 Jan 2023 17:13:15 +0100 Subject: [PATCH 6/8] config: add a knob to use the mold linker for packages @@ -16,7 +16,7 @@ Signed-off-by: Andre Heider create mode 100755 config/check-hostcxx.sh diff --git a/config/Config-build.in b/config/Config-build.in -index a96ed2f63b..ebfce8add4 100644 +index a96ed2f..ebfce8a 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -167,6 +167,19 @@ menu "Global build settings" @@ -50,7 +50,7 @@ index a96ed2f63b..ebfce8add4 100644 Use sstrip's -z option to discard trailing zero bytes diff --git a/config/check-hostcxx.sh b/config/check-hostcxx.sh new file mode 100755 -index 0000000000..442f4cfb40 +index 0000000..442f4cf --- /dev/null +++ b/config/check-hostcxx.sh @@ -0,0 +1,12 @@ @@ -67,5 +67,5 @@ index 0000000000..442f4cfb40 +EOF +[ $? -eq 0 ] && echo y || echo n -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0007-rules-prepare-to-use-different-linkers.patch b/openwrt/patch/openwrt-6.x/mold/0007-rules-prepare-to-use-different-linkers.patch index be0e82c96..4bf03ed2d 100644 --- a/openwrt/patch/openwrt-6.x/mold/0007-rules-prepare-to-use-different-linkers.patch +++ b/openwrt/patch/openwrt-6.x/mold/0007-rules-prepare-to-use-different-linkers.patch @@ -1,4 +1,4 @@ -From 2741764fdd20c3f2d0ceaa5f9206f83182305de8 Mon Sep 17 00:00:00 2001 +From 8086e16507bf6e510c01f616a07282632bd97897 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 27 Jan 2023 16:32:31 +0100 Subject: [PATCH 7/8] rules: prepare to use different linkers @@ -13,7 +13,7 @@ Signed-off-by: Andre Heider 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rules.mk b/rules.mk -index c768ccc9b3..ca27583d27 100644 +index c768ccc..ca27583 100644 --- a/rules.mk +++ b/rules.mk @@ -211,6 +211,10 @@ ifndef DUMP @@ -45,5 +45,5 @@ index c768ccc9b3..ca27583d27 100644 CC="$(TARGET_CC)" \ GCC="$(TARGET_CC)" \ -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/openwrt-6.x/mold/0008-tools-mold-update-to-2.30.0.patch b/openwrt/patch/openwrt-6.x/mold/0008-tools-mold-update-to-2.32.1.patch similarity index 72% rename from openwrt/patch/openwrt-6.x/mold/0008-tools-mold-update-to-2.30.0.patch rename to openwrt/patch/openwrt-6.x/mold/0008-tools-mold-update-to-2.32.1.patch index ec16164e2..796be63b3 100644 --- a/openwrt/patch/openwrt-6.x/mold/0008-tools-mold-update-to-2.30.0.patch +++ b/openwrt/patch/openwrt-6.x/mold/0008-tools-mold-update-to-2.32.1.patch @@ -1,7 +1,7 @@ -From 7273b6009d71769f8d8e5e9cb475ee7f65385573 Mon Sep 17 00:00:00 2001 +From b9575ea4cfe2acf4e7e19635f7bf6a5a40ea75ca Mon Sep 17 00:00:00 2001 From: sbwml -Date: Wed, 1 May 2024 07:07:01 +0800 -Subject: [PATCH 8/8] tools/mold: update to 2.30.0 +Date: Wed, 17 Jul 2024 08:51:39 +0800 +Subject: [PATCH 8/8] tools/mold: update to 2.32.1 Signed-off-by: sbwml --- @@ -9,7 +9,7 @@ Signed-off-by: sbwml 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/mold/Makefile b/tools/mold/Makefile -index e8fcecbfed..8effd08aa1 100644 +index e8fcecb..f6efb80 100644 --- a/tools/mold/Makefile +++ b/tools/mold/Makefile @@ -3,12 +3,11 @@ @@ -17,17 +17,17 @@ index e8fcecbfed..8effd08aa1 100644 PKG_NAME:=mold -PKG_VERSION:=1.11.0 -+PKG_VERSION:=2.31.0 ++PKG_VERSION:=2.32.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL_FILE:=v$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/rui314/mold/archive/refs/tags -PKG_HASH:=99318eced81b09a77e4c657011076cc8ec3d4b6867bd324b8677974545bc4d6f +PKG_SOURCE_URL:=https://codeload.github.com/rui314/mold/tar.gz/v$(PKG_VERSION)? -+PKG_HASH:=3dc3af83a5d22a4b29971bfad17261851d426961c665480e2ca294e5c74aa1e5 ++PKG_HASH:=f3c9a527d884c635834fe7d79b3de959b00783bf9446280ea274d996f0335825 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk -- -2.39.3 +2.43.5 diff --git a/openwrt/patch/vim/0001-vim-fix-renamed-defaults-config-file.patch b/openwrt/patch/vim/0001-vim-fix-renamed-defaults-config-file.patch new file mode 100644 index 000000000..ef77c7087 --- /dev/null +++ b/openwrt/patch/vim/0001-vim-fix-renamed-defaults-config-file.patch @@ -0,0 +1,75 @@ +From 7388298a7c008c1b999ae3f819ad6308738ea733 Mon Sep 17 00:00:00 2001 +From: Leonard de Vries +Date: Thu, 21 Sep 2023 09:40:12 +0200 +Subject: [PATCH] vim: fix renamed defaults config file + +Since vim version 9 the config file has been renamed from vimrc to defaults.vim. +The syntax also has been changed however this new version is not the default, +therefore the config doesn't need a change. + +Signed-off-by: Leonard de Vries +--- + utils/vim/Makefile | 10 +++++----- + utils/vim/files/{vimrc => defaults.vim} | 0 + utils/vim/files/{vimrc.full => defaults.vim.full} | 0 + 3 files changed, 5 insertions(+), 5 deletions(-) + rename utils/vim/files/{vimrc => defaults.vim} (100%) + rename utils/vim/files/{vimrc.full => defaults.vim.full} (100%) + +diff --git a/utils/vim/Makefile b/utils/vim/Makefile +index 125acbf99..59ae674fa 100644 +--- a/utils/vim/Makefile ++++ b/utils/vim/Makefile +@@ -73,12 +73,12 @@ define Package/xxd + endef + + define Package/vim-full/conffiles +-/usr/share/vim/vimrc ++/usr/share/vim/defaults.vim + /root/.vimrc + endef + + define Package/vim/conffiles +-/usr/share/vim/vimrc ++/usr/share/vim/defaults.vim + /root/.vimrc + endef + +@@ -208,7 +208,7 @@ define Package/vim/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_tiny $(1)/usr/bin/vim + $(INSTALL_DIR) $(1)/usr/share/vim +- $(INSTALL_CONF) ./files/vimrc $(1)/usr/share/vim/ ++ $(INSTALL_CONF) ./files/defaults.vim $(1)/usr/share/vim/ + endef + + define Package/vim-full/install +@@ -216,7 +216,7 @@ define Package/vim-full/install + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_normal $(1)/usr/bin/vim + $(INSTALL_DIR) $(1)/usr/share/vim + $(LN) vim $(1)/usr/bin/vimdiff +- $(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc ++ $(INSTALL_CONF) ./files/defaults.vim.full $(1)/usr/share/vim/defaults.vim + endef + + +@@ -226,7 +226,7 @@ define Package/vim-fuller/install + $(INSTALL_DIR) $(1)/usr/share/vim + $(LN) vim $(1)/usr/bin/vimdiff + $(CP) $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER) $(1)/usr/share/vim +- $(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc ++ $(INSTALL_CONF) ./files/defaults.vim.full $(1)/usr/share/vim/defaults.vim + endef + + +diff --git a/utils/vim/files/vimrc b/utils/vim/files/defaults.vim +similarity index 100% +rename from utils/vim/files/vimrc +rename to utils/vim/files/defaults.vim +diff --git a/utils/vim/files/vimrc.full b/utils/vim/files/defaults.vim.full +similarity index 100% +rename from utils/vim/files/vimrc.full +rename to utils/vim/files/defaults.vim.full +-- +2.43.5 + diff --git a/openwrt/scripts/05-fix-source.sh b/openwrt/scripts/05-fix-source.sh index 3f0fa00a3..abbb0f49f 100644 --- a/openwrt/scripts/05-fix-source.sh +++ b/openwrt/scripts/05-fix-source.sh @@ -96,7 +96,7 @@ sed -i 's/bind interfaces only = yes/bind interfaces only = no/g' feeds/packages # vim - fix E1187: Failed to source defaults.vim pushd feeds/packages - curl -s https://github.com/openwrt/packages/commit/699d3fbee266b676e21b7ed310471c0ed74012c9.patch | patch -p1 + curl -s https://$mirror/openwrt/patch/vim/0001-vim-fix-renamed-defaults-config-file.patch | patch -p1 popd # bpf - add host clang-15/17 support diff --git a/tags/v23 b/tags/v23 index b60f5255e..fb51fde99 100644 --- a/tags/v23 +++ b/tags/v23 @@ -1 +1 @@ -23.05.3 +23.05.4