* Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
@ 2018-05-08 3:05 Masashi Honma
2018-05-08 9:09 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-08 3:05 UTC (permalink / raw)
To: backports
I am trying to backport from Linux 4.4 drivers to Linux 3.10.108 with
backports.
These are my commands.
----
$ cd ~/git
$ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
$ cd ~/git
$ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
$ cd linux-stable
$ git checkout v3.10.108
$ cd ~/git
$ git clone
git://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git
$ cd backports
$ git checkout linux-4.4.y
$ ./gentree.py --copy-list ./copy-list --integrate --clean
--git-revision v4.4 ~/git/linux-next ~/git/linux-stable
----
The gentree.py command resulted in these messages.
----
Get original source files from git ...
Applying patches from patches to /home/honma/git/linux-stable/backports/ ...
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
----
Is this caused by my invalid procedure ?
If so, please tell me right way.
Regards,
Masashi Honma.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-08 9:09 ` Johannes Berg
@ 2018-05-08 8:53 ` Masashi Honma
2018-05-08 9:08 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-08 8:53 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
On 2018/05/08 18:09, Johannes Berg wrote:
> On Tue, 2018-05-08 at 12:05 +0900, Masashi Honma wrote:
>> I am trying to backport from Linux 4.4
>
> This will probably not work unless you use an old backports git tree
> snapshot.
Thank you.
I am using linux-4.4.y branch of backports.
Do you mean older branch (like linux-4.2.y or linux-3.19.y or something)
should be used ?
> No, looks fine - perhaps your spatch version isn't right? What version
> do you have,
I am using a spatch binary build with latest git source because the
package is not enough fresh to build the backports. The version is this.
commit f9d474787c57f1d3cc3a73217e0f5d14ed958631
Author: julia <julia.lawall@lip6.fr>
Date: Mon Apr 30 08:10:06 2018 +0200
make pragmas more flexible, improve positioning of eoln when pragma
at the end of a file
> and what does it say if you run
>
> mkdir /tmp/xyz && spatch --sp-file .../genl-const.cocci --dir /tmp/xyz
>
> or something like that?
This is the result.
------------------
$ mkdir /tmp/xyz && spatch --sp-file
./patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
--dir /tmp/xyz
init_defs_builtins: /usr/local/bin/../lib/coccinelle/standard.h
meta: parse error:
File
"./patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci",
line 2, column 10, charpos = 13
around = '__genl_const',
whole content = attribute __genl_const;
------------------
Regards,
Masashi Honma.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-08 8:53 ` Masashi Honma
@ 2018-05-08 9:08 ` Johannes Berg
2018-05-08 21:42 ` Masashi Honma
0 siblings, 1 reply; 18+ messages in thread
From: Johannes Berg @ 2018-05-08 9:08 UTC (permalink / raw)
To: Masashi Honma; +Cc: backports
On Tue, 2018-05-08 at 17:53 +0900, Masashi Honma wrote:
> I am using linux-4.4.y branch of backports.
> Do you mean older branch (like linux-4.2.y or linux-3.19.y or something)
> should be used ?
No, that should be OK then.
> > No, looks fine - perhaps your spatch version isn't right? What version
> > do you have,
>
> I am using a spatch binary build with latest git source because the
> package is not enough fresh to build the backports. The version is this.
>
> commit f9d474787c57f1d3cc3a73217e0f5d14ed958631
> Author: julia <julia.lawall@lip6.fr>
> Date: Mon Apr 30 08:10:06 2018 +0200
>
> make pragmas more flexible, improve positioning of eoln when pragma
> at the end of a file
>
> > and what does it say if you run
> >
> > mkdir /tmp/xyz && spatch --sp-file .../genl-const.cocci --dir /tmp/xyz
> >
> > or something like that?
>
> This is the result.
>
> ------------------
> $ mkdir /tmp/xyz && spatch --sp-file
> ./patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci
> --dir /tmp/xyz
> init_defs_builtins: /usr/local/bin/../lib/coccinelle/standard.h
> meta: parse error:
> File
> "./patches/collateral-evolutions/network/0027-genl-const/genl-const.cocci",
> line 2, column 10, charpos = 13
> around = '__genl_const',
> whole content = attribute __genl_const;
> ------------------
Yeah, thought so. You actually need to change the syntax here a bit, I
don't remember but you can search the mailing list here for the details.
Look for "Parse error with genl-const.cocci".
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-08 3:05 Failed to backport from from Linux 4.4 drivers to Linux 3.10.108 Masashi Honma
@ 2018-05-08 9:09 ` Johannes Berg
2018-05-08 8:53 ` Masashi Honma
0 siblings, 1 reply; 18+ messages in thread
From: Johannes Berg @ 2018-05-08 9:09 UTC (permalink / raw)
To: Masashi Honma, backports
On Tue, 2018-05-08 at 12:05 +0900, Masashi Honma wrote:
> I am trying to backport from Linux 4.4
This will probably not work unless you use an old backports git tree
snapshot.
> The gentree.py command resulted in these messages.
> ----
> Get original source files from git ...
> Applying patches from patches to /home/honma/git/linux-stable/backports/ ...
> 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
Then again, this shouldn't happen.
> Is this caused by my invalid procedure ?
> If so, please tell me right way.
No, looks fine - perhaps your spatch version isn't right? What version
do you have, and what does it say if you run
mkdir /tmp/xyz && spatch --sp-file .../genl-const.cocci --dir /tmp/xyz
or something like that?
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-08 9:08 ` Johannes Berg
@ 2018-05-08 21:42 ` Masashi Honma
2018-05-09 7:21 ` Masashi Honma
0 siblings, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-08 21:42 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
On 2018/05/08 18:08, Johannes Berg wrote:
> Yeah, thought so. You actually need to change the syntax here a bit, I
> don't remember but you can search the mailing list here for the details.
> Look for "Parse error with genl-const.cocci".
Thank you.
It looks regression of latest(1.0.6+) coccinelle.
This works with coccinelle 1.0.4.
Regards,
Masashi Honma.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-08 21:42 ` Masashi Honma
@ 2018-05-09 7:21 ` Masashi Honma
2018-05-09 7:24 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-09 7:21 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
On 2018/05/09 06:42, Masashi Honma wrote:> It looks regression of
latest(1.0.6+) coccinelle.
> This works with coccinelle 1.0.4.
I asked about this to coccinelle.
https://github.com/coccinelle/coccinelle/issues/135
julia says this notation is deprecated from 1.0.6.
@@
attribute __genl_const;
@@
from 1.0.6, "name" field is required.
@@
attribute name __genl_const;
@@
The coccinelle made a backward incompatible change...
Regards,
Masashi Honma.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 7:21 ` Masashi Honma
@ 2018-05-09 7:24 ` Johannes Berg
2018-05-09 7:54 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Johannes Berg @ 2018-05-09 7:24 UTC (permalink / raw)
To: Masashi Honma; +Cc: backports
On Wed, 2018-05-09 at 16:21 +0900, Masashi Honma wrote:
> On 2018/05/09 06:42, Masashi Honma wrote:> It looks regression of
> latest(1.0.6+) coccinelle.
> > This works with coccinelle 1.0.4.
>
> I asked about this to coccinelle.
>
> https://github.com/coccinelle/coccinelle/issues/135
>
> julia says this notation is deprecated from 1.0.6.
>
> @@
> attribute __genl_const;
> @@
>
> from 1.0.6, "name" field is required.
>
> @@
> attribute name __genl_const;
> @@
>
> The coccinelle made a backward incompatible change...
Yes, I'm aware.
Just don't know how to solve it :)
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 7:24 ` Johannes Berg
@ 2018-05-09 7:54 ` Johannes Berg
2018-05-09 8:07 ` Masashi Honma
0 siblings, 1 reply; 18+ messages in thread
From: Johannes Berg @ 2018-05-09 7:54 UTC (permalink / raw)
To: Masashi Honma; +Cc: backports
On Wed, 2018-05-09 at 09:24 +0200, Johannes Berg wrote:
> On Wed, 2018-05-09 at 16:21 +0900, Masashi Honma wrote:
> > On 2018/05/09 06:42, Masashi Honma wrote:> It looks regression of
> > latest(1.0.6+) coccinelle.
> > > This works with coccinelle 1.0.4.
> >
> > I asked about this to coccinelle.
> >
> > https://github.com/coccinelle/coccinelle/issues/135
> >
> > julia says this notation is deprecated from 1.0.6.
> >
> > @@
> > attribute __genl_const;
> > @@
> >
> > from 1.0.6, "name" field is required.
> >
> > @@
> > attribute name __genl_const;
> > @@
> >
> > The coccinelle made a backward incompatible change...
>
> Yes, I'm aware.
>
> Just don't know how to solve it :)
Actually, since 1.0.6 has hit the distros, I'll just solve it by
requiring 1.0.6 and changing the spatch.
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 7:54 ` Johannes Berg
@ 2018-05-09 8:07 ` Masashi Honma
2018-05-09 8:12 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-09 8:07 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
On 2018/05/09 16:54, Johannes Berg wrote:
> Actually, since 1.0.6 has hit the distros, I'll just solve it by
> requiring 1.0.6 and changing the spatch.
Great !
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 8:07 ` Masashi Honma
@ 2018-05-09 8:12 ` Johannes Berg
2018-05-09 8:51 ` Masashi Honma
0 siblings, 1 reply; 18+ messages in thread
From: Johannes Berg @ 2018-05-09 8:12 UTC (permalink / raw)
To: Masashi Honma; +Cc: backports
On Wed, 2018-05-09 at 17:07 +0900, Masashi Honma wrote:
> On 2018/05/09 16:54, Johannes Berg wrote:
> > Actually, since 1.0.6 has hit the distros, I'll just solve it by
> > requiring 1.0.6 and changing the spatch.
Though of course this doesn't apply to the older branches :)
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 8:12 ` Johannes Berg
@ 2018-05-09 8:51 ` Masashi Honma
2018-05-09 9:03 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-09 8:51 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
On 2018/05/09 17:12, Johannes Berg wrote:
> Though of course this doesn't apply to the older branches :)
How about setting upper limitation to the older branches by attached patch ?
Masashi Honma.
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 1127 bytes --]
diff --git a/lib/bpreqs.py b/lib/bpreqs.py
index 1325fd2..feef444 100644
--- a/lib/bpreqs.py
+++ b/lib/bpreqs.py
@@ -190,10 +190,11 @@ class Req:
sys.stdout.write("Try installing the package: %s\n" % package_hint)
return False
def coccinelle(self, version):
- if self.require_version('spatch', '--version', version, 2, self.linux_version_cmp):
+ if self.linux_version_cmp('1.0.6', self.req_get_prog_version('spatch', '--version', 2)) == -1 and \
+ self.require_version('spatch', '--version', version, 2, self.linux_version_cmp):
return True
sys.stdout.write("Try installing the package: coccinelle\n")
- sys.stdout.write("If that is too old go grab the code from source:\n\n")
+ sys.stdout.write("If that is less than " + version + " or more than 1.0.6 go grab the code from source:\n\n")
sys.stdout.write("git clone https://github.com/coccinelle/coccinelle.git\n\n")
sys.stdout.write("To build you will need: ocaml ncurses-devel\n\n")
sys.stdout.write("If on SUSE / OpenSUSE you will also need: ocaml-ocamldoc\n\n")
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 8:51 ` Masashi Honma
@ 2018-05-09 9:03 ` Johannes Berg
2018-05-09 9:16 ` Masashi Honma
2018-05-09 9:24 ` Masashi Honma
0 siblings, 2 replies; 18+ messages in thread
From: Johannes Berg @ 2018-05-09 9:03 UTC (permalink / raw)
To: Masashi Honma; +Cc: backports
On Wed, 2018-05-09 at 17:51 +0900, Masashi Honma wrote:
> On 2018/05/09 17:12, Johannes Berg wrote:
> > Though of course this doesn't apply to the older branches :)
>
> How about setting upper limitation to the older branches by attached patch ?
We could also cherry-pick my trivial patch to the older branches I
guess. That'd still be simpler?
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 9:03 ` Johannes Berg
@ 2018-05-09 9:16 ` Masashi Honma
2018-05-09 9:24 ` Masashi Honma
1 sibling, 0 replies; 18+ messages in thread
From: Masashi Honma @ 2018-05-09 9:16 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
2018/5/9 18:03 Johannes Berg <johannes@sipsolutions.net>:
>
> We could also cherry-pick my trivial patch to the older branches I
> guess. That'd still be simpler?
>
> Oh, you already have a plan.
Then drop my plan.
Masashi Honma.
[-- Attachment #2: Type: text/html, Size: 541 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 9:03 ` Johannes Berg
2018-05-09 9:16 ` Masashi Honma
@ 2018-05-09 9:24 ` Masashi Honma
2018-05-09 9:25 ` Johannes Berg
1 sibling, 1 reply; 18+ messages in thread
From: Masashi Honma @ 2018-05-09 9:24 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
On 2018/05/09 18:03, Johannes Berg wrote:
> We could also cherry-pick my trivial patch to the older branches I
> guess. That'd still be simpler?
Oh, you already have a plan.
Then drop my plan.
Masashi Honma.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 9:24 ` Masashi Honma
@ 2018-05-09 9:25 ` Johannes Berg
2018-05-09 14:19 ` Steve deRosier
0 siblings, 1 reply; 18+ messages in thread
From: Johannes Berg @ 2018-05-09 9:25 UTC (permalink / raw)
To: Masashi Honma; +Cc: backports
On Wed, 2018-05-09 at 18:24 +0900, Masashi Honma wrote:
> On 2018/05/09 18:03, Johannes Berg wrote:
> > We could also cherry-pick my trivial patch to the older branches I
> > guess. That'd still be simpler?
>
> Oh, you already have a plan.
> Then drop my plan.
Well, I wasn't really planning on doing it, but I could? :)
I guess it's easy enough though.
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 9:25 ` Johannes Berg
@ 2018-05-09 14:19 ` Steve deRosier
2018-05-09 18:49 ` Arend van Spriel
0 siblings, 1 reply; 18+ messages in thread
From: Steve deRosier @ 2018-05-09 14:19 UTC (permalink / raw)
To: Johannes Berg; +Cc: masashi.honma, backports
On Wed, May 9, 2018 at 2:25 AM Johannes Berg <johannes@sipsolutions.net>
wrote:
> On Wed, 2018-05-09 at 18:24 +0900, Masashi Honma wrote:
> > On 2018/05/09 18:03, Johannes Berg wrote:
> > > We could also cherry-pick my trivial patch to the older branches I
> > > guess. That'd still be simpler?
> >
> > Oh, you already have a plan.
> > Then drop my plan.
> Well, I wasn't really planning on doing it, but I could? :)
> I guess it's easy enough though.
That'd be my vote.
I haven't looked at the docs in a long time - do we note a minimum required
version of coccinelle?
- Steve
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 14:19 ` Steve deRosier
@ 2018-05-09 18:49 ` Arend van Spriel
2018-05-09 19:27 ` Johannes Berg
0 siblings, 1 reply; 18+ messages in thread
From: Arend van Spriel @ 2018-05-09 18:49 UTC (permalink / raw)
To: Steve deRosier, Johannes Berg; +Cc: masashi.honma, backports
On 5/9/2018 4:19 PM, Steve deRosier wrote:
> On Wed, May 9, 2018 at 2:25 AM Johannes Berg <johannes@sipsolutions.net>
> wrote:
>
>> On Wed, 2018-05-09 at 18:24 +0900, Masashi Honma wrote:
>>> On 2018/05/09 18:03, Johannes Berg wrote:
>>>> We could also cherry-pick my trivial patch to the older branches I
>>>> guess. That'd still be simpler?
>>>
>>> Oh, you already have a plan.
>>> Then drop my plan.
>
>> Well, I wasn't really planning on doing it, but I could? :)
>
>> I guess it's easy enough though.
>
>
> That'd be my vote.
>
> I haven't looked at the docs in a long time - do we note a minimum required
> version of coccinelle?
Do we have docs :-p Anyway, the gentree script checks the spatch version
and seems Johannes already took care of the script as well [1]
Gr. AvS
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/commit/?id=98272f479c2126a135dfcb12484e93d5888164ab
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Failed to backport from from Linux 4.4 drivers to Linux 3.10.108
2018-05-09 18:49 ` Arend van Spriel
@ 2018-05-09 19:27 ` Johannes Berg
0 siblings, 0 replies; 18+ messages in thread
From: Johannes Berg @ 2018-05-09 19:27 UTC (permalink / raw)
To: Arend van Spriel, Steve deRosier; +Cc: masashi.honma, backports
On Wed, 2018-05-09 at 20:49 +0200, Arend van Spriel wrote:
>
> Do we have docs :-p Anyway, the gentree script checks the spatch version
> and seems Johannes already took care of the script as well [1]
Yeah I didn't apply it to any other branches though.
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2018-05-09 19:27 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-08 3:05 Failed to backport from from Linux 4.4 drivers to Linux 3.10.108 Masashi Honma
2018-05-08 9:09 ` Johannes Berg
2018-05-08 8:53 ` Masashi Honma
2018-05-08 9:08 ` Johannes Berg
2018-05-08 21:42 ` Masashi Honma
2018-05-09 7:21 ` Masashi Honma
2018-05-09 7:24 ` Johannes Berg
2018-05-09 7:54 ` Johannes Berg
2018-05-09 8:07 ` Masashi Honma
2018-05-09 8:12 ` Johannes Berg
2018-05-09 8:51 ` Masashi Honma
2018-05-09 9:03 ` Johannes Berg
2018-05-09 9:16 ` Masashi Honma
2018-05-09 9:24 ` Masashi Honma
2018-05-09 9:25 ` Johannes Berg
2018-05-09 14:19 ` Steve deRosier
2018-05-09 18:49 ` Arend van Spriel
2018-05-09 19:27 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.