[oe] [meta-oe][PATCH 1/1] fio: disable compiler optimizations for x86 arch

2020-03-13 Thread Liwei Song
with compiler optimizations enabled, "fio --help" will failed with
"Illegal instruction" on Intel Denverton board.
Enable it on condition that MACHINE_FEATURES include x86.

Related commits:
https://git.openembedded.org/meta-openembedded/commit/?id=c58d9d500f90246d2d879e720fdfa5bbbc731c7f
https://git.openembedded.org/meta-openembedded/commit/?id=739349da0826221f98648b64b693f9ae33e7d4ea

Signed-off-by: Liwei Song 
---
 meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb 
b/meta-oe/recipes-benchmark/fio/fio_3.17.bb
index b65ab19a3efe..759d1087c055 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb
@@ -34,6 +34,7 @@ S = "${WORKDIR}/git"
 DISABLE_STATIC = ""
 
 EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'"
+EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', 
'--disable-optimizations', '', d)}"
 
 do_configure() {
 ./configure ${EXTRA_OECONF}
-- 
2.17.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH 1/1] fio: fix first direct IO errored when ioengine is splice

2019-08-04 Thread Liwei Song
backport an fio upstream patch to fix "first direct IO errored" when
we specify -ioengine=spice

Signed-off-by: Liwei Song 
---
 ...es-splice-remove-buggy-mem_align-set.patch | 43 +++
 meta-oe/recipes-benchmark/fio/fio_3.15.bb |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 
meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch

diff --git 
a/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
 
b/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
new file mode 100644
index ..cb18032d2417
--- /dev/null
+++ 
b/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch
@@ -0,0 +1,43 @@
+From 8ca8a05d92fa799fe93a6edc27b058802211fddc Mon Sep 17 00:00:00 2001
+From: Jens Axboe 
+Date: Sat, 3 Aug 2019 08:33:24 -0600
+Subject: [PATCH] engines/splice: remove buggy ->mem_align set
+
+Two things wrong here:
+
+1) We align buffers by default, so no need for splice to do anything
+   extra.
+2) ->mem_align is not a true/false setting, it's the alignment itself.
+   Hence the current setting to 1 is just buggy.
+
+Upstream-Status: Backport 
[https://github.com/axboe/fio/commit/8ca8a05d92fa799fe93a6edc27b058802211fddc]
+
+Fixes: https://github.com/axboe/fio/issues/810
+Reported-by: Sitsofe Wheeler 
+Signed-off-by: Jens Axboe 
+Signed-off-by: Liwei Song 
+---
+ engines/splice.c | 7 ---
+ 1 file changed, 7 deletions(-)
+
+diff --git a/engines/splice.c b/engines/splice.c
+index feb764feb2f4..6fc36bb6f154 100644
+--- a/engines/splice.c
 b/engines/splice.c
+@@ -278,13 +278,6 @@ static int fio_spliceio_init(struct thread_data *td)
+*/
+   sd->vmsplice_to_user_map = 1;
+ 
+-  /*
+-   * And if vmsplice_to_user works, we definitely need aligned
+-   * buffers. Just set ->odirect to force that.
+-   */
+-  if (td_read(td))
+-  td->o.mem_align = 1;
+-
+   td->io_ops_data = sd;
+   return 0;
+ }
+-- 
+2.22.0
+
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.15.bb 
b/meta-oe/recipes-benchmark/fio/fio_3.15.bb
index c44075cdbe4e..f91a7f81d634 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.15.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.15.bb
@@ -25,6 +25,7 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f"
 SRC_URI = "git://git.kernel.dk/fio.git \
   file://0001-update-the-interpreter-paths.patch \
+  file://0001-engines-splice-remove-buggy-mem_align-set.patch \
 "
 
 S = "${WORKDIR}/git"
-- 
2.22.0

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH V2] pm-graph: fix time format parse error

2019-08-01 Thread Liwei Song
Time format in dmesg has been changed from "%Y-%m-%d %H:%M:%S" to
"%Y-%m-%dT%H:%M:%S", backport an upstream patch to fix this error.

Signed-off-by: Liwei Song 
---
 .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 +++
 .../recipes-kernel/pm-graph/pm-graph_5.3.bb   |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch

diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch 
b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
new file mode 100644
index ..d49ce0138aec
--- /dev/null
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
@@ -0,0 +1,32 @@
+From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001
+From: Todd Brandt 
+Date: Fri, 10 May 2019 15:10:35 -0700
+Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the regex
+ needs more complexity
+
+Upstream-Status: Backport 
[https://github.com/intel/pm-graph/commit/0c94e32b218c31f31a7988577fb9bec595034e7b]
+
+Signed-off-by: Liwei Song 
+---
+ bootgraph.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bootgraph.py b/bootgraph.py
+index a2b1b1897307..d7f4bd152bf1 100755
+--- a/bootgraph.py
 b/bootgraph.py
+@@ -333,9 +333,9 @@ def parseKernelLog():
+   if(not sysvals.stamp['kernel']):
+   sysvals.stamp['kernel'] = 
sysvals.kernelVersion(msg)
+   continue
+-  m = re.match('.* setting system clock to (?P.*) UTC.*', msg)
++  m = re.match('.* setting system clock to (?P[0-9\-]*)[ 
A-Z](?P[0-9:]*) UTC.*', msg)
+   if(m):
+-  bt = datetime.strptime(m.group('t'), '%Y-%m-%d 
%H:%M:%S')
++  bt = datetime.strptime(m.group('d')+' '+m.group('t'), 
'%Y-%m-%d %H:%M:%S')
+   bt = bt - timedelta(seconds=int(ktime))
+   data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S')
+   sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S 
%p')
+-- 
+2.22.0
+
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
index ea12e054d3ab..a9f540ab8605 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7"
 SRC_URI = "git://github.com/intel/pm-graph.git \
-   file://0001-Makefile-fix-multilib-build-failure.patch"
+   file://0001-Makefile-fix-multilib-build-failure.patch \
+   file://0001-bootgraph.py.patch \
+"
 S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST='(i.86|x86_64).*'
-- 
2.22.0

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH] pm-graph: fix time format parse error

2019-08-01 Thread Liwei Song



On 08/02/2019 11:17 AM, Khem Raj wrote:
> On Thu, Aug 1, 2019 at 8:01 PM Liwei Song  wrote:
>>
>> Time format in dmesg has been changed from "%Y-%m-%d %H:%M:%S" to
>> "%Y-%m-%dT%H:%M:%S", backport an upstream patch to fix this error.
>>
>> Signed-off-by: Liwei Song 
>> ---
>>  .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 +++
>>  .../recipes-kernel/pm-graph/pm-graph_5.3.bb   |  4 ++-
>>  2 files changed, 35 insertions(+), 1 deletion(-)
>>  create mode 100644 
>> meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
>>
>> diff --git 
>> a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch 
>> b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
>> new file mode 100644
>> index ..79685d612abe
>> --- /dev/null
>> +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
>> @@ -0,0 +1,32 @@
>> +From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001
>> +From: Todd Brandt 
>> +Date: Fri, 10 May 2019 15:10:35 -0700
>> +Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the 
>> regex
>> + needs more complexity
>> +
>> +Upstream-Status: Backport
>> +
> 
> can you add the link to backport location here ?

Got it, will change it in v2:
Upstream-Status: Backport 
[https://github.com/intel/pm-graph/commit/0c94e32b218c31f31a7988577fb9bec595034e7b]

Thanks,
Liwei.


> 
> Upstream-Status: Backport [  ]
> 
>> +Signed-off-by: Liwei Song 
>> +---
>> + bootgraph.py | 4 ++--
>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/bootgraph.py b/bootgraph.py
>> +index a2b1b1897307..d7f4bd152bf1 100755
>> +--- a/bootgraph.py
>>  b/bootgraph.py
>> +@@ -333,9 +333,9 @@ def parseKernelLog():
>> +   if(not sysvals.stamp['kernel']):
>> +   sysvals.stamp['kernel'] = 
>> sysvals.kernelVersion(msg)
>> +   continue
>> +-  m = re.match('.* setting system clock to (?P.*) UTC.*', 
>> msg)
>> ++  m = re.match('.* setting system clock to (?P[0-9\-]*)[ 
>> A-Z](?P[0-9:]*) UTC.*', msg)
>> +   if(m):
>> +-  bt = datetime.strptime(m.group('t'), '%Y-%m-%d 
>> %H:%M:%S')
>> ++  bt = datetime.strptime(m.group('d')+' 
>> '+m.group('t'), '%Y-%m-%d %H:%M:%S')
>> +   bt = bt - timedelta(seconds=int(ktime))
>> +   data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S')
>> +   sysvals.stamp['time'] = bt.strftime('%B %d %Y, 
>> %I:%M:%S %p')
>> +--
>> +2.22.0
>> +
>> diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
>> b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>> index ea12e054d3ab..a9f540ab8605 100644
>> --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>> +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>> @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = 
>> "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
>>
>>  SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7"
>>  SRC_URI = "git://github.com/intel/pm-graph.git \
>> -   file://0001-Makefile-fix-multilib-build-failure.patch"
>> +   file://0001-Makefile-fix-multilib-build-failure.patch \
>> +   file://0001-bootgraph.py.patch \
>> +"
>>  S = "${WORKDIR}/git"
>>
>>  COMPATIBLE_HOST='(i.86|x86_64).*'
>> --
>> 2.22.0
>>
>> --
>> ___
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> 
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH] pm-graph: fix time format parse error

2019-08-01 Thread Liwei Song
Time format in dmesg has been changed from "%Y-%m-%d %H:%M:%S" to
"%Y-%m-%dT%H:%M:%S", backport an upstream patch to fix this error.

Signed-off-by: Liwei Song 
---
 .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 +++
 .../recipes-kernel/pm-graph/pm-graph_5.3.bb   |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch

diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch 
b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
new file mode 100644
index ..79685d612abe
--- /dev/null
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch
@@ -0,0 +1,32 @@
+From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001
+From: Todd Brandt 
+Date: Fri, 10 May 2019 15:10:35 -0700
+Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the regex
+ needs more complexity
+
+Upstream-Status: Backport
+
+Signed-off-by: Liwei Song 
+---
+ bootgraph.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bootgraph.py b/bootgraph.py
+index a2b1b1897307..d7f4bd152bf1 100755
+--- a/bootgraph.py
 b/bootgraph.py
+@@ -333,9 +333,9 @@ def parseKernelLog():
+   if(not sysvals.stamp['kernel']):
+   sysvals.stamp['kernel'] = 
sysvals.kernelVersion(msg)
+   continue
+-  m = re.match('.* setting system clock to (?P.*) UTC.*', msg)
++  m = re.match('.* setting system clock to (?P[0-9\-]*)[ 
A-Z](?P[0-9:]*) UTC.*', msg)
+   if(m):
+-  bt = datetime.strptime(m.group('t'), '%Y-%m-%d 
%H:%M:%S')
++  bt = datetime.strptime(m.group('d')+' '+m.group('t'), 
'%Y-%m-%d %H:%M:%S')
+   bt = bt - timedelta(seconds=int(ktime))
+   data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S')
+   sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S 
%p')
+-- 
+2.22.0
+
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
index ea12e054d3ab..a9f540ab8605 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7"
 SRC_URI = "git://github.com/intel/pm-graph.git \
-   file://0001-Makefile-fix-multilib-build-failure.patch"
+   file://0001-Makefile-fix-multilib-build-failure.patch \
+   file://0001-bootgraph.py.patch \
+"
 S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST='(i.86|x86_64).*'
-- 
2.22.0

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v2] pm-graph: package the pm-graph files

2019-07-10 Thread Liwei Song



On 07/10/2019 10:33 AM, Saini, Naveen Kumar wrote:
> 
> 
> On 7/5/19 10:03 AM, Liwei Song wrote:
>>
>>
>> On 07/05/2019 10:01 AM, Saini, Naveen Kumar wrote:
>>>
>>>
>>> On 7/5/19 9:43 AM, Liwei Song wrote:
>>>> package /usr/lib/pm-grap and /bin/* files created by pm-graph
>>>> to aviod "Files were installed but not shipped in any package"
>>>> error.
>>>>
>>>> Signed-off-by: Liwei Song 
>>>> ---
>>>>meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb | 3 +++
>>>>1 file changed, 3 insertions(+)
>>>>
>>>> diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
>>>> b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>>>> index ea12e054d3ab..00301298309e 100644
>>>> --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>>>> +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>>>> @@ -18,3 +18,6 @@ do_install() {
>>>>}
>>>>  RDEPENDS_${PN} += "python-core python-threading python-datetime 
>>>> python-subprocess python-compression"
>>>> +
>>>> +FILES_${PN} += "${nonarch_libdir}/pm-graph \
>>> This too not required. Please have a look at
>>> https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/conf/bitbake.conf
>>>
>>> Could you share your error !
>>
>> The error I got:
>> ERROR: pm-graph-5.3-r0 do_package: QA Issue: pm-graph: Files/directories 
>> were installed but not shipped in any package:
>>/usr/lib
>>/usr/lib/pm-graph
>>/usr/lib/pm-graph/sleepgraph.py
>>/usr/lib/pm-graph/bootgraph.py
>>/usr/lib/pm-graph/config
>>/usr/lib/pm-graph/config/cgskip.txt
>>/usr/lib/pm-graph/config/freeze-callgraph.cfg
>>/usr/lib/pm-graph/config/freeze.cfg
>>/usr/lib/pm-graph/config/freeze-dev.cfg
>>/usr/lib/pm-graph/config/standby-callgraph.cfg
>>/usr/lib/pm-graph/config/standby.cfg
>>/usr/lib/pm-graph/config/standby-dev.cfg
>>/usr/lib/pm-graph/config/suspend-callgraph.cfg
>>/usr/lib/pm-graph/config/suspend.cfg
>>/usr/lib/pm-graph/config/suspend-dev.cfg
>>/usr/lib/pm-graph/config/suspend-x2-proc.cfg
>> Please set FILES such that these items are packaged. Alternatively if they 
>> are unneeded, avoid installing them or delete them within do_install.
>> pm-graph: 16 installed and not shipped files. [installed-vs-shipped]
>> ERROR: pm-graph-5.3-r0 do_package: Fatal QA errors found, failing task.
>> ERROR: pm-graph-5.3-r0 do_package:
>> ERROR: pm-graph-5.3-r0 do_package: Function failed: do_package
> 
> Hmm.. what is ${BASELIB} variable value?
> 
> Are you using latest code?

it's my fault that my code is old without the following patch:
86407337b940 ("pm-graph: fix multilib build failure")

Now it work well.
Sorry to disturb, please ignore this review.

Thanks,
Liwei.


> 
> I do not see this error. Below configuration I am using for multilib build:
> 
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
> 
> 
>>
>>
>> Thanks,
>> Liwei.
>>>> +"
>>>>
>>>
>>>
> 
> 
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v2] pm-graph: package the pm-graph files

2019-07-04 Thread Liwei Song



On 07/05/2019 10:03 AM, Liwei Song wrote:
> 
> 
> On 07/05/2019 10:01 AM, Saini, Naveen Kumar wrote:
>>
>>
>> On 7/5/19 9:43 AM, Liwei Song wrote:
>>> package /usr/lib/pm-grap and /bin/* files created by pm-graph
>>> to aviod "Files were installed but not shipped in any package"
>>> error.
>>>
>>> Signed-off-by: Liwei Song 
>>> ---
>>>   meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb | 3 +++
>>>   1 file changed, 3 insertions(+)
>>>
>>> diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
>>> b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>>> index ea12e054d3ab..00301298309e 100644
>>> --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>>> +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>>> @@ -18,3 +18,6 @@ do_install() {
>>>   }
>>> RDEPENDS_${PN} += "python-core python-threading python-datetime 
>>> python-subprocess python-compression"
>>> +
>>> +FILES_${PN} += "${nonarch_libdir}/pm-graph \
>> This too not required. Please have a look at
>> https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/conf/bitbake.conf
>>
>> Could you share your error !
> 
> The error I got:
> ERROR: pm-graph-5.3-r0 do_package: QA Issue: pm-graph: Files/directories were 
> installed but not shipped in any package:
>   /usr/lib
>   /usr/lib/pm-graph
>   /usr/lib/pm-graph/sleepgraph.py
>   /usr/lib/pm-graph/bootgraph.py
>   /usr/lib/pm-graph/config
>   /usr/lib/pm-graph/config/cgskip.txt
>   /usr/lib/pm-graph/config/freeze-callgraph.cfg
>   /usr/lib/pm-graph/config/freeze.cfg
>   /usr/lib/pm-graph/config/freeze-dev.cfg
>   /usr/lib/pm-graph/config/standby-callgraph.cfg
>   /usr/lib/pm-graph/config/standby.cfg
>   /usr/lib/pm-graph/config/standby-dev.cfg
>   /usr/lib/pm-graph/config/suspend-callgraph.cfg
>   /usr/lib/pm-graph/config/suspend.cfg
>   /usr/lib/pm-graph/config/suspend-dev.cfg
>   /usr/lib/pm-graph/config/suspend-x2-proc.cfg
> Please set FILES such that these items are packaged. Alternatively if they 
> are unneeded, avoid installing them or delete them within do_install.
> pm-graph: 16 installed and not shipped files. [installed-vs-shipped]
> ERROR: pm-graph-5.3-r0 do_package: Fatal QA errors found, failing task.
> ERROR: pm-graph-5.3-r0 do_package: 
> ERROR: pm-graph-5.3-r0 do_package: Function failed: do_package

while libdir="/usr/lib64" can be inherit, but in my case files were installed 
to /usr/lib/
export nonarch_libdir="/usr/lib" can not be inherit by default, right?

Thanks
Liwei.


> 
> 
> Thanks,
> Liwei.
>>> +"
>>>
>>
>>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v2] pm-graph: package the pm-graph files

2019-07-04 Thread Liwei Song



On 07/05/2019 10:01 AM, Saini, Naveen Kumar wrote:
> 
> 
> On 7/5/19 9:43 AM, Liwei Song wrote:
>> package /usr/lib/pm-grap and /bin/* files created by pm-graph
>> to aviod "Files were installed but not shipped in any package"
>> error.
>>
>> Signed-off-by: Liwei Song 
>> ---
>>   meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
>> b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>> index ea12e054d3ab..00301298309e 100644
>> --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>> +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
>> @@ -18,3 +18,6 @@ do_install() {
>>   }
>> RDEPENDS_${PN} += "python-core python-threading python-datetime 
>> python-subprocess python-compression"
>> +
>> +FILES_${PN} += "${nonarch_libdir}/pm-graph \
> This too not required. Please have a look at
> https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/conf/bitbake.conf
> 
> Could you share your error !

The error I got:
ERROR: pm-graph-5.3-r0 do_package: QA Issue: pm-graph: Files/directories were 
installed but not shipped in any package:
  /usr/lib
  /usr/lib/pm-graph
  /usr/lib/pm-graph/sleepgraph.py
  /usr/lib/pm-graph/bootgraph.py
  /usr/lib/pm-graph/config
  /usr/lib/pm-graph/config/cgskip.txt
  /usr/lib/pm-graph/config/freeze-callgraph.cfg
  /usr/lib/pm-graph/config/freeze.cfg
  /usr/lib/pm-graph/config/freeze-dev.cfg
  /usr/lib/pm-graph/config/standby-callgraph.cfg
  /usr/lib/pm-graph/config/standby.cfg
  /usr/lib/pm-graph/config/standby-dev.cfg
  /usr/lib/pm-graph/config/suspend-callgraph.cfg
  /usr/lib/pm-graph/config/suspend.cfg
  /usr/lib/pm-graph/config/suspend-dev.cfg
  /usr/lib/pm-graph/config/suspend-x2-proc.cfg
Please set FILES such that these items are packaged. Alternatively if they are 
unneeded, avoid installing them or delete them within do_install.
pm-graph: 16 installed and not shipped files. [installed-vs-shipped]
ERROR: pm-graph-5.3-r0 do_package: Fatal QA errors found, failing task.
ERROR: pm-graph-5.3-r0 do_package: 
ERROR: pm-graph-5.3-r0 do_package: Function failed: do_package


Thanks,
Liwei.
>> +"
>>
> 
> 
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v2] pm-graph: package the pm-graph files

2019-07-04 Thread Liwei Song
package /usr/lib/pm-grap and /bin/* files created by pm-graph
to aviod "Files were installed but not shipped in any package"
error.

Signed-off-by: Liwei Song 
---
 meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
index ea12e054d3ab..00301298309e 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
@@ -18,3 +18,6 @@ do_install() {
 }
 
 RDEPENDS_${PN} += "python-core python-threading python-datetime 
python-subprocess python-compression"
+
+FILES_${PN} += "${nonarch_libdir}/pm-graph \
+"
-- 
2.7.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH] pm-graph: package the pm-graph files

2019-07-04 Thread Liwei Song



On 07/04/2019 06:31 PM, Saini, Naveen Kumar wrote:
> 
> 
> On 7/4/19 5:20 PM, Liwei Song wrote:
>> +FILES_${PN} = "${nonarch_libdir}/pm-graph \
>> +   ${bindir}/sleepgraph \
>> +   ${bindir}/bootgraph \
>> +"
> 
> FILES_${PN} inherits ${bindir} & ${libdir} by default. So it is not required.

Got it, Thanks, will send a v2 to remove it.


Liwei.
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH] pm-graph: package the pm-graph files

2019-07-04 Thread Liwei Song
package /usr/lib/pm-grap and /bin/* files created by pm-graph
to aviod "Files were installed but not shipped in any package"
error.

Signed-off-by: Liwei Song 
---
 meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb | 5 +
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb 
b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
index de2d46dcafef..393e8c83573b 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb
@@ -17,3 +17,8 @@ do_install() {
 }
 
 RDEPENDS_${PN} += "python-core python-threading python-datetime 
python-subprocess python-compression"
+
+FILES_${PN} = "${nonarch_libdir}/pm-graph \
+   ${bindir}/sleepgraph \
+   ${bindir}/bootgraph \
+"
-- 
2.7.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH 1/1] turbostat: copy bits.h from kernel to turbostat

2019-05-23 Thread Liwei Song
because bits.h was included in msr-index.h, so we also need
copy bits.h from kernel to tubostat to aviod compile error.

Signed-off-by: Liwei Song 
---
 meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb 
b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
index dc3e78febb11..3f25e6f004db 100644
--- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
+++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
@@ -41,11 +41,13 @@ do_configure_prepend() {
mkdir -p ${S}
cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S}
cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S}
+   cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S}
cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S}
cp -r ${WORKDIR}/COPYING ${S}
 }
 
 do_compile() {
+   sed -i 's##"bits.h"#' msr-index.h
sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c
sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c
sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) 
\$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile
-- 
2.18.1

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH] ledmon: control hard disk led for RAID arrays

2019-04-08 Thread Liwei Song
Enable LED support for Intel Virtual RAID On CPU.

Signed-off-by: Liwei Song 
---
 meta-oe/recipes-bsp/ledmon/ledmon_git.bb | 32 
 1 file changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-bsp/ledmon/ledmon_git.bb

diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb 
b/meta-oe/recipes-bsp/ledmon/ledmon_git.bb
new file mode 100644
index ..14d70e51f5cc
--- /dev/null
+++ b/meta-oe/recipes-bsp/ledmon/ledmon_git.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Intel(R) Enclosure LED Utilities"
+
+DESCRIPTION = "The utilities are designed primarily to be used on storage 
servers \
+ utilizing MD devices (aka Linux Software RAID) for RAID arrays.\
+"
+HOMEPAGE = "https://github.com/intel/ledmon;
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+"
+
+DEPENDS = " systemd sg3-utils"
+
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "ledmon.service"
+
+SRC_URI = "git://github.com/intel/ledmon;branch=master \
+"
+
+SRCREV = "ad1304ca1363d727425a1f23703c523e21feae4f"
+
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
+
+S = "${WORKDIR}/git"
+EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'"
+
+do_install_append() {
+   install -d ${D}/${systemd_unitdir}/system
+   oe_runmake  DESTDIR=${D}  install
+   oe_runmake  DESTDIR=${D}${systemd_unitdir}/system  install-systemd
+}
-- 
2.7.4

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH 1/1] cpupower: add gettext-native to DEPENDS

2018-02-28 Thread Liwei Song
Add gettext-native to DEPENDS to fix the following build error:

MSGFMT  cpupower/1.0-r0/cpupower-1.0/po/fr.gmo
make: msgfmt: Command not found

Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
 meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb 
b/meta-oe/recipes-kernel/cpupower/cpupower.bb
index c963c8ef91f1..4abd273fae1e 100644
--- a/meta-oe/recipes-kernel/cpupower/cpupower.bb
+++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "cpupower is a collection of tools to examine and 
tune power \
 saving related features of your processor."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-DEPENDS = "pciutils"
+DEPENDS = "pciutils gettext-native"
 PROVIDES = "virtual/cpupower"
 
 inherit kernelsrc kernel-arch
-- 
2.13.3

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[oe] [oe-core][PATCH] kexec-tools: fix Unknown type (Reserved) and ELF core parse error when run kexec

2017-11-02 Thread Liwei Song
When run kexec on NUC7i7BNH/NUC7i5BNH, got the following error:

"Please report this as bug. Using RANGE_RESERVED now"
"ELF core (kcore) parse failed"

Apply three upstream patches to fix it.

Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
 ...andle-additional-e820-memmap-type-strings.patch | 42 +
 ...ild_mem_phdrs-check-if-p_paddr-is-invalid.patch | 45 ++
 ...x86-Support-large-number-of-memory-ranges.patch | 55 ++
 meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb|  3 ++
 4 files changed, 145 insertions(+)
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0001-Handle-additional-e820-memmap-type-strings.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0001-build_mem_phdrs-check-if-p_paddr-is-invalid.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0001-x86-Support-large-number-of-memory-ranges.patch

diff --git 
a/meta/recipes-kernel/kexec/kexec-tools/0001-Handle-additional-e820-memmap-type-strings.patch
 
b/meta/recipes-kernel/kexec/kexec-tools/0001-Handle-additional-e820-memmap-type-strings.patch
new file mode 100644
index ..e5216c3aaea7
--- /dev/null
+++ 
b/meta/recipes-kernel/kexec/kexec-tools/0001-Handle-additional-e820-memmap-type-strings.patch
@@ -0,0 +1,42 @@
+From fab91841c717150aca4bc73e4c54769305e27ade Mon Sep 17 00:00:00 2001
+From: Eric DeVolder <eric.devol...@oracle.com>
+Date: Wed, 10 May 2017 11:03:37 -0500
+Subject: [PATCH] Handle additional e820 memmap type strings
+
+Keep pace with changes to linux arch/x86/kernel/e820.c to
+function e820_type_to_string(). With this change, the following
+messages from kexec are eliminated (and allows kexec to load):
+
+ Unknown type (Reserved) while parsing /sys/firmware/memmap/8/type.
+ Please report this as bug. Using RANGE_RESERVED now.
+
+ Unknown type (Unknown E820 type) while parsing /sys/firmware/memmap/4/type.
+ Please report this as bug. Using RANGE_RESERVED now.
+
+Upstream-Status: Backport 
[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=fab91841c717150aca4bc73e4c54769305e27ade]
+
+Signed-off-by: Eric DeVolder <eric.devol...@oracle.com>
+Signed-off-by: Simon Horman <ho...@verge.net.au>
+Signed-off-by: Liwei Song <liwei.s...@windriver.com>
+---
+ kexec/firmware_memmap.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/kexec/firmware_memmap.c b/kexec/firmware_memmap.c
+index 4d84f0011c57..1ee214aa9316 100644
+--- a/kexec/firmware_memmap.c
 b/kexec/firmware_memmap.c
+@@ -164,6 +164,10 @@ static int parse_memmap_entry(const char *entry, struct 
memory_range *range)
+   range->type = RANGE_RESERVED;
+   else if (strcmp(type, "reserved") == 0)
+   range->type = RANGE_RESERVED;
++  else if (strcmp(type, "Reserved") == 0)
++  range->type = RANGE_RESERVED;
++  else if (strcmp(type, "Unknown E820 type") == 0)
++  range->type = RANGE_RESERVED;
+   else if (strcmp(type, "ACPI Non-volatile Storage") == 0)
+   range->type = RANGE_ACPI_NVS;
+   else if (strcmp(type, "Uncached RAM") == 0)
+-- 
+2.7.4
+
diff --git 
a/meta/recipes-kernel/kexec/kexec-tools/0001-build_mem_phdrs-check-if-p_paddr-is-invalid.patch
 
b/meta/recipes-kernel/kexec/kexec-tools/0001-build_mem_phdrs-check-if-p_paddr-is-invalid.patch
new file mode 100644
index ..a16d60ddade4
--- /dev/null
+++ 
b/meta/recipes-kernel/kexec/kexec-tools/0001-build_mem_phdrs-check-if-p_paddr-is-invalid.patch
@@ -0,0 +1,45 @@
+From ed15ba1b9977e506637ff1697821d97127b2c919 Mon Sep 17 00:00:00 2001
+From: Pratyush Anand <pan...@redhat.com>
+Date: Wed, 1 Mar 2017 11:19:42 +0530
+Subject: [PATCH] build_mem_phdrs(): check if p_paddr is invalid
+
+Currently, all the p_paddr of PT_LOAD headers are assigned to 0, which
+is not correct and could be misleading, since 0 is a valid physical
+address.
+
+Upstream kernel commit "464920104bf7 /proc/kcore: update physical
+address for kcore ram and text" fixed it and now invalid PT_LOAD is
+assigned as -1.
+
+kexec/arch/i386/crashdump-x86.c:get_kernel_vaddr_and_size() uses kcore
+interface and so calls build_mem_phdrs() for kcore PT_LOAD headers.
+
+This patch fixes build_mem_phdrs() to check if p_paddr is invalid.
+
+Upstream-Status: Backport 
[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=ed15ba1b9977e506637ff1697821d97127b2c919]
+
+Signed-off-by: Pratyush Anand <pan...@redhat.com>
+Acked-by: Dave Young <dyo...@redhat.com>
+Signed-off-by: Simon Horman <ho...@verge.net.au>
+Signed-off-by: Liwei Song <liwei.s...@windriver.com>
+---
+ kexec/kexec-elf.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kexec/kexec-elf.c b/kexec/kexec-elf.c
+index 1d6320a2f0e6..be60bbd48486 

[oe] [meta-oe][PATCH] mcelog: upgrade to 1.49 to support Denverton SoC

2017-04-14 Thread Liwei Song
Update mcelog to 1.49 to support Denverton SoC, and delete the additional
patches which are already involved in v1.49.

Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
 .../mcelog/0001-Add-Kabylake-client-support.patch  | 96 --
 .../mcelog/mcelog/mcelog-debash.patch  | 36 
 .../mcelog/{mcelog_1.40.bb => mcelog_1.49.bb}  |  6 +-
 3 files changed, 2 insertions(+), 136 deletions(-)
 delete mode 100644 
meta-oe/recipes-support/mcelog/mcelog/0001-Add-Kabylake-client-support.patch
 delete mode 100644 meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch
 rename meta-oe/recipes-support/mcelog/{mcelog_1.40.bb => mcelog_1.49.bb} (83%)

diff --git 
a/meta-oe/recipes-support/mcelog/mcelog/0001-Add-Kabylake-client-support.patch 
b/meta-oe/recipes-support/mcelog/mcelog/0001-Add-Kabylake-client-support.patch
deleted file mode 100644
index f9dfbcab5..0
--- 
a/meta-oe/recipes-support/mcelog/mcelog/0001-Add-Kabylake-client-support.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 11bfbb446116c8313728157148a6bb15625031e8 Mon Sep 17 00:00:00 2001
-From: Tony Luck <tony.l...@intel.com>
-Date: Tue, 30 Aug 2016 09:37:02 -0700
-Subject: [PATCH] Add Kabylake client support
-
-CPU models 0x8E and 0x9E denote kabylake client processor
-
-Upstream-Status: Backport [A little modification on context]
-https://github.com/andikleen/mcelog/commit/11bfbb446116c8313728157148a6bb15625031e8
-
-Signed-off-by: Tony Luck <tony.l...@intel.com>
-Signed-off-by: Andi Kleen <a...@linux.intel.com>
-Signed-off-by: Quanyang Wang <quanyang.w...@windriver.com>

- intel.c  | 5 -
- intel.h  | 3 ++-
- mcelog.c | 4 +++-
- mcelog.h | 1 +
- 4 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/intel.c b/intel.c
-index f4ef9f6..33a99a8 100644
 a/intel.c
-+++ b/intel.c
-@@ -35,7 +35,8 @@ void intel_cpu_init(enum cputype cpu)
-   cpu == CPU_IVY_BRIDGE || cpu == CPU_IVY_BRIDGE_EPEX ||
-   cpu == CPU_HASWELL || cpu == CPU_HASWELL_EPEX || cpu == 
CPU_BROADWELL ||
-   cpu == CPU_BROADWELL_DE || cpu == CPU_BROADWELL_EPEX ||
--  cpu == CPU_KNIGHTS_LANDING || cpu == CPU_SKYLAKE || cpu == 
CPU_SKYLAKE_XEON)
-+  cpu == CPU_KNIGHTS_LANDING || cpu == CPU_SKYLAKE || cpu == 
CPU_SKYLAKE_XEON ||
-+  cpu == CPU_KABYLAKE)
-   memory_error_support = 1;
- }
- 
-@@ -90,6 +91,8 @@ enum cputype select_intel_cputype(int family, int model)
-   return CPU_SKYLAKE;
-   else if (model == 0x55)
-   return CPU_SKYLAKE_XEON;
-+  else if (model == 0x8E || model == 0x9E)
-+  return CPU_KABYLAKE;
-   if (model > 0x1a) {
-   Eprintf("Family 6 Model %u CPU: only decoding 
architectural errors\n",
-   model);
-diff --git a/intel.h b/intel.h
-index d22895b..c231925 100644
 a/intel.h
-+++ b/intel.h
-@@ -26,5 +26,6 @@ extern int memory_error_support;
-   case CPU_ATOM:  \
-   case CPU_KNIGHTS_LANDING: \
-   case CPU_SKYLAKE: \
--  case CPU_SKYLAKE_XEON
-+  case CPU_SKYLAKE_XEON: \
-+  case CPU_KABYLAKE
- 
-diff --git a/mcelog.c b/mcelog.c
-index 1d79fa1..7214a0d 100644
 a/mcelog.c
-+++ b/mcelog.c
-@@ -238,6 +238,7 @@ static char *cputype_name[] = {
-   [CPU_ATOM] = "ATOM",
-   [CPU_SKYLAKE] = "Skylake",
-   [CPU_SKYLAKE_XEON] = "Skylake server",
-+  [CPU_KABYLAKE] = "Kabylake",
- };
- 
- static struct config_choice cpu_choices[] = {
-@@ -287,6 +288,7 @@ static struct config_choice cpu_choices[] = {
-   { "atom", CPU_ATOM },
-   { "skylake", CPU_SKYLAKE },
-   { "skylake_server", CPU_SKYLAKE_XEON },
-+  { "kabylake", CPU_KABYLAKE },
-   { NULL }
- };
- 
-@@ -451,7 +453,7 @@ static void dump_mce(struct mce *m, unsigned recordlen)
-   cputype != CPU_HASWELL_EPEX && cputype != CPU_BROADWELL &&
-   cputype != CPU_BROADWELL_DE && cputype != CPU_BROADWELL_EPEX &&
-   cputype != CPU_KNIGHTS_LANDING && cputype != CPU_SKYLAKE &&
--  cputype != CPU_SKYLAKE_XEON)
-+  cputype != CPU_SKYLAKE_XEON && cputype != CPU_KABYLAKE)
-   resolveaddr(m->addr);
-   if (!ascii_mode && ismemerr && (m->status & MCI_STATUS_ADDRV)) {
-   diskdb_resolve_addr(m->addr);
-diff --git a/mcelog.h b/mcelog.h
-index abc8bc9..254b3a0 100644
 a/mcelog.h
-+++ b/mcelog.h
-@@ -130,6 +130,7 @@ enum cputype {
-   CPU_ATOM,
-   CPU_SKYLAKE,
-   CPU_SKYLAKE_XEON,
-+  CPU_KABYLAKE,
- };
- 
- enum option_ranges {
diff --git a/meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch 
b/meta-oe/recipes-support/mcelog/mcelog/mcelog-debash.patch
deleted file mode 100644
index bea2f6293..0
--- a/meta