[PATCH] backports: allow building backports package on 4.0+ kernel

[PATCH] backports: allow building backports package on 4.0+ kernel

[Arend van Spriel]

When attempting to build backport package the error message
"Kernel version parse failed" popped up. Realizing the machine
was already running a 4.0-rc1 kernel, this patch fixes the
issue. At least until kernel 9.x it will.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 backport/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backport/Makefile b/backport/Makefile
index c21b813..1c39f64 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -85,7 +85,7 @@ mrproper:
 			done								\
 		) > Kconfig.kernel							;\
 		kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |	\
-			sed 's/^\(\(3\|2\.6\)\.[0-9]\+\).*/\1/;t;d')			;\
+			sed 's/^\(\([3-9]\|2\.6\)\.[0-9]\+\).*/\1/;t;d')			;\
 		test "$$kver" != "" || echo "Kernel version parse failed!"		;\
 		test "$$kver" != ""							;\
 		kvers="$$(seq 14 39 | sed 's/^/2.6./')"					;\
-- 
1.9.1

Re: [PATCH] backports: allow building backports package on 4.0+ kernel

[Johannes Berg]

On Thu, 2015-02-26 at 13:49 +0100, Arend van Spriel wrote:
> When attempting to build backport package the error message
> "Kernel version parse failed" popped up. Realizing the machine
> was already running a 4.0-rc1 kernel, this patch fixes the
> issue. At least until kernel 9.x it will.

Is this really enough? we also generate those kernel version Kconfig
symbols for dependencies - I htink that needs to be adjusted as well.

johannes

Re: [PATCH] backports: allow building backports package on 4.0+ kernel

[Arend van Spriel]

On 02/26/15 14:05, Johannes Berg wrote:
> On Thu, 2015-02-26 at 13:49 +0100, Arend van Spriel wrote:
>> When attempting to build backport package the error message
>> "Kernel version parse failed" popped up. Realizing the machine
>> was already running a 4.0-rc1 kernel, this patch fixes the
>> issue. At least until kernel 9.x it will.
>
> Is this really enough? we also generate those kernel version Kconfig
> symbols for dependencies - I htink that needs to be adjusted as well.

Will double-check the results. Building it worked without issues, but it 
could be due to the fact that backport and target kernel versions are 
the same. You made me a bit wary to actually load the modules, but I 
will do it anyway ;-)

Arend

> johannes
>

Re: [PATCH] backports: allow building backports package on 4.0+ kernel

[Arend van Spriel]

On 02/26/15 14:13, Arend van Spriel wrote:
> On 02/26/15 14:05, Johannes Berg wrote:
>> On Thu, 2015-02-26 at 13:49 +0100, Arend van Spriel wrote:
>>> When attempting to build backport package the error message
>>> "Kernel version parse failed" popped up. Realizing the machine
>>> was already running a 4.0-rc1 kernel, this patch fixes the
>>> issue. At least until kernel 9.x it will.
>>
>> Is this really enough? we also generate those kernel version Kconfig
>> symbols for dependencies - I htink that needs to be adjusted as well.
>
> Will double-check the results. Building it worked without issues, but it
> could be due to the fact that backport and target kernel versions are
> the same. You made me a bit wary to actually load the modules, but I
> will do it anyway ;-)

Seems to be really enough for this (unlikely) scenario.

Regards,
Arend

> Arend
>
>> johannes
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe backports" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] backports: allow building backports package on 4.0+ kernel

[Johannes Berg]

On Thu, 2015-02-26 at 14:18 +0100, Arend van Spriel wrote:

> Seems to be really enough for this (unlikely) scenario.

I think it'll be fine until somebody puts

SOME_SYMBOL 4.0

into the dependencies file.

I guess you could try that with some random symbol and see what happens?
I think it would never be selectable.

johannes

[PATCH] backports: add support for 4.x kernels

[Luca Coelho]

From: Luciano Coelho <luciano.coelho@intel.com>

Adjust the kernel version parsing and list of backport files
generation for 4.x kernels.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
---
I was working on the same thing and Johannes told me that Arend had a
similar patch.  Maybe this one can be used?

 backport/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backport/Makefile b/backport/Makefile
index ea3982b..c4962c9 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -85,11 +85,12 @@ mrproper:
 			done								\
 		) > Kconfig.kernel							;\
 		kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion |	\
-			sed 's/^\(\(3\|2\.6\)\.[0-9]\+\).*/\1/;t;d')			;\
+			sed 's/^\(\([3-4]\|2\.6\)\.[0-9]\+\).*/\1/;t;d')		;\
 		test "$$kver" != "" || echo "Kernel version parse failed!"		;\
 		test "$$kver" != ""							;\
 		kvers="$$(seq 14 39 | sed 's/^/2.6./')"					;\
-		kvers="$$kvers $$(seq 0 99 | sed 's/^/3./')"				;\
+		kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')"				;\
+		kvers="$$kvers $$(seq 0 99 | sed 's/^/4./')"				;\
 		print=0									;\
 		for v in $$kvers ; do							\
 			if [ "$$print" = "1" ] ; then					\
-- 
2.1.4

Re: [PATCH] backports: add support for 4.x kernels

[Johannes Berg]

On Wed, 2015-03-04 at 11:06 +0200, Luca Coelho wrote:

> -		kvers="$$kvers $$(seq 0 99 | sed 's/^/3./')"				;\
> +		kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')"				;\
> +		kvers="$$kvers $$(seq 0 99 | sed 's/^/4./')"				;\

This seems to be the part I was concerned was missing in Arend's patch.

johannes

Re: [PATCH] backports: add support for 4.x kernels

[Hauke Mehrtens]

On 03/04/2015 10:06 AM, Luca Coelho wrote:
> From: Luciano Coelho <luciano.coelho@intel.com>
> 
> Adjust the kernel version parsing and list of backport files
> generation for 4.x kernels.
> 
> Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
> ---
> I was working on the same thing and Johannes told me that Arend had a
> similar patch.  Maybe this one can be used?
> 
>  backport/Makefile | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Thank you for the patch it was applied to backports.

Hauke