On 29.10.2014 22:07, Luis R. Rodriguez wrote: > OK a few obvious issues and their status: > > 1) dependencies file does not use BACKPORT_ prefix and as such they > are not mapped correctly, I'm about to address this > 2) some Kconfig files don't get the change: > > -source "foo" > +source "backports/foo" > > This is not allowing them to creep up on integration menuconfig, I'll > look into that next. > > 3) vmlinux build - something is missing on the last step on gentree.py > for integration, this can be observed when using gitdebug, I'm hoping > Stefan can help with this :D Applying the attached patch gets us one step further. We probably need to make these modifications in place instead of pushing them to the end of the Makefile. ~/backports/linux-test-3.15> make -j16 CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CALL scripts/checksyscalls.sh CHK include/generated/compile.h make[3]: `arch/x86/realmode/rm/realmode.bin' is up to date. LINK vmlinux LD vmlinux.o backports/built-in.o:(___ksymtab_gpl+devm_kstrdup+0x0): multiple definition of `__ksymtab_devm_kstrdup' drivers/built-in.o:(___ksymtab_gpl+devm_kstrdup+0x0): first defined here backports/built-in.o: In function `devm_kstrdup': (.text+0x10): multiple definition of `devm_kstrdup' drivers/built-in.o:(.text+0x14c3e0): first defined here make: *** [vmlinux] Error 1 Stefan
diff --git a/Makefile b/Makefile index 692f6e0..55de920 100644 --- a/Makefile +++ b/Makefile @@ -542,6 +542,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \ $(Q)$(MAKE) $(build)=$(@) # 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,6 +821,7 @@ 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 %/, \
