From: Thomas Pedersen <thomas@xxxxxxxxxxx> This was refreshed on Linux v5-10.42. Signed-off-by: Thomas Pedersen <thomas@xxxxxxxxxxxx> --- .../0001-enable-backports-built-in.patch | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch b/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch index d66b203d0d07..35765ed113eb 100644 --- a/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch +++ b/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch @@ -1,40 +1,36 @@ -Allow backports to be integrated into vmlinux. - diff --git a/Makefile b/Makefile -index 6d1e304..de26b18 100644 +index e5d41b6792d7..cdd600bda9d1 100644 --- a/Makefile +++ b/Makefile -@@ -542,6 +542,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \ - $(Q)$(MAKE) $(build)=$(@) +@@ -594,6 +594,7 @@ export KBUILD_MODULES KBUILD_BUILTIN + ifeq ($(KBUILD_EXTMOD),) # Objects we will link into vmlinux / subdirs we need to visit +backports-y := backports/ init-y := init/ drivers-y := drivers/ sound/ firmware/ net-y := net/ -@@ -820,13 +821,16 @@ core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ +@@ -989,11 +990,13 @@ core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ + $(backports-y) $(backports-m) \ - $(net-y) $(net-m) $(libs-y) $(libs-m))) + $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y))) vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \ - $(init-n) $(init-) \ - $(core-n) $(core-) $(drivers-n) $(drivers-) \ -+ $(backports-n) $(backports-) \ - $(net-n) $(net-) $(libs-n) $(libs-)))) +- $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-)))) ++ $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-) $(backports)))) -+backports-y := $(patsubst %/, %/built-in.o, $(backports-y)) - init-y := $(patsubst %/, %/built-in.o, $(init-y)) - core-y := $(patsubst %/, %/built-in.o, $(core-y)) - drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y)) -@@ -837,7 +841,7 @@ libs-y := $(libs-y1) $(libs-y2) ++backports-y := $(patsubst %/, %/built-in.a, $(backports-y)) + init-y := $(patsubst %/, %/built-in.a, $(init-y)) + core-y := $(patsubst %/, %/built-in.a, $(core-y)) + drivers-y := $(patsubst %/, %/built-in.a, $(drivers-y)) +@@ -1004,7 +1007,7 @@ virt-y := $(patsubst %/, %/built-in.a, $(virt-y)) # Externally visible symbols (used by link-vmlinux.sh) export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) --export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) -+export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(backports-y) +-export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y) ++export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y) $(backports-y) + export KBUILD_VMLINUX_LIBS := $(libs-y1) export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds export LDFLAGS_vmlinux - # used by scripts/pacmage/Makefile -- 2.30.2 -- To unsubscribe from this list: send the line "unsubscribe backports" in
