Hi,
I have checked out linux-4.4.y branch, and executed this:
$ python2 gentree.py --integrate ~/repos/linux/next/
~/repos/linux/torvalds/ --clean --gitdebug --git-revision v4.4.53
--verbose
My torvalds dir is reset to v3.19. It seems it goes more or less well,
but it fails at three points:
1) Failed to process SmPL patch
collateral-evolutions/network/0027-genl-const/genl-const.cocci:
Failed to process SmPL patch
collateral-evolutions/network/0027-genl-const/genl-const.cocci
Traceback (most recent call last):
File "gentree.py", line 1091, in <module>
ret = _main()
File "gentree.py", line 724, in _main
logwrite=logwrite)
File "gentree.py", line 906, in process
apply_patches(args, "backport", source_dir, 'patches',
bpid.target_dir, logwrite)
File "gentree.py", line 605, in apply_patches
raise Exception('SmPL patch failed')
Exception: SmPL patch failed
Running coccinelle results in this:
[zeta@laptop ~/repos/backports]$ ./devel/pycocci
patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
~/repos/linux/torvalds/backports/
spatch --sp-file
patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
--in-place --recursive-includes --relax-include-path --use-coccigrep
--timeout 120 --dir /home/zeta/repos/linux/torvalds/backports/ -max 4
-index 0
spatch --sp-file
patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
--in-place --recursive-includes --relax-include-path --use-coccigrep
--timeout 120 --dir /home/zeta/repos/linux/torvalds/backports/ -max 4
-index 1
spatch --sp-file
patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
--in-place --recursive-includes --relax-include-path --use-coccigrep
--timeout 120 --dir /home/zeta/repos/linux/torvalds/backports/ -max 4
-index 2
spatch --sp-file
patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
--in-place --recursive-includes --relax-include-path --use-coccigrep
--timeout 120 --dir /home/zeta/repos/linux/torvalds/backports/ -max 4
-index 3
Failed to apply changes from genl-const.cocci
Specific log output from change that failed using genl-const.cocci
init_defs_builtins: /usr/lib/coccinelle/standard.h
plus: parse error:
File "patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci",
line 6, column 1, charpos = 68
around = '__genl_const',
whole content = +__genl_const struct genl_multicast_group
Full log using genl-const.cocci
init_defs_builtins: /usr/lib/coccinelle/standard.h
plus: parse error:
File "patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci",
line 6, column 1, charpos = 68
around = '__genl_const',
whole content = +__genl_const struct genl_multicast_group
2) The Makefile patch doesn't apply, namely:
integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch.
The resolution was fairly easy.
3) The BACKPORT_BP_MODULES symbol is problematic:
scripts/kconfig/mconf Kconfig
backports//compat/Kconfig:57: symbol 'BACKPORT_BP_MODULES' redefines
option 'modules' already defined by symbol 'MODULES'
make[1]: *** [scripts/kconfig/Makefile:24: menuconfig] Error 1
make: *** [Makefile:543: menuconfig] Error 2
Any ideas on why I get all of these? Is it that v3.19 is not supported
by the 4.4.y branch ?
Thanks!
--
Ezequiel García, VanguardiaSur
www.vanguardiasur.com.ar
--
To unsubscribe from this list: send the line "unsubscribe backports" in
