mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
546559587f
Update to the latest upstream version and add a patch that enables pahole
reproducible builds if SOURCE_DATE_EPOCH is defined in the environment.
This patch helps avoid BTF-related module loading problems with packages
built separately from the kernel such as mac80211 or kselftests-bpf, e.g.:
[ 16.858856] BPF: type_id=1185 bits_offset=0
[ 16.859099] BPF:
[ 16.859199] BPF: Invalid name
[ 16.859352] BPF:
[ 16.859612] failed to validate module [cfg80211] BTF: -22
[ 17.015178] PPP generic driver version 2.4.2
[ 17.052703] NET: Registered PF_PPPOX protocol family
[ 17.348722] BPF: type_id=1185 bits_offset=0
[ 17.348912] BPF:
[ 17.348996] BPF: Invalid name
[ 17.349106] BPF:
[ 17.349220] failed to validate module [cfg80211] BTF: -22
[ 17.472070] kmodloader: 3 modules could not be probed
[ 17.473133] kmodloader: - cfg80211 - 0
[ 17.473762] kmodloader: dependency not loaded cfg80211
[ 17.474421] kmodloader: - mac80211 - 1
[ 17.474988] kmodloader: dependency not loaded mac80211
[ 17.475632] kmodloader: dependency not loaded cfg80211
[ 17.476263] kmodloader: - mac80211_hwsim - 2
root@OpenWrt:/usr/libexec/kselftests-bpf# insmod bpf_testmod.ko
[ 4735.776792] missing module BTF, cannot register kfuncs
[ 4735.777371] missing module BTF, cannot register kfuncs
[ 4735.777955] missing module BTF, cannot register kfuncs
[ 4735.778452] missing module BTF, cannot register kfuncs
Release Notes: https://lore.kernel.org/bpf/ZmjBHWw-Q5hKBiwA@x1/
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/15697
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
13 lines
306 B
Diff
13 lines
306 B
Diff
--- a/pahole.c
|
|
+++ b/pahole.c
|
|
@@ -3723,6 +3723,9 @@ int main(int argc, char *argv[])
|
|
goto out;
|
|
}
|
|
|
|
+ if (getenv("SOURCE_DATE_EPOCH") || getenv("KBUILD_BUILD_TIMESTAMP"))
|
|
+ conf_load.reproducible_build = true;
|
|
+
|
|
if (dwarves__init()) {
|
|
fputs("pahole: insufficient memory\n", stderr);
|
|
goto out;
|