Skip to contentSkip to conversation

Makefile patching error in backport from 5.3 to 4.9.214

PATCH Christian 1 participant 1 message Mar 18, 2020 Kbuild

lore
Share & tools
lore

Christian

author
#0 lore raw

Hi there,

I am just trying to backport wireless drivers from 5.3 to 4.9.214. I thought I start with a clean kernel tree to see how all this works. However when trying to integrate into a kernel-stable tree, I get an error when the makefile is to be changed:

Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Applying patches from integration-patches/ to /root/git/linux-stable/
...
Applying patch 001-enable-backports/0001-enable-backports-built- in.patch

Quoted 5 lines

patching file Makefile
Hunk #1 succeeded at 571 (offset 29 lines).
Hunk #2 FAILED at 821.
Hunk #3 FAILED at 838.
2 out of 3 hunks FAILED -- saving rejects to file Makefile.rej

What I did:
cloned linux-stable:
git clone git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-
stable.git -b v4.9.194

cloned linux-next:
git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-
next.git

cloned linux-backports:
git clone
git://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git
-b linux-5.3.y

Then used:
./gentree.py --copy-list ./copy-list --verbose --integrate --clean -- git-revision v5.3 ~/linux-next ~/linux-stable

Apparently the patch created by gentree does not fit to the makefile. I can amend it by hand, however this seems to be an error in the used patch?
Anyone know what to do?

Kind Regards
Chris

Makefile.rej content:

Makefile +0 -0
@@ -821,13 +822,16 @@ core-y		+= kernel/ 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)))

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-))))

+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))
@@ -838,7 +842,7 @@ libs-y := $(libs-y1) $(libs-y2)

# 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_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
export LDFLAGS_vmlinux

 # used by scripts/pacmage/Makefile

--
To unsubscribe from this list: send the line "unsubscribe backports" in