[meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Andreas Müller]

* no more required (version > 3.17 | > 4.3.x | > 4.4.5)
* causes error with rt kernel

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 classes/linux-raspberrypi-base.bbclass | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass
index 3a6e33d..dc2330a 100644
--- a/classes/linux-raspberrypi-base.bbclass
+++ b/classes/linux-raspberrypi-base.bbclass
@@ -14,21 +14,6 @@ def get_dts(d, ver=None):
         from the kernel staging '''
         ver = get_kernelversion_file(staging_dir)
 
-    if ver is not None:
-        min_ver = ver.split('.', 3)
-    else:
-        return dts
-
-    # Always turn off device tree support for kernel's < 3.18
-    try:
-        if int(min_ver[0]) >= 4:
-            if (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
-                dts = ' '.join([(re.sub(r'(.*)\.dtbo$', r'\1-overlay.dtb', x)) for x in dts.split()])
-        elif int(min_ver[1]) < 18:
-            dts = ""
-    except IndexError:
-        min_ver = None
-
     return dts
 
 
-- 
2.7.4

Re: [meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Khem Raj]

On Thu, Dec 8, 2016 at 2:40 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> * no more required (version > 3.17 | > 4.3.x | > 4.4.5)
> * causes error with rt kernel
>

I think this is ok to apply now.

> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  classes/linux-raspberrypi-base.bbclass | 15 ---------------
>  1 file changed, 15 deletions(-)
>
> diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass
> index 3a6e33d..dc2330a 100644
> --- a/classes/linux-raspberrypi-base.bbclass
> +++ b/classes/linux-raspberrypi-base.bbclass
> @@ -14,21 +14,6 @@ def get_dts(d, ver=None):
>          from the kernel staging '''
>          ver = get_kernelversion_file(staging_dir)
>
> -    if ver is not None:
> -        min_ver = ver.split('.', 3)
> -    else:
> -        return dts
> -
> -    # Always turn off device tree support for kernel's < 3.18
> -    try:
> -        if int(min_ver[0]) >= 4:
> -            if (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
> -                dts = ' '.join([(re.sub(r'(.*)\.dtbo$', r'\1-overlay.dtb', x)) for x in dts.split()])
> -        elif int(min_ver[1]) < 18:
> -            dts = ""
> -    except IndexError:
> -        min_ver = None
> -
>      return dts
>
>
> --
> 2.7.4
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Re: [meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]

 

2016-12-12 06:21 skrev Khem Raj: 

> On Thu, Dec 8, 2016 at 2:40 AM,
Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> 
>> * no more
required (version > 3.17 | > 4.3.x | > 4.4.5) * causes error with rt
kernel
> 
> I think this is ok to apply now.
> 
>> Signed-off-by:
Andreas Müller <schnitzeltony@googlemail.com> ---
classes/linux-raspberrypi-base.bbclass | 15 --------------- 1 file
changed, 15 deletions(-) diff --git
a/classes/linux-raspberrypi-base.bbclass
b/classes/linux-raspberrypi-base.bbclass index 3a6e33d..dc2330a 100644
--- a/classes/linux-raspberrypi-base.bbclass +++
b/classes/linux-raspberrypi-base.bbclass @@ -14,21 +14,6 @@ def
get_dts(d, ver=None): from the kernel staging ''' ver =
get_kernelversion_file(staging_dir) - if ver is not None: - min_ver =
ver.split('.', 3) - else: - return dts - - # Always turn off device tree
support for kernel's < 3.18 - try: - if int(min_ver[0]) >= 4: - if
(int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
- dts = ' '.join([(re.sub(r'(.*).dtbo$', r'1-overlay.dtb', x)) for x in
dts.split()]) - elif int(min_ver[1]) < 18: - dts = "" - except
IndexError: - min_ver = None - return dts -- 2.7.4 --
_______________________________________________ yocto mailing list
yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[1]

I think you should go even one step further and revert the entire
commit merging this obsolete functionality: "git revert
4a4373c02d3d8355a2e5faa10af61450e5b093d8" . 

BR Petter


Links:
------
[1] https://lists.yoctoproject.org/listinfo/yocto

[-- Attachment #2: Type: text/html, Size: 2349 bytes --]

Re: [meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Andreas Müller]

On Mon, Dec 12, 2016 at 11:33 PM, Petter Mabäcker <petter@technux.se> wrote:
> 2016-12-12 06:21 skrev Khem Raj:
>
> On Thu, Dec 8, 2016 at 2:40 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>
> * no more required (version > 3.17 | > 4.3.x | > 4.4.5) * causes error with
> rt kernel
>
> I think this is ok to apply now.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
> classes/linux-raspberrypi-base.bbclass | 15 --------------- 1 file changed,
> 15 deletions(-) diff --git a/classes/linux-raspberrypi-base.bbclass
> b/classes/linux-raspberrypi-base.bbclass index 3a6e33d..dc2330a 100644 ---
> a/classes/linux-raspberrypi-base.bbclass +++
> b/classes/linux-raspberrypi-base.bbclass @@ -14,21 +14,6 @@ def get_dts(d,
> ver=None): from the kernel staging ''' ver =
> get_kernelversion_file(staging_dir) - if ver is not None: - min_ver =
> ver.split('.', 3) - else: - return dts - - # Always turn off device tree
> support for kernel's < 3.18 - try: - if int(min_ver[0]) >= 4: - if
> (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6): -
> dts = ' '.join([(re.sub(r'(.*)\.dtbo$', r'\1-overlay.dtb', x)) for x in
> dts.split()]) - elif int(min_ver[1]) < 18: - dts = "" - except IndexError: -
> min_ver = None - return dts -- 2.7.4 --
> _______________________________________________ yocto mailing list
> yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
>
> I think you should go even one step further and revert the entire commit
> merging this obsolete functionality: "git revert
> 4a4373c02d3d8355a2e5faa10af61450e5b093d8" .
>
> BR Petter
To be honest: I have forked meta-raspberrypi and don't use it any
more. Just wanted to be a good boy. So maybe you want to send the
revert here?

Andreas

Re: [meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 2021 bytes --]

 

2016-12-13 00:55 skrev Andreas Müller: 

> On Mon, Dec 12, 2016 at
11:33 PM, Petter Mabäcker <petter@technux.se> wrote:
> 
>> 2016-12-12
06:21 skrev Khem Raj: On Thu, Dec 8, 2016 at 2:40 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote: * no more required (version > 3.17
| > 4.3.x | > 4.4.5) * causes error with rt kernel I think this is ok to
apply now. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
--- classes/linux-raspberrypi-base.bbclass | 15 --------------- 1 file
changed, 15 deletions(-) diff --git
a/classes/linux-raspberrypi-base.bbclass
b/classes/linux-raspberrypi-base.bbclass index 3a6e33d..dc2330a 100644
--- a/classes/linux-raspberrypi-base.bbclass +++
b/classes/linux-raspberrypi-base.bbclass @@ -14,21 +14,6 @@ def
get_dts(d, ver=None): from the kernel staging ''' ver =
get_kernelversion_file(staging_dir) - if ver is not None: - min_ver =
ver.split('.', 3) - else: - return dts - - # Always turn off device tree
support for kernel's < 3.18 - try: - if int(min_ver[0]) >= 4: - if
(int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
- dts = ' '.join([(re.sub(r'(.*).dtbo$', r'1-overlay.dtb', x)) for x in
dts.split()]) - elif int(min_ver[1]) < 18: - dts = "" - except
IndexError: - min_ver = None - return dts -- 2.7.4 --
_______________________________________________ yocto mailing list
yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[1]
> 
>> I think you should go even one step further and revert the
entire commit merging this obsolete functionality: "git revert
4a4373c02d3d8355a2e5faa10af61450e5b093d8" .
> BR Petter 
> 
> To be
honest: I have forked meta-raspberrypi and don't use it any
> more. Just
wanted to be a good boy. So maybe you want to send the
> revert here?
>

> Andreas
> 
>> 

Oh I see. Sure, I can send something up. 

Petter
Mabäcker

Technux <petter@technux.se>
www.technux.se



Links:
------
[1] https://lists.yoctoproject.org/listinfo/yocto

[-- Attachment #2: Type: text/html, Size: 2936 bytes --]

Re: [meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 2583 bytes --]

 

2016-12-13 06:39 skrev Petter Mabäcker: 

> 2016-12-13 00:55 skrev
Andreas Müller: 
> 
>> On Mon, Dec 12, 2016 at 11:33 PM, Petter Mabäcker
<petter@technux.se> wrote:
>> 
>>> 2016-12-12 06:21 skrev Khem Raj: On
Thu, Dec 8, 2016 at 2:40 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote: * no more required (version > 3.17
| > 4.3.x | > 4.4.5) * causes error with rt kernel I think this is ok to
apply now. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
--- classes/linux-raspberrypi-base.bbclass | 15 --------------- 1 file
changed, 15 deletions(-) diff --git
a/classes/linux-raspberrypi-base.bbclass
b/classes/linux-raspberrypi-base.bbclass index 3a6e33d..dc2330a 100644
--- a/classes/linux-raspberrypi-base.bbclass +++
b/classes/linux-raspberrypi-base.bbclass @@ -14,21 +14,6 @@ def
get_dts(d, ver=None): from the kernel staging ''' ver =
get_kernelversion_file(staging_dir) - if ver is not None: - min_ver =
ver.split('.', 3) - else: - return dts - - # Always turn off device tree
support for kernel's < 3.18 - try: - if int(min_ver[0]) >= 4: - if
(int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
- dts = ' '.join([(re.sub(r'(.*).dtbo$', r'1-overlay.dtb', x)) for x in
dts.split()]) - elif int(min_ver[1]) < 18: - dts = "" - except
IndexError: - min_ver = None - return dts -- 2.7.4 --
_______________________________________________ yocto mailing list
yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[1]
>> 
>>> I think you should go even one step further and revert the
entire commit merging this obsolete functionality: "git revert
4a4373c02d3d8355a2e5faa10af61450e5b093d8" .
>> BR Petter 
>> 
>> To be
honest: I have forked meta-raspberrypi and don't use it any
>> more.
Just wanted to be a good boy. So maybe you want to send the
>> revert
here?
>> 
>> Andreas
>> 
>>> 
> 
> Oh I see. Sure, I can send something
up. 
> 
> Petter Mabäcker
> 
> Technux <petter@technux.se>
>
www.technux.se

This wasn't as easy that I first thought. I totally
forgot about that Device Tree Overlays are assumed to be suffixed by
'-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+). So it's not possible to
just revert the commit and handle some simple conflicts..

Andrei: I
think you can go ahead and merge this patch when fully verified. Then I
instead will see if I can do some cleanup in a later step. But at least
this patch simplifies things and solves the rt-issue.

BR Petter



Links:
------
[1] https://lists.yoctoproject.org/listinfo/yocto

[-- Attachment #2: Type: text/html, Size: 3612 bytes --]

Re: [meta-raspberrypi][PATCH] linux-raspberrypi-base.bbclass: remove version hack

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2799 bytes --]

On Thu, Dec 15, 2016 at 06:11:33AM +0100, Petter Mabäcker wrote:
>
>
> 2016-12-13 06:39 skrev Petter Mabäcker:
>
> > 2016-12-13 00:55 skrev
> Andreas Müller:
> >
> >> On Mon, Dec 12, 2016 at 11:33 PM, Petter Mabäcker
> <petter@technux.se> wrote:
> >>
> >>> 2016-12-12 06:21 skrev Khem Raj: On
> Thu, Dec 8, 2016 at 2:40 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote: * no more required (version > 3.17
> | > 4.3.x | > 4.4.5) * causes error with rt kernel I think this is ok to
> apply now. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> --- classes/linux-raspberrypi-base.bbclass | 15 --------------- 1 file
> changed, 15 deletions(-) diff --git
> a/classes/linux-raspberrypi-base.bbclass
> b/classes/linux-raspberrypi-base.bbclass index 3a6e33d..dc2330a 100644
> --- a/classes/linux-raspberrypi-base.bbclass +++
> b/classes/linux-raspberrypi-base.bbclass @@ -14,21 +14,6 @@ def
> get_dts(d, ver=None): from the kernel staging ''' ver =
> get_kernelversion_file(staging_dir) - if ver is not None: - min_ver =
> ver.split('.', 3) - else: - return dts - - # Always turn off device tree
> support for kernel's < 3.18 - try: - if int(min_ver[0]) >= 4: - if
> (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6):
> - dts = ' '.join([(re.sub(r'(.*).dtbo$', r'1-overlay.dtb', x)) for x in
> dts.split()]) - elif int(min_ver[1]) < 18: - dts = "" - except
> IndexError: - min_ver = None - return dts -- 2.7.4 --
> _______________________________________________ yocto mailing list
> yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
> [1]
> >>
> >>> I think you should go even one step further and revert the
> entire commit merging this obsolete functionality: "git revert
> 4a4373c02d3d8355a2e5faa10af61450e5b093d8" .
> >> BR Petter
> >>
> >> To be
> honest: I have forked meta-raspberrypi and don't use it any
> >> more.
> Just wanted to be a good boy. So maybe you want to send the
> >> revert
> here?
> >>
> >> Andreas
> >>
> >>>
> >
> > Oh I see. Sure, I can send something
> up.
> >
> > Petter Mabäcker
> >
> > Technux <petter@technux.se>
> >
> www.technux.se
>
> This wasn't as easy that I first thought. I totally
> forgot about that Device Tree Overlays are assumed to be suffixed by
> '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+). So it's not possible to
> just revert the commit and handle some simple conflicts..
>
> Andrei: I
> think you can go ahead and merge this patch when fully verified. Then I
> instead will see if I can do some cleanup in a later step. But at least
> this patch simplifies things and solves the rt-issue.
>
> BR Petter
>

I agree. Let's merge it and continue to fix it afterwards. Merged to
master. Thanks.
--
Andrei Gherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 817 bytes --]