Signed-off-by: Thomas Pedersen <thomas@xxxxxxxxxxxx> --- .../0001-enable-backports-built-in.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 integration-patches/5.4/0001-enable-backports/0001-enable-backports-built-in.patch diff --git a/integration-patches/5.4/0001-enable-backports/0001-enable-backports-built-in.patch b/integration-patches/5.4/0001-enable-backports/0001-enable-backports-built-in.patch new file mode 100644 index 000000000000..f086e5412672 --- /dev/null +++ b/integration-patches/5.4/0001-enable-backports/0001-enable-backports-built-in.patch @@ -0,0 +1,40 @@ +diff --git a/Makefile b/Makefile +index d4d36c61940b..ad559055bacf 100644 +--- a/Makefile ++++ b/Makefile +@@ -616,6 +616,7 @@ endif + ifeq ($(KBUILD_EXTMOD),) + # Objects we will link into vmlinux / subdirs we need to visit + init-y := init/ ++backports-y := backports/ + drivers-y := drivers/ sound/ + drivers-$(CONFIG_SAMPLES) += samples/ + drivers-$(CONFIG_KERNEL_HEADER_TEST) += include/ +@@ -1017,15 +1018,17 @@ 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) $(virt-y))) + + vmlinux-alldirs := $(sort $(vmlinux-dirs) Documentation \ + $(patsubst %/,%,$(filter %/, $(init-) $(core-) \ +- $(drivers-) $(net-) $(libs-) $(virt-)))) ++ $(drivers-) $(net-) $(libs-) $(virt-) $(backports)))) + + build-dirs := $(vmlinux-dirs) + clean-dirs := $(vmlinux-alldirs) + ++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)) +@@ -1036,7 +1039,7 @@ virt-y := $(patsubst %/, %/built-in.a, $(virt-y)) + + # Externally visible symbols (used by link-vmlinux.sh) + export KBUILD_VMLINUX_OBJS := $(head-y) $(init-y) $(core-y) $(libs-y2) \ +- $(drivers-y) $(net-y) $(virt-y) ++ $(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 -- 2.30.2 -- To unsubscribe from this list: send the line "unsubscribe backports" in
