Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Jul 17, 2024
2 parents 98b5f38 + 4633679 commit 4589c40
Show file tree
Hide file tree
Showing 19 changed files with 146 additions and 68 deletions.
Original file line number Diff line number Diff line change
@@ -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 <cnsztl@immortalwrt.org>
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
Expand All @@ -16,10 +16,10 @@ Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
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.

Expand All @@ -37,5 +37,5 @@ index c1bc798..328a349 100644
bool "Reduce debugging information"
default y
--
2.34.8
2.43.5

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1ef366ede35af39fab592543f3d9faa63f90ecb8 Mon Sep 17 00:00:00 2001
From 79765552324d8c08e31e7ab80a53b1a29654d473 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
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.
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 565a2dcf90271ab7494c744a20f21097f60de0b8 Mon Sep 17 00:00:00 2001
From 59e101ebf7ac9ffe7b9dfd82a6e41050dbc5d13f Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
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 <admin@cooluc.com>
---
Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <carlosmf.pt@gmail.com>
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
Expand Down Expand Up @@ -87,3 +87,6 @@ index f9f8ac9..8066e35 100644
$(eval $(call BuildPackage,libstdcpp))
$(eval $(call BuildPackage,libasan))
$(eval $(call BuildPackage,libtsan))
--
2.43.5

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From af683d8e4a586ad454224d2c67757e71361c4a3a Mon Sep 17 00:00:00 2001
From 42f9a52f66ef69a0085055facf8a14cab3f279ce Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
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 <admin@cooluc.com>
---
Expand All @@ -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

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8efa075165c3ebb21cb0f7d4eea155b337e60b09 Mon Sep 17 00:00:00 2001
From 3f003e591567a7640b2d61f0bffc11ac9ff7c7dc Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
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 <admin@cooluc.com>
---
Expand Down Expand Up @@ -111,5 +111,5 @@ index b8a1479..408bf2f 100644

define Kernel/Configure/Default
--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2d904d33f186881bfd14aec41a72e3e29004842a Mon Sep 17 00:00:00 2001
From 910f99cb7ede0303321b1062507681685b660925 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
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

Expand All @@ -12,10 +12,10 @@ Signed-off-by: sbwml <admin@cooluc.com>
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.

Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Fri, 27 Jan 2023 16:35:46 +0100
Subject: [PATCH 1/8] build: add support to use the mold linker for packages
Expand All @@ -12,10 +12,10 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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
Expand All @@ -28,5 +28,5 @@ index c391d320aa..1791d6d9d4 100644
include $(INCLUDE_DIR)/hardening.mk
include $(INCLUDE_DIR)/prereq.mk
--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Fri, 27 Jan 2023 18:22:43 +0100
Subject: [PATCH 2/8] treewide: opt-out of tree-wide mold usage
Expand All @@ -15,10 +15,10 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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?=
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -77,5 +77,5 @@ index 8284cba9a7..11f96d744a 100644
include $(INCLUDE_DIR)/package.mk

--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Fri, 27 Jan 2023 17:53:02 +0100
Subject: [PATCH 3/8] toolchain: add mold as additional linker
Expand All @@ -13,7 +13,7 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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 @@
Expand All @@ -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 @@
Expand All @@ -54,5 +54,5 @@ index 0000000000..a2acba89d3
+
+$(eval $(call HostBuild))
--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Fri, 27 Jan 2023 17:53:02 +0100
Subject: [PATCH 4/8] tools: add mold, a modern linker
Expand All @@ -19,18 +19,18 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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
+tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USE_MOLD),y) += mold

# 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
Expand All @@ -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 @@
Expand All @@ -67,5 +67,5 @@ index 0000000000..e8fcecbfed
+
+$(eval $(call HostBuild))
--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Sat, 28 Jan 2023 21:16:16 +0100
Subject: [PATCH 5/8] build: replace SSTRIP_ARGS with
Expand All @@ -16,7 +16,7 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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"
Expand Down Expand Up @@ -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
Expand All @@ -59,5 +59,5 @@ index 58c53705a2..c768ccc9b3 100644
endif
RSTRIP= \
--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Fri, 27 Jan 2023 17:13:15 +0100
Subject: [PATCH 6/8] config: add a knob to use the mold linker for packages
Expand All @@ -16,7 +16,7 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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"
Expand Down Expand Up @@ -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 @@
Expand All @@ -67,5 +67,5 @@ index 0000000000..442f4cfb40
+EOF
+[ $? -eq 0 ] && echo y || echo n
--
2.39.3
2.43.5

Original file line number Diff line number Diff line change
@@ -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 <a.heider@gmail.com>
Date: Fri, 27 Jan 2023 16:32:31 +0100
Subject: [PATCH 7/8] rules: prepare to use different linkers
Expand All @@ -13,7 +13,7 @@ Signed-off-by: Andre Heider <a.heider@gmail.com>
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
Expand Down Expand Up @@ -45,5 +45,5 @@ index c768ccc9b3..ca27583d27 100644
CC="$(TARGET_CC)" \
GCC="$(TARGET_CC)" \
--
2.39.3
2.43.5

Loading

0 comments on commit 4589c40

Please sign in to comment.