[OE-core] LICENSE for recipes with empty SRC_URI

2018-06-29 Thread Andre McCurdy
There doesn't seem to be much consistency in the way LICENSE is
handled for recipes which don't need to define anything in SRC_URI.

 - Packagegroup recipes have a default LICENSE in packagegroup.bbclass
and generally don't define their own value, for reasons explained in:

  
http://git.openembedded.org/openembedded-core/commit/?id=c04ae17f439ffd5fd70d8564430a94582e2cf688

 - Image recipes have a default LICENSE in image.bbclass but generally
always explicitly define the value again. A precedent for doing that
seems to have been set by:

  
http://git.openembedded.org/openembedded-core/commit/?id=fb617bed6ebbb17ca9a14ea5985302b03311ccb7

 - SDK recipes (anything inheriting populate_sdk) don't have a default
LICENSE and must explicitly define one in each recipe.

Given that LICENSE is meant to apply to the sources associated with a
recipe, not the recipe itself, shouldn't all these cases be following
the approach currently taken by packagegroup recipes (ie a default set
by the appropriate class and no LICENSE in the recipe)? Or is there a
fundamental difference between these cases which justifies the three
different approaches?
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] dhcp: update 4.4.1

2018-06-29 Thread Christopher Larson
On Fri, Jun 29, 2018 at 1:40 PM akuster808  wrote:

>
>
> On 06/29/2018 08:13 AM, Christopher Larson wrote:
>
>
>
> On Sun, Jun 24, 2018 at 11:43 AM Armin Kuster 
> wrote:
>
>> include several CVE fixes.
>> CVE: CVE-2018-5733
>> CVE: CVE-2018-5732
>>
>> LIC_CHKSUM_FILE updated to SPFX format
>>
>> https://kb.isc.org/article/AA-01571
>>
>> remove several patches now included in update.
>> Shared libarary support is now enabled in configure+lt, use it
>> and revert to autotools-brokensep
>> Refresh patches
>>
>> alings support with bind 9.11.x
>>
>> add libxml2 support to configure.ac+lt
>>
>> Signed-off-by: Armin Kuster 
>> ---
>>  meta/recipes-connectivity/dhcp/dhcp.inc|  19 +-
>>  ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  13 +-
>>  .../dhcp/dhcp/0003-link-with-lcrypto.patch |  13 +-
>>  .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch| 109 +--
>>  .../dhcp/0006-site.h-enable-gentle-shutdown.patch  |  13 +-
>>  ...re-argument-to-make-the-libxml2-dependenc.patch |  40 +++-
>>  .../dhcp/dhcp/0010-build-shared-libs.patch | 208
>> -
>>  ...all-to-isc_app_ctxstart-to-not-get-signal.patch |  81 
>>  ...correct-the-intention-for-xml2-lib-search.patch |  13 +-
>>  .../dhcp/dhcp/CVE-2017-3144.patch  |  74 
>>  .../dhcp/{dhcp_4.3.6.bb => dhcp_4.4.1.bb}  |  12 +-
>>  11 files changed, 120 insertions(+), 475 deletions(-)
>>  delete mode 100644
>> meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
>>  delete mode 100644
>> meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
>>  delete mode 100644
>> meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
>>  rename meta/recipes-connectivity/dhcp/{dhcp_4.3.6.bb => dhcp_4.4.1.bb}
>> (65%)
>>
>> diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc
>> b/meta/recipes-connectivity/dhcp/dhcp.inc
>> index e943707..2eb3513 100644
>> --- a/meta/recipes-connectivity/dhcp/dhcp.inc
>> +++ b/meta/recipes-connectivity/dhcp/dhcp.inc
>> @@ -8,7 +8,7 @@ easier to administer devices."
>>  HOMEPAGE = "http://www.isc.org/;
>>
>>  LICENSE = "ISC"
>> -LIC_FILES_CHKSUM =
>> "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
>> +LIC_FILES_CHKSUM =
>> "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
>>
>>  DEPENDS = "openssl bind"
>>
>> @@ -24,7 +24,7 @@ SRC_URI = "
>> http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
>>  UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/;
>>  UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/"
>>
>> -inherit autotools systemd useradd update-rc.d
>> +inherit autotools-brokensep systemd useradd update-rc.d
>>
>>  USERADD_PACKAGES = "${PN}-server"
>>  USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir
>> /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
>> @@ -48,11 +48,21 @@ EXTRA_OECONF =
>> "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
>>
>>  --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
>>
>>  --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
>>
>>  --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
>> ---with-libbind=${STAGING_LIBDIR}/ \
>>  --enable-paranoia --disable-static \
>>  --with-randomdev=/dev/random \
>> +--with-libbind=${STAGING_DIR_HOST}/usr \
>> +   --enable-libtool \
>> "
>>
>> +#Enable shared libs per dhcp README
>> +do_configure () {
>> +   cd ${S}
>> +   cp configure.ac+lt configure.ac
>> +autoreconf -i
>> +   ./configure  ${CONFIGUREOPTS} ${EXTRA_OECONF}
>> +   automake
>>
>
> 1. Why run automake when autoreconf already runs automake?
>
> it caused errors when I did not included.
>
> 2. Why override do_configure and reproduce what's already in
> autotools-brokensep rather than doing the cp in a do_configure_prepend?
>
> I did that first and it did not work. The README regarding *+lt says it
> needs "autoreconf -i". I am only doing this as the current version of dhcp
> has a patch to create shared libs. The isc dhcp solution to this is their
> configure.ac+lt.  I would rather no do this but someone needed shared
> libs.
>

We already run autoreconf -i in the default do_configure, I see no reason
to be duplicating half of its logic when all you need to do is replace the
default configure.ac with the +lt version before that.
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] rpm: Avoid leaking temporary scriplet files

2018-06-29 Thread Olof Johansson
On 18-06-26 12:33 +0200, Alexander Kanavin wrote:
> I believe the culprit is likely this patch:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
> 
> As scriptlets are executed outside of rpm's chroot, they are being
> written into system's /var/tmp, not rootfs's. This patch should
> probably be amended to prepend the rootfs path when scriptlets are
> written out, and then we should be sorted.

Is that not a more invasive change than just removing the tmp
files unconditionally (especially in terms of maintainability)?
I'm not even sure how exactly to do that, but I'm obviously
missing something. For instance, is there a way to manipulate the
global rpmMacroContext temporarily?

But your theory seems to be right, no /var/tmp/rpm-tmp.* files
are created if i drop the patch (but some scripts fail, as
expected).

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


[OE-core] [PATCH] python*-setuptools: update to 39.2.0

2018-06-29 Thread Derek Straka
Update the python{3}-setuptools to the latest stable version

Tested on the qemu with core-image-minimal

Signed-off-by: Derek Straka 
---
 meta/recipes-devtools/python/python-setuptools.inc| 4 ++--
 .../{python-setuptools_39.0.1.bb => python-setuptools_39.2.0.bb}  | 0
 .../{python3-setuptools_39.0.1.bb => python3-setuptools_39.2.0.bb}| 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python-setuptools_39.0.1.bb => 
python-setuptools_39.2.0.bb} (100%)
 rename meta/recipes-devtools/python/{python3-setuptools_39.0.1.bb => 
python3-setuptools_39.2.0.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-setuptools.inc 
b/meta/recipes-devtools/python/python-setuptools.inc
index c5eb4a5..bf654be 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -9,8 +9,8 @@ PYPI_PACKAGE_EXT = "zip"
 
 inherit pypi
 
-SRC_URI[md5sum] = "75310b72ca0ab4e673bf7679f69d7a62"
-SRC_URI[sha256sum] = 
"bec7badf0f60e7fc8153fac47836edc41b74e5d541d7692e614e635720d6a7c7"
+SRC_URI[md5sum] = "dd4e3fa83a21bf7bf9c51026dc8a4e59"
+SRC_URI[sha256sum] = 
"f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2"
 
 DEPENDS += "${PYTHON_PN}"
 DEPENDS_class-native += "${PYTHON_PN}-native"
diff --git a/meta/recipes-devtools/python/python-setuptools_39.0.1.bb 
b/meta/recipes-devtools/python/python-setuptools_39.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_39.0.1.bb
rename to meta/recipes-devtools/python/python-setuptools_39.2.0.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_39.0.1.bb 
b/meta/recipes-devtools/python/python3-setuptools_39.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_39.0.1.bb
rename to meta/recipes-devtools/python/python3-setuptools_39.2.0.bb
-- 
2.7.4

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


[OE-core] [PATCH] mesa: Upgrade 18.1.2 -> 18.1.3

2018-06-29 Thread Otavio Salvador
This upgrades mesa to the 18.1.3 stable release.

The changes can be found at:

https://www.mesa3d.org/relnotes/18.1.3.html

Signed-off-by: Otavio Salvador 
---

 ...am-explictly-add-lib-expat-to-intel-.patch |  6 ++--
 ...0002-Simplify-wayland-scanner-lookup.patch | 10 +++---
 ...-winsys-svga-drm-Include-sys-types.h.patch |  7 ++---
 .../mesa/files/0004-hardware-gloat.patch  |  6 ++--
 ...M-version-when-using-LLVM-Git-releas.patch | 12 +++
 ...-Use-Python-3-to-execute-the-scripts.patch |  8 ++---
 ...-dri-i965-Add-missing-time.h-include.patch |  6 ++--
 ...0008-egl-fix-build-race-in-automake.patch} | 31 ++-
 .../{mesa-gl_18.1.2.bb => mesa-gl_18.1.3.bb}  |  0
 .../mesa/{mesa_18.1.2.bb => mesa_18.1.3.bb}   |  6 ++--
 10 files changed, 53 insertions(+), 39 deletions(-)
 rename meta/recipes-graphics/mesa/files/{parallel-make-race-fix.patch => 
0008-egl-fix-build-race-in-automake.patch} (50%)
 rename meta/recipes-graphics/mesa/{mesa-gl_18.1.2.bb => mesa-gl_18.1.3.bb} 
(100%)
 rename meta/recipes-graphics/mesa/{mesa_18.1.2.bb => mesa_18.1.3.bb} (83%)

diff --git 
a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
 
b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
index 822066243b..3529f493e7 100644
--- 
a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
+++ 
b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
@@ -1,7 +1,7 @@
-From 327c3dcbfa005f5d1b2fcda07ca1198d65bd23c5 Mon Sep 17 00:00:00 2001
+From b514366df767da9acf991567bbee3eaa0c4ddaa6 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia 
 Date: Wed, 11 Oct 2017 15:40:42 +0800
-Subject: [PATCH 1/7] Makefile.vulkan.am: explictly add lib expat to intel
+Subject: [PATCH 1/8] Makefile.vulkan.am: explictly add lib expat to intel
  libvulkan's lib depends
 Organization: O.S. Systems Software LTDA.
 
@@ -42,5 +42,5 @@ index 4125cb205a..356c4f8452 100644
  
  if HAVE_PLATFORM_ANDROID
 -- 
-2.17.1
+2.18.0
 
diff --git 
a/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch 
b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch
index e7585060ac..fb3d49b9be 100644
--- 
a/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch
+++ 
b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch
@@ -1,7 +1,7 @@
-From 135f6ae990df9abe3765ed339f76c55026c86fe5 Mon Sep 17 00:00:00 2001
+From 425c19542f9343e7b6a5b8aea26e1f2897484bc1 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Tue, 15 Nov 2016 15:20:49 +0200
-Subject: [PATCH 2/7] Simplify wayland-scanner lookup
+Subject: [PATCH 2/8] Simplify wayland-scanner lookup
 Organization: O.S. Systems Software LTDA.
 
 Don't use pkg-config to lookup the path of a binary that's in the path.
@@ -16,10 +16,10 @@ Signed-off-by: Jussi Kukkonen 
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f1fbdcc6c7..7c95598afc 100644
+index 49fa3e8c51..3a8f04bd12 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1796,12 +1796,7 @@ for plat in $platforms; do
+@@ -1810,12 +1810,7 @@ for plat in $platforms; do
  PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= 
$WAYLAND_PROTOCOLS_REQUIRED])
  WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir 
wayland-protocols`
  
@@ -34,5 +34,5 @@ index f1fbdcc6c7..7c95598afc 100644
  if test "x$WAYLAND_SCANNER" = "x:"; then
  AC_MSG_ERROR([wayland-scanner is needed to compile the 
wayland platform])
 -- 
-2.17.1
+2.18.0
 
diff --git 
a/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch
 
b/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch
index e5f4dfc075..669e6558d1 100644
--- 
a/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch
+++ 
b/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch
@@ -1,7 +1,7 @@
-From edb22b2f4df8dab39559ace867c3c67bc12851ae Mon Sep 17 00:00:00 2001
+From 7701d24b775de9f7b74eaa1ff80c8a6d3fb09c71 Mon Sep 17 00:00:00 2001
 From: Khem Raj 
 Date: Wed, 16 Aug 2017 18:58:20 -0700
-Subject: [PATCH 3/7] winsys/svga/drm: Include sys/types.h
+Subject: [PATCH 3/8] winsys/svga/drm: Include sys/types.h
 Organization: O.S. Systems Software LTDA.
 
 vmw_screen.h uses dev_t which is defines in sys/types.h
@@ -11,7 +11,6 @@ on glibc since sys/types.h is included through another
 system headers
 
 Signed-off-by: Khem Raj 
-Upstream-Status: Submitted
 ---
  src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
  1 file changed, 1 insertion(+)
@@ -29,5 +28,5 @@ index f21cabb51f..4c972fdaa9 100644
  #define VMW_GMR_POOL_SIZE (16*1024*1024)
  #define VMW_QUERY_POOL_SIZE (8192)
 -- 
-2.17.1
+2.18.0
 
diff --git a/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch 

Re: [OE-core] [PATCH] dhcp: update 4.4.1

2018-06-29 Thread akuster808


On 06/29/2018 08:13 AM, Christopher Larson wrote:
>
>
> On Sun, Jun 24, 2018 at 11:43 AM Armin Kuster  > wrote:
>
> include several CVE fixes.
> CVE: CVE-2018-5733
> CVE: CVE-2018-5732
>
> LIC_CHKSUM_FILE updated to SPFX format
>
> https://kb.isc.org/article/AA-01571
>
> remove several patches now included in update.
> Shared libarary support is now enabled in configure+lt, use it
> and revert to autotools-brokensep
> Refresh patches
>
> alings support with bind 9.11.x
>
> add libxml2 support to configure.ac +lt
>
> Signed-off-by: Armin Kuster  >
> ---
>  meta/recipes-connectivity/dhcp/dhcp.inc            |  19 +-
>  ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  13 +-
>  .../dhcp/dhcp/0003-link-with-lcrypto.patch         |  13 +-
>  .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch    | 109 +--
>  .../dhcp/0006-site.h-enable-gentle-shutdown.patch  |  13 +-
>  ...re-argument-to-make-the-libxml2-dependenc.patch |  40 +++-
>  .../dhcp/dhcp/0010-build-shared-libs.patch         | 208
> -
>  ...all-to-isc_app_ctxstart-to-not-get-signal.patch |  81 
>  ...correct-the-intention-for-xml2-lib-search.patch |  13 +-
>  .../dhcp/dhcp/CVE-2017-3144.patch                  |  74 
>  .../dhcp/{dhcp_4.3.6.bb  => dhcp_4.4.1.bb
> }          |  12 +-
>  11 files changed, 120 insertions(+), 475 deletions(-)
>  delete mode 100644
> meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
>  delete mode 100644
> 
> meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
>  delete mode 100644
> meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
>  rename meta/recipes-connectivity/dhcp/{dhcp_4.3.6.bb
>  => dhcp_4.4.1.bb } (65%)
>
> diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc
> b/meta/recipes-connectivity/dhcp/dhcp.inc
> index e943707..2eb3513 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp.inc
> +++ b/meta/recipes-connectivity/dhcp/dhcp.inc
> @@ -8,7 +8,7 @@ easier to administer devices."
>  HOMEPAGE = "http://www.isc.org/;
>
>  LICENSE = "ISC"
> -LIC_FILES_CHKSUM =
> "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
> +LIC_FILES_CHKSUM =
> "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
>
>  DEPENDS = "openssl bind"
>
> @@ -24,7 +24,7 @@ SRC_URI =
> "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz
>  \
>  UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/;
>  UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/"
>
> -inherit autotools systemd useradd update-rc.d
> +inherit autotools-brokensep systemd useradd update-rc.d
>
>  USERADD_PACKAGES = "${PN}-server"
>  USERADD_PARAM_${PN}-server = "--system --no-create-home
> --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
> @@ -48,11 +48,21 @@ EXTRA_OECONF =
> "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
>                
>  --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
>                
>  --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
>                
>  --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
> -                --with-libbind=${STAGING_LIBDIR}/ \
>                  --enable-paranoia --disable-static \
>                  --with-randomdev=/dev/random \
> +                --with-libbind=${STAGING_DIR_HOST}/usr \
> +               --enable-libtool \
>                 "
>
> +#Enable shared libs per dhcp README
> +do_configure () {
> +       cd ${S}
> +       cp configure.ac +lt configure.ac
> 
> +        autoreconf -i
> +       ./configure  ${CONFIGUREOPTS} ${EXTRA_OECONF}   
> +       automake
>
>
> 1. Why run automake when autoreconf already runs automake?
it caused errors when I did not included.

> 2. Why override do_configure and reproduce what's already in
> autotools-brokensep rather than doing the cp in a do_configure_prepend?
I did that first and it did not work. The README regarding *+lt says it
needs "autoreconf -i". I am only doing this as the current version of
dhcp has a patch to create shared libs. The isc dhcp solution to this is
their configure.ac+lt.  I would rather no do this but someone needed
shared libs.

- armin


> -- 
> Christopher Larson
> kergoth at gmail dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Senior Software Engineer, Mentor Graphics

-- 
___
Openembedded-core mailing 

Re: [OE-core] [PATCH] recipes-kernel/linux: Enable NUMA Kconfig from MACHINE_FEATURES

2018-06-29 Thread Alistair Francis
On Tue, Jun 19, 2018 at 12:46 PM, Khem Raj  wrote:
> This is good to apply

Ping!

Alistair

>
> On Tue, Jun 19, 2018 at 11:09 AM Alistair Francis 
> wrote:
>>
>> On Fri, May 25, 2018 at 8:56 AM, Alistair Francis
>>  wrote:
>> > If the user has set numa in their MACHINE_FEATURES we should enable
>> > NUMA support in the kernel config.
>> >
>> > Signed-off-by: Alistair Francis 
>> > Acked-by: Bruce Ashfield 
>>
>> Ping!
>>
>> Alistair
>>
>> > ---
>> >  meta/recipes-kernel/linux/linux-yocto.inc | 2 ++
>> >  1 file changed, 2 insertions(+)
>> >
>> > diff --git a/meta/recipes-kernel/linux/linux-yocto.inc
>> > b/meta/recipes-kernel/linux/linux-yocto.inc
>> > index 3bb872a32a..a8ac237656 100644
>> > --- a/meta/recipes-kernel/linux/linux-yocto.inc
>> > +++ b/meta/recipes-kernel/linux/linux-yocto.inc
>> > @@ -28,6 +28,8 @@ KERNEL_LD_append_nios2 = " ${TOOLCHAIN_OPTIONS}"
>> >
>> >  KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc"
>> >
>> > +KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES',
>> > 'numa', 'features/numa/numa.scc', '', d)}"
>> > +
>> >  # A KMACHINE is the mapping of a yocto $MACHINE to what is built
>> >  # by the kernel. This is typically the branch that should be built,
>> >  # and it can be specific to the machine or shared
>> > --
>> > 2.17.0
>> >
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH v2] oe-selftest: Add bitbake-layer create-layer test

2018-06-29 Thread Joshua Watt
Adds a test that creates a layer, adds it to bblayers.conf, then ensure
that it appears properly in bitbake-layers show-layers.

Signed-off-by: Joshua Watt 
---
 meta/lib/oeqa/selftest/cases/bblayers.py | 26 +++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py 
b/meta/lib/oeqa/selftest/cases/bblayers.py
index 90a2249b081..f2fc8327647 100644
--- a/meta/lib/oeqa/selftest/cases/bblayers.py
+++ b/meta/lib/oeqa/selftest/cases/bblayers.py
@@ -2,7 +2,7 @@ import os
 import re
 
 import oeqa.utils.ftools as ftools
-from oeqa.utils.commands import runCmd, get_bb_var
+from oeqa.utils.commands import runCmd, get_bb_var, get_bb_vars
 
 from oeqa.selftest.case import OESelftestTestCase
 from oeqa.core.decorator.oeid import OETestID
@@ -85,6 +85,30 @@ class BitbakeLayers(OESelftestTestCase):
 self.assertNotEqual(result.status, 0, 'bitbake-layers show-recipes -i 
nonexistentclass should have failed')
 self.assertIn('ERROR:', result.output)
 
+def test_bitbakelayers_createlayer(self):
+priority = 10
+layername = 'test-bitbakelayer-layercreate'
+layerpath = os.path.join(get_bb_var('COREBASE'), layername)
+self.assertFalse(os.path.exists(layerpath), '%s should not exist at 
this point in time' % layerpath)
+result = runCmd('bitbake-layers create-layer --priority=%d %s' % 
(priority, layerpath))
+self.track_for_cleanup(layerpath)
+result = runCmd('bitbake-layers add-layer %s' % layerpath)
+result = runCmd('bitbake-layers show-layers')
+find_in_contents = re.search(re.escape(layername) + r'\s+' + 
re.escape(layerpath) + r'\s+' + re.escape(str(priority)), result.output)
+self.assertTrue(find_in_contents, "%s not found in layers\n%s" % 
(layername, result.output))
+
+layervars = ['BBFILE_PRIORITY', 'BBFILE_PATTERN', 'LAYERDEPENDS', 
'LAYERSERIES_COMPAT']
+bb_vars = get_bb_vars(['BBFILE_COLLECTIONS'] + ['%s_%s' % (v, 
layername) for v in layervars])
+
+for v in layervars:
+varname = '%s_%s' % (v, layername)
+self.assertIsNotNone(bb_vars[varname], "%s not found" % varname)
+
+find_in_contents = re.search(r'(^|\s)' + re.escape(layername) + 
r'($|\s)', bb_vars['BBFILE_COLLECTIONS'])
+self.assertTrue(find_in_contents, "%s not in BBFILE_COLLECTIONS" % 
layername)
+
+self.assertEqual(bb_vars['BBFILE_PRIORITY_%s' % layername], 
str(priority), 'BBFILE_PRIORITY_%s != %d' % (layername, priority))
+
 def get_recipe_basename(self, recipe):
 recipe_file = ""
 result = runCmd("bitbake-layers show-recipes -f %s" % recipe)
-- 
2.17.1

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


Re: [OE-core] Sumo webkitgtk fails to compile

2018-06-29 Thread Michael Gloff
I'm not sure either why I am seeing this and thought that this would have
been also seen on the autobuilder. Is there some configuration on the AB
that does not trigger the clash? Can anyone else validate the clash with a
fresh checkout of Sumo?

Michael

On Thu, Jun 28, 2018 at 6:14 AM, Alexander Kanavin 
wrote:

> TBH, I'm not sure why Michael is seeing this failure either. Sumo does
> get built on the AB against several qemu targets, and the failure does
> not happen there.
>
> Alex
>
> 2018-06-28 4:28 GMT+02:00 Carlos Alberto Lopez Perez :
> > On 27/06/18 19:27, Michael Gloff wrote:
> >> # GL/GLES header clash: both define the same thing, differently, on 32
> bit
> >> x86
> >> EXTRA_OECMAKE_append_x86 = " -DUSE_GSTREAMER_GL=OFF "
> >> EXTRA_OECMAKE_append_x86-x32 = " -DUSE_GSTREAMER_GL=OFF "
> >>
> >> I think the best thing to do it to turn off USE_GSTREAMER_GL for all
> >> architectures. Would a patch doing so be acceptable? I've verified that
> it
> >> will build with the _armv5 case.
> >
> > USE_GSTREAMER_GL is a feature of WebKitGTK+ that allows it to leverage
> > hardware-accelerated video decoding (for example: on i.MX6).
> >
> > I think is acceptable to disable this for ARMv5 (because, AFAIK, there
> > isn't any ARMv5 hardware that can leverage this in any case), but this
> > should remain enabled for other architectures.
> >
> >
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] xtrans: Fix multilib .pc file conflict

2018-06-29 Thread Richard Purdie
Error: Transaction check error:
  file /usr/share/pkgconfig/xtrans.pc from install of 
lib32-xtrans-dev-1:1.3.5-r0.core2_32 conflicts with file from package 
xtrans-dev-1:1.3.5-r0.core2_64

Signed-off-by: Richard Purdie 
---
 .../xorg-lib/xtrans/multilibfix.patch  | 18 ++
 meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch

diff --git a/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch 
b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch
new file mode 100644
index 000..c513bad20e6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch
@@ -0,0 +1,18 @@
+The xtrans.pc file is installed into a non-arch directory yet contains libdir
+which can vary depending on which multilib is configured. The .pc file does
+not require libdir so remove this to fix multilib builds.
+
+Signed-off-by: Richard Purdie 
+Upstream-Status: Pending
+
+Index: xtrans-1.3.5/xtrans.pc.in
+===
+--- xtrans-1.3.5.orig/xtrans.pc.in
 xtrans-1.3.5/xtrans.pc.in
+@@ -1,6 +1,5 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+ includedir=@includedir@
+ 
+ Name: XTrans
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb 
b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
index d5b7f1a2c6b..200716fb023 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
@@ -12,6 +12,8 @@ require xorg-lib-common.inc
 LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca"
 
+SRC_URI += "file://multilibfix.patch"
+
 PE = "1"
 
 RDEPENDS_${PN}-dev = ""
-- 
2.17.1

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


[OE-core] [PATCH 1/2] staging/image: Fix multilib recipe sysroot issues

2018-06-29 Thread Richard Purdie
Currently if you enable multilib, then build an image, the multilib
recipe sysroot is build in the wrong WORKDIR. If you then clean and
rebuild the image you see "file exists" errors.

This patch ensures the real WORKDIR is used consistently and then
cleans/rebuilds also work correctly.

Signed-off-by: Richard Purdie 
---
 meta/classes/staging.bbclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 3fcbc9f15d3..f04c7b637d9 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -471,6 +471,10 @@ python extend_recipe_sysroot() {
 os.symlink(c + "." + taskhash, depdir + "/" + c)
 
 manifest, d2 = oe.sstatesig.find_sstate_manifest(c, 
setscenedeps[dep][2], "populate_sysroot", d, multilibs)
+if d2 is not d:
+# If we don't do this, the recipe sysroot will be placed in the 
wrong WORKDIR for multilibs
+# We need a consistent WORKDIR for the image
+d2.setVar("WORKDIR", d.getVar("WORKDIR"))
 destsysroot = d2.getVar("RECIPE_SYSROOT")
 
 native = False
-- 
2.17.1

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


[OE-core] [PATCH] Fix & extend recommendations for license packages.

2018-06-29 Thread Alp Özmert
Changed package recommendations so that the license package of a
recipe is recommended for all packages of a recipe instead of for one
package given by the recipe name.

Pre-patch behaviour results in a missing recommendation when a recipe
does not have a package with the same name.

Signed-off-by: Alp Özmert 
---
 meta/classes/license.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 06dd4a8..79ea7ed 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -340,6 +340,7 @@ def add_package_and_files(d):
 # first in PACKAGES to be sure that nothing else gets 
LICENSE_FILES_DIRECTORY
 d.setVar('PACKAGES', "%s %s" % (pn_lic, packages))
 d.setVar('FILES_' + pn_lic, files)
+for pn in packages.split():
 rrecommends_pn = d.getVar('RRECOMMENDS_' + pn)
 if rrecommends_pn:
 d.setVar('RRECOMMENDS_' + pn, "%s %s" % (pn_lic, rrecommends_pn))
-- 
2.7.4

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


Re: [OE-core] [PATCH] dhcp: update 4.4.1

2018-06-29 Thread Christopher Larson
On Sun, Jun 24, 2018 at 11:43 AM Armin Kuster  wrote:

> include several CVE fixes.
> CVE: CVE-2018-5733
> CVE: CVE-2018-5732
>
> LIC_CHKSUM_FILE updated to SPFX format
>
> https://kb.isc.org/article/AA-01571
>
> remove several patches now included in update.
> Shared libarary support is now enabled in configure+lt, use it
> and revert to autotools-brokensep
> Refresh patches
>
> alings support with bind 9.11.x
>
> add libxml2 support to configure.ac+lt
>
> Signed-off-by: Armin Kuster 
> ---
>  meta/recipes-connectivity/dhcp/dhcp.inc|  19 +-
>  ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  13 +-
>  .../dhcp/dhcp/0003-link-with-lcrypto.patch |  13 +-
>  .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch| 109 +--
>  .../dhcp/0006-site.h-enable-gentle-shutdown.patch  |  13 +-
>  ...re-argument-to-make-the-libxml2-dependenc.patch |  40 +++-
>  .../dhcp/dhcp/0010-build-shared-libs.patch | 208
> -
>  ...all-to-isc_app_ctxstart-to-not-get-signal.patch |  81 
>  ...correct-the-intention-for-xml2-lib-search.patch |  13 +-
>  .../dhcp/dhcp/CVE-2017-3144.patch  |  74 
>  .../dhcp/{dhcp_4.3.6.bb => dhcp_4.4.1.bb}  |  12 +-
>  11 files changed, 120 insertions(+), 475 deletions(-)
>  delete mode 100644
> meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
>  delete mode 100644
> meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
>  delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
>  rename meta/recipes-connectivity/dhcp/{dhcp_4.3.6.bb => dhcp_4.4.1.bb}
> (65%)
>
> diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc
> b/meta/recipes-connectivity/dhcp/dhcp.inc
> index e943707..2eb3513 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp.inc
> +++ b/meta/recipes-connectivity/dhcp/dhcp.inc
> @@ -8,7 +8,7 @@ easier to administer devices."
>  HOMEPAGE = "http://www.isc.org/;
>
>  LICENSE = "ISC"
> -LIC_FILES_CHKSUM =
> "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
> +LIC_FILES_CHKSUM =
> "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
>
>  DEPENDS = "openssl bind"
>
> @@ -24,7 +24,7 @@ SRC_URI = "
> http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
>  UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/;
>  UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/"
>
> -inherit autotools systemd useradd update-rc.d
> +inherit autotools-brokensep systemd useradd update-rc.d
>
>  USERADD_PACKAGES = "${PN}-server"
>  USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir
> /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
> @@ -48,11 +48,21 @@ EXTRA_OECONF =
> "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
>
>  --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
>
>  --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
>
>  --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
> ---with-libbind=${STAGING_LIBDIR}/ \
>  --enable-paranoia --disable-static \
>  --with-randomdev=/dev/random \
> +--with-libbind=${STAGING_DIR_HOST}/usr \
> +   --enable-libtool \
> "
>
> +#Enable shared libs per dhcp README
> +do_configure () {
> +   cd ${S}
> +   cp configure.ac+lt configure.ac
> +autoreconf -i
> +   ./configure  ${CONFIGUREOPTS} ${EXTRA_OECONF}
> +   automake
>

1. Why run automake when autoreconf already runs automake?
2. Why override do_configure and reproduce what's already in
autotools-brokensep rather than doing the cp in a do_configure_prepend?
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [sumo][PATCH 2/2] lame: remove LICENSE_FLAGS

2018-06-29 Thread Nicolas Dechesne
From: Kai Kang 

The patent on mp3 format due to expire, so remove LICENSE_FLAGS from
lame recipe.

Ref:
https://bugzilla.gnome.org/show_bug.cgi?id=774252

Signed-off-by: Kai Kang 
Signed-off-by: Ross Burton 
(cherry picked from commit ef98095cabeb54bd86c2cb78229a1180c7403d4d)
Signed-off-by: Nicolas Dechesne 
---
 meta/recipes-multimedia/lame/lame_3.100.bb | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-multimedia/lame/lame_3.100.bb 
b/meta/recipes-multimedia/lame/lame_3.100.bb
index ff6ac7efb2..7f8996fb52 100644
--- a/meta/recipes-multimedia/lame/lame_3.100.bb
+++ b/meta/recipes-multimedia/lame/lame_3.100.bb
@@ -3,14 +3,12 @@ HOMEPAGE = "http://lame.sourceforge.net/;
 BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290=100290;
 SECTION = "console/utils"
 LICENSE = "LGPLv2+"
-LICENSE_FLAGS = "commercial"
-
-DEPENDS = "ncurses gettext-native"
-
 LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
 
file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b
 \
 "
 
+DEPENDS = "ncurses gettext-native"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
file://no-gtk1.patch \
"
-- 
2.17.1

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


[OE-core] [sumo][PATCH 0/2] remove LICENSE_FLAGS for lame and mpg123

2018-06-29 Thread Nicolas Dechesne
The patent for lame and mpg123 have expired, and the LICENSE_FLAGS
have been cleared in oe-core recently. Since sumo uses the same
version of the software, I thought it would be a good thing to clear
the LICENSE_FLAGS there too.

These 2 patches are cherry picked from master, applied on sumo.

Kai Kang (2):
  mpg123: remove LICENSE_FLAGS
  lame: remove LICENSE_FLAGS

 meta/recipes-multimedia/lame/lame_3.100.bb   | 6 ++
 meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

-- 
2.17.1

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


[OE-core] [sumo][PATCH 1/2] mpg123: remove LICENSE_FLAGS

2018-06-29 Thread Nicolas Dechesne
From: Kai Kang 

mgp123 is patent free from version 1.25.0, so remove LICENSE_FLAGS.

https://mpg123.de/cgi-bin/news.cgi#2017-05-29

Signed-off-by: Kai Kang 
Signed-off-by: Ross Burton 
(cherry picked from commit b0bc82a5f238db82425b3b146e269bc6605cbdce)
Signed-off-by: Nicolas Dechesne 
---
 meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb 
b/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
index 929069ab49..ff2b7d893b 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
@@ -7,7 +7,6 @@ BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/;
 SECTION = "multimedia"
 
 LICENSE = "LGPLv2.1"
-LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2;
-- 
2.17.1

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


Re: [OE-core] [morty][PATCH] apr: fix off_t size can't match when configure and in target glibc

2018-06-29 Thread Khem Raj
this is ok. however we should refer to

https://bz.apache.org/bugzilla/show_bug.cgi?id=56053

in the patch description somewhere, at least on master.
On Fri, Jun 29, 2018 at 5:59 AM George McCollister
 wrote:
>
> From: Dengke Du 
>
> When subversion run on x86 and lib32 on x86-64, it use the APR's
> apr.h header file. But when configure the APR, APR meets the cross
> compiling, it was hardcoded in configure.in in apr source code. As
> the following:
>
> APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8)
>
> It pass 8 bytes to off_t when meets cross compiling, but on x86 or lib32
> the off_t in glibc was 4 bytes, so it let the application who use apr.h
> go to wrong.
>
> Such as subversion:
>
> svnadmin create test
>
> So we should let the APR detect the correct off_t when cross compiling,
> change it to the following:
>
> AC_CHECK_SIZEOF(off_t)
>
> The same for the following hardcoded types for cross compiling:
>
> pid_t   8
> size_t  8
> ssize_t 8
>
> Change the above correspondingly.
>
> Signed-off-by: Dengke Du 
> Signed-off-by: Ross Burton 
>
> Cherry-picked from master e18820ca9202c07e2406d702c46f45415182b7a6
> I spent 4 hours tracking down a problem where apache was responding
> to a request with corrupt Content-Range data. This patch fixes the
> problem.
>
> Signed-off-by: George McCollister 
> ---
>  ...ze-doesn-t-match-in-glibc-when-cross.patch | 76 +++
>  meta/recipes-support/apr/apr_1.5.2.bb |  1 +
>  2 files changed, 77 insertions(+)
>  create mode 100644 
> meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
>
> diff --git 
> a/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
>  
> b/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
> new file mode 100644
> index 00..12371428f0
> --- /dev/null
> +++ 
> b/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
> @@ -0,0 +1,76 @@
> +From f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001
> +From: Dengke Du 
> +Date: Wed, 14 Dec 2016 18:13:08 +0800
> +Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross
> + compiling
> +
> +In configure.in, it contains the following:
> +
> +   APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8)
> +
> +the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4,
> +it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross
> +compiling enable.
> +
> +So it was hardcoded for cross compiling, we should detect it dynamic based on
> +the sysroot's glibc. We change it to the following:
> +
> +   AC_CHECK_SIZEOF(off_t)
> +
> +The same for the following hardcoded types for cross compiling:
> +
> +   pid_t   8
> +   ssize_t 8
> +   size_t  8
> +   off_t   8
> +
> +Change the above correspondingly.
> +
> +Signed-off-by: Dengke Du 
> +---
> + configure.in | 8 
> + 1 file changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/configure.in b/configure.in
> +index 9d57ae6..5b19940 100644
> +--- a/configure.in
>  b/configure.in
> +@@ -1681,7 +1681,7 @@ else
> + socklen_t_value="int"
> + fi
> +
> +-APR_CHECK_SIZEOF_EXTENDED([#include ], pid_t, 8)
> ++AC_CHECK_SIZEOF(pid_t)
> +
> + if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
> + pid_t_fmt='#define APR_PID_T_FMT "hd"'
> +@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, 
> [ssize_t_fmt="ld"])
> + APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
> + APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
> +
> +-APR_CHECK_SIZEOF_EXTENDED([#include ], ssize_t, 8)
> ++AC_CHECK_SIZEOF(ssize_t)
> +
> + AC_MSG_CHECKING([which format to use for apr_ssize_t])
> + if test -n "$ssize_t_fmt"; then
> +@@ -1767,7 +1767,7 @@ fi
> +
> + ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
> +
> +-APR_CHECK_SIZEOF_EXTENDED([#include ], size_t, 8)
> ++AC_CHECK_SIZEOF(size_t)
> +
> + AC_MSG_CHECKING([which format to use for apr_size_t])
> + if test -n "$size_t_fmt"; then
> +@@ -1784,7 +1784,7 @@ fi
> +
> + size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
> +
> +-APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8)
> ++AC_CHECK_SIZEOF(off_t)
> +
> + if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
> + # Enable LFS
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-support/apr/apr_1.5.2.bb 
> b/meta/recipes-support/apr/apr_1.5.2.bb
> index 302c93504b..f560c8b9c4 100644
> --- a/meta/recipes-support/apr/apr_1.5.2.bb
> +++ b/meta/recipes-support/apr/apr_1.5.2.bb
> @@ -17,6 +17,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
> file://upgrade-and-fix-1.5.1.patch \
> file://Fix-packet-discards-HTTP-redirect.patch \
> file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch 
> \
> +   
> 

Re: [OE-core] [PATCH] dhcp: update 4.4.1

2018-06-29 Thread Paulo Neves
This patch and actually even older dhcp recipes should fail when the
${libdir} = /usr/lib64, because the configure+lt.ac hardcodes
$use_binddir/lib and we pass --with-libbind=${STAGING_DIR_HOST}/usr \


Here is my preliminary fix, although it is ugly and just a proof of
concept. I am not an autotools expert so perhaps there is a better way
to detect the libdir in autotools. On the other hand if this is ok I
can submit a propper patch

>From a0786aa60a36b595591c2d4c54517aca38023a5c Mon Sep 17 00:00:00 2001
From: Paulo Neves 
Date: Fri, 29 Jun 2018 14:59:39 +0200
Subject: [PATCH 1/1] binddir fix

---
 configure.ac+lt | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/configure.ac+lt b/configure.ac+lt
index bfa672a..bb54698 100644
--- a/configure.ac+lt
+++ b/configure.ac+lt
@@ -801,22 +801,22 @@ no)
if test ! -d "$use_libbind"; then
AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
fi
-   if test ! -d "$use_libbind/include" -o \
-   ! -f "$use_libbind/include/isc/buffer.h"
+   if test ! -d "$use_libbind/../include" -o \
+   ! -f "$use_libbind/../include/isc/buffer.h"
then
-   AC_MSG_ERROR([Cannot find bind includes at
$use_libbind/include])
+   AC_MSG_ERROR([Cannot find bind includes at
$use_libbind/../include])
fi
-   if test ! -d "$use_libbind/lib" -o \
-   \( ! -f "$use_libbind/lib/libisc.a" -a \
-  ! -f "$use_libbind/lib/libisc.la" \)
+   if test ! -d "$use_libbind/" -o \
+   \( ! -f "$use_libbind/libisc.a" -a \
+  ! -f "$use_libbind/libisc.la" \)
then
-   AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
+   AC_MSG_ERROR([Cannot find bind libraries at $use_libbind])
fi
-   BINDDIR="$use_libbind"
-   BINDLIBIRSDIR="$BINDDIR/lib"
-   BINDLIBDNSDIR="$BINDDIR/lib"
-   BINDLIBISCCFGDIR="$BINDDIR/lib"
-   BINDLIBISCDIR="$BINDDIR/lib"
+   BINDDIR="$use_libbind../"
+   BINDLIBIRSDIR="$use_libbind"
+   BINDLIBDNSDIR="$use_libbind"
+   BINDLIBISCCFGDIR="$use_libbind"
+   BINDLIBISCDIR="$use_libbind"
DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
;;
 esac
@@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool,

 if test "$use_libbind" != "no"; then
if test "$want_libtool" = "yes" -a \
-   ! -f "$use_libbind/lib/libisc.la"
+   ! -f "$use_libbind/libisc.la"

On Sun, Jun 24, 2018 at 8:43 PM, Armin Kuster  wrote:
> include several CVE fixes.
> CVE: CVE-2018-5733
> CVE: CVE-2018-5732
>
> LIC_CHKSUM_FILE updated to SPFX format
>
> https://kb.isc.org/article/AA-01571
>
> remove several patches now included in update.
> Shared libarary support is now enabled in configure+lt, use it
> and revert to autotools-brokensep
> Refresh patches
>
> alings support with bind 9.11.x
>
> add libxml2 support to configure.ac+lt
>
> Signed-off-by: Armin Kuster 
> ---
>  meta/recipes-connectivity/dhcp/dhcp.inc|  19 +-
>  ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  13 +-
>  .../dhcp/dhcp/0003-link-with-lcrypto.patch |  13 +-
>  .../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch| 109 +--
>  .../dhcp/0006-site.h-enable-gentle-shutdown.patch  |  13 +-
>  ...re-argument-to-make-the-libxml2-dependenc.patch |  40 +++-
>  .../dhcp/dhcp/0010-build-shared-libs.patch | 208 
> -
>  ...all-to-isc_app_ctxstart-to-not-get-signal.patch |  81 
>  ...correct-the-intention-for-xml2-lib-search.patch |  13 +-
>  .../dhcp/dhcp/CVE-2017-3144.patch  |  74 
>  .../dhcp/{dhcp_4.3.6.bb => dhcp_4.4.1.bb}  |  12 +-
>  11 files changed, 120 insertions(+), 475 deletions(-)
>  delete mode 100644 
> meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
>  delete mode 100644 
> meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
>  delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
>  rename meta/recipes-connectivity/dhcp/{dhcp_4.3.6.bb => dhcp_4.4.1.bb} (65%)
>
> diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc 
> b/meta/recipes-connectivity/dhcp/dhcp.inc
> index e943707..2eb3513 100644
> --- a/meta/recipes-connectivity/dhcp/dhcp.inc
> +++ b/meta/recipes-connectivity/dhcp/dhcp.inc
> @@ -8,7 +8,7 @@ easier to administer devices."
>  HOMEPAGE = "http://www.isc.org/;
>
>  LICENSE = "ISC"
> -LIC_FILES_CHKSUM = 
> "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"
> +LIC_FILES_CHKSUM = 
> "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
>
>  DEPENDS = "openssl bind"
>
> @@ -24,7 +24,7 @@ SRC_URI = 
> "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
>  UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/;
>  UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/"
>
> -inherit autotools systemd 

[OE-core] [morty][PATCH] apr: fix off_t size can't match when configure and in target glibc

2018-06-29 Thread George McCollister
From: Dengke Du 

When subversion run on x86 and lib32 on x86-64, it use the APR's
apr.h header file. But when configure the APR, APR meets the cross
compiling, it was hardcoded in configure.in in apr source code. As
the following:

APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8)

It pass 8 bytes to off_t when meets cross compiling, but on x86 or lib32
the off_t in glibc was 4 bytes, so it let the application who use apr.h
go to wrong.

Such as subversion:

svnadmin create test

So we should let the APR detect the correct off_t when cross compiling,
change it to the following:

AC_CHECK_SIZEOF(off_t)

The same for the following hardcoded types for cross compiling:

pid_t   8
size_t  8
ssize_t 8

Change the above correspondingly.

Signed-off-by: Dengke Du 
Signed-off-by: Ross Burton 

Cherry-picked from master e18820ca9202c07e2406d702c46f45415182b7a6
I spent 4 hours tracking down a problem where apache was responding
to a request with corrupt Content-Range data. This patch fixes the
problem.

Signed-off-by: George McCollister 
---
 ...ze-doesn-t-match-in-glibc-when-cross.patch | 76 +++
 meta/recipes-support/apr/apr_1.5.2.bb |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 
meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch

diff --git 
a/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
 
b/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
new file mode 100644
index 00..12371428f0
--- /dev/null
+++ 
b/meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
@@ -0,0 +1,76 @@
+From f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001
+From: Dengke Du 
+Date: Wed, 14 Dec 2016 18:13:08 +0800
+Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross
+ compiling
+
+In configure.in, it contains the following:
+
+   APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8)
+
+the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4,
+it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross
+compiling enable.
+
+So it was hardcoded for cross compiling, we should detect it dynamic based on
+the sysroot's glibc. We change it to the following:
+
+   AC_CHECK_SIZEOF(off_t)
+
+The same for the following hardcoded types for cross compiling:
+
+   pid_t   8
+   ssize_t 8
+   size_t  8
+   off_t   8
+
+Change the above correspondingly.
+
+Signed-off-by: Dengke Du 
+---
+ configure.in | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 9d57ae6..5b19940 100644
+--- a/configure.in
 b/configure.in
+@@ -1681,7 +1681,7 @@ else
+ socklen_t_value="int"
+ fi
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include ], pid_t, 8)
++AC_CHECK_SIZEOF(pid_t)
+ 
+ if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
+ pid_t_fmt='#define APR_PID_T_FMT "hd"'
+@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, 
[ssize_t_fmt="ld"])
+ APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
+ APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include ], ssize_t, 8)
++AC_CHECK_SIZEOF(ssize_t)
+ 
+ AC_MSG_CHECKING([which format to use for apr_ssize_t])
+ if test -n "$ssize_t_fmt"; then
+@@ -1767,7 +1767,7 @@ fi
+ 
+ ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include ], size_t, 8)
++AC_CHECK_SIZEOF(size_t)
+ 
+ AC_MSG_CHECKING([which format to use for apr_size_t])
+ if test -n "$size_t_fmt"; then
+@@ -1784,7 +1784,7 @@ fi
+ 
+ size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
+ 
+-APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8)
++AC_CHECK_SIZEOF(off_t)
+ 
+ if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
+ # Enable LFS
+-- 
+2.7.4
+
diff --git a/meta/recipes-support/apr/apr_1.5.2.bb 
b/meta/recipes-support/apr/apr_1.5.2.bb
index 302c93504b..f560c8b9c4 100644
--- a/meta/recipes-support/apr/apr_1.5.2.bb
+++ b/meta/recipes-support/apr/apr_1.5.2.bb
@@ -17,6 +17,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
file://upgrade-and-fix-1.5.1.patch \
file://Fix-packet-discards-HTTP-redirect.patch \
file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
+   
file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
 "
 
 SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa"
-- 
2.17.1

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


Re: [OE-core] [PATCH] kmscube: Update to master from 2018-06-17

2018-06-29 Thread Nicolas Dechesne
On Thu, Jun 28, 2018 at 3:56 PM Daniel Díaz  wrote:
>
> Changes from 0d8de4ce:
>   c2d4ba8 drm-legacy: fix poll for flip event, actually exit on user input
>   56c3917 formats: use weston's egl config matching logic, centralize format
>   aac3788 Rework default modifier handling
>   4f7cec0 Use weak functions to handle lack of gbm modifiers
>   98f31bf cube-tex: make use of modifiers
>   063ce5c gbm: fix fallback for drivers that don't support modifiers
>   9dcce71 add MSAA
>
> Also refresh gbm_bo_map/_unmap patch.
>
> Signed-off-by: Daniel Díaz 

Thanks for sending this out! without

>   063ce5c gbm: fix fallback for drivers that don't support modifiers

kmscube is broken and won't work with Gallium drivers (e.g. freedreno)
if mesa > 18.x, and since OE-core has mesa 18.1.2, it means kmscube is
currently broken!

Acked-by: Nicolas Dechesne 

> ---
>  .../detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch  | 10 
> +-
>  meta/recipes-graphics/kmscube/kmscube_git.bb   |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git 
> a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
>  
> b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
> index 3605446..611e541 100644
> --- 
> a/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
> +++ 
> b/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
> @@ -49,9 +49,9 @@ diff --git a/configure.ac b/configure.ac
>  index 8397f7b..c7f1f4d 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -65,5 +65,8 @@ if test "x$enable_gbm_modifiers" = xyes; then
> -   AC_DEFINE(HAVE_GBM_MODIFIERS, 1, [Define if you can use GBM 
> properties.])
> +@@ -49,5 +49,8 @@ if test "x$HAVE_GST" = "xyes"; then
>   fi
> + AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"])
>
>  +AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], [])
>  +AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"])
> @@ -99,12 +99,12 @@ diff --git a/kmscube.c b/kmscube.c
>  index 3a2c4dd..276dc55 100644
>  --- a/kmscube.c
>  +++ b/kmscube.c
> -@@ -142,7 +142,11 @@ int main(int argc, char *argv[])
> +@@ -148,7 +148,11 @@ int main(int argc, char *argv[])
> else if (mode == VIDEO)
> -   egl = init_cube_video(gbm, video);
> +   egl = init_cube_video(gbm, video, samples);
> else
>  +#if HAVE_GBM_BO_MAP
> -   egl = init_cube_tex(gbm, mode);
> +   egl = init_cube_tex(gbm, mode, samples);
>  +#else
>  +  printf("gbm_bo_map() support missing\n");
>  +#endif
> diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb 
> b/meta/recipes-graphics/kmscube/kmscube_git.bb
> index 5b64ed6..46aeeb0 100644
> --- a/meta/recipes-graphics/kmscube/kmscube_git.bb
> +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
> @@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm gstreamer1.0 
> gstreamer1.0-plugins
>
>  LIC_FILES_CHKSUM = 
> "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
>
> -SRCREV = "0d8de4ce3a03f36af1817f9b0586d132ad2c5d2e"
> +SRCREV = "9dcce71e603616ee7a54707e932f962cdf8fb20a"
>  SRC_URI = 
> "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \
>  file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch"
>  UPSTREAM_CHECK_COMMITS = "1"
> --
> 2.7.4
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [OE-Core][PATCH 1/2] image: Set COREBASE as the git directory for timestamp

2018-06-29 Thread Alex Kiernan
On Thu, Jun 28, 2018 at 7:34 PM Peter Kjellerstedt
 wrote:
>
> > -Original Message-
> > From: Alex Kiernan [mailto:alex.kier...@gmail.com]
> > Sent: den 28 juni 2018 17:57
> > To: kerg...@gmail.com
> > Cc: richard.pur...@linuxfoundation.org; Peter Kjellerstedt
> > ; openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [OE-Core][PATCH 1/2] image: Set COREBASE as the
> > git directory for timestamp
> >
> > On Thu, Jun 28, 2018 at 4:31 PM Christopher Larson 
> > wrote:
> > >
> > > On Thu, Jun 28, 2018 at 8:29 AM Richard Purdie
> >  wrote:
> > >>
> > >> On Thu, 2018-06-28 at 15:18 +, Peter Kjellerstedt wrote:
> > >> > There is no guarantee that ${COREBASE} refers to a path that is
> > >> > under Git control. E.g., in our case it refers to a directory that
> > >> > is under repo control. "${COREBASE}/meta" is probably a better
> > >> > option.
> > >>
> > >> You could make that argument about /meta too.
> > >>
> > >> I'd suggest the code checks for ${COREBASE}/.git and if that doesn't
> >
> > In a poky checkout from repo (which is what I'm also using),
> > ${COREBASE}/meta/.git doesn't exist, but ${COREBASE}/.git does, but
> > that all works because it's climbing the directory tree to find the
> > .git directory.
> >
> > >> exist, fall back to the timestamp of the
> > >> ${COREBASE}/meta/conf/bitbake.conf file.
> > >
> > > That's a good idea, but I'd suggest using bb.utils.which() to locate
> > > conf/bibake.conf rather than hardcoding that path.
> >
> > How about (totally untested):
> >
> > if git -C "${COREBASE}/meta" rev-parse --show-toplevel; then
> >   REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}/meta" log -1 
> > --pretty=%ct`
> > else
> >   REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(bbpath, 
> > "conf/bitbake.conf")}`
> > fi
> >
> > ?
>
> You do not really need the first git call above:
>
> REPRODUCIBLE_TIMESTAMP_ROOTFS=$(git -C "${COREBASE}/meta" log -1 --pretty=%ct 
> 2>/dev/null)
> if [ -z "$REPRODUCIBLE_TIMESTAMP_ROOTFS" ]; then
> REPRODUCIBLE_TIMESTAMP_ROOTFS=$(stat -c%Y ${@bb.utils.which(bbpath, 
> "conf/bitbake.conf")})
> fi
>

That's true... I'll post an update

--
Alex Kiernan
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [sumo][PATCH] procps:Fix-CVE-2018-1122-1123

2018-06-29 Thread Hong Liu
Fix CVE-2018-1122 & CVE-2018-1122

Signed-off-by: Hong Liu 
---
 .../procps/procps/CVE-2018-1122.patch  | 70 ++
 .../procps/procps/CVE-2018-1123.patch  | 84 ++
 meta/recipes-extended/procps/procps_3.3.12.bb  |  2 +
 3 files changed, 156 insertions(+)
 create mode 100644 meta/recipes-extended/procps/procps/CVE-2018-1122.patch
 create mode 100644 meta/recipes-extended/procps/procps/CVE-2018-1123.patch

diff --git a/meta/recipes-extended/procps/procps/CVE-2018-1122.patch 
b/meta/recipes-extended/procps/procps/CVE-2018-1122.patch
new file mode 100644
index 000..f840873
--- /dev/null
+++ b/meta/recipes-extended/procps/procps/CVE-2018-1122.patch
@@ -0,0 +1,70 @@
+From 3cf9b0f403f758a2cfdc6f52f76c261b0f6ce924 Mon Sep 17 00:00:00 2001
+From: Qualys Security Advisory 
+Date: Thu, 1 Jan 1970 00:00:00 +
+Subject: [PATCH 097/126] top: Do not default to the cwd in configs_read().
+
+If the HOME environment variable is not set, or not absolute, use the
+home directory returned by getpwuid(getuid()), if set and absolute
+(instead of the cwd "."); otherwise, set p_home to NULL.
+
+To keep the changes to a minimum, we rely on POSIX, which requires that
+fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
+This integrates well into the existing code, and makes write_rcfile()
+work without a change.
+
+Also, it makes the code in configs_read() easier to follow: only set and
+use p_home if safe, and only set Rc_name if safe (in all the other cases
+it is the empty string, and the fopen() calls fail). Plus, check for
+snprintf() truncation (and if it happens, reset Rc_name to the empty
+string).
+
+Important note: top.1 should probably be updated, since it mentions the
+fallback to the current working directory.
+[carnil: Backport to 3.3.12: p_home -> p, context]
+
+Signed-off-by: Qualys Security Advisory 
+---
+ top/top.c | 33 -
+ 1 file changed, 28 insertions(+), 5 deletions(-)
+
+--- a/top/top.c
 b/top/top.c
+@@ -3423,6 +3423,19 @@ static int config_cvt (WIN_t *q) {
+return 0;
+ } // end: config_cvt
+ 
++static int snprintf_Rc_name (const char *const format, ...) 
__attribute__((format(printf,1,2)));
++static int snprintf_Rc_name (const char *const format, ...) {
++   int len;
++   va_list ap;
++   va_start(ap, format);
++   len = vsnprintf(Rc_name, sizeof(Rc_name), format, ap);
++   va_end(ap);
++   if (len <= 0 || (size_t)len >= sizeof(Rc_name)) {
++  Rc_name[0] = '\0';
++  return 0;
++   }
++   return len;
++}
+ 
+ /*
+  * Build the local RC file name then try to read both of 'em.
+@@ -3445,8 +3458,17 @@ static void configs_read (void) {
+FILE *fp;
+int i;
+ 
++   Rc_name[0] = '\0'; // "fopen() shall fail if pathname is an empty string."
+p = getenv("HOME");
+-   snprintf(Rc_name, sizeof(Rc_name), "%s/.%src", (p && *p) ? p : ".", 
Myname);
++   if (!p || p[0] != '/') {
++  const struct passwd *const pwd = getpwuid(getuid());
++  if (!pwd || !(p = pwd->pw_dir) || p[0] != '/') {
++ p = NULL;
++  }
++   }
++   if (p) {
++  snprintf_Rc_name("%s/.%src", p, Myname);
++   }
+ 
+fp = fopen(SYS_RCFILESPEC, "r");
+if (fp) {
diff --git a/meta/recipes-extended/procps/procps/CVE-2018-1123.patch 
b/meta/recipes-extended/procps/procps/CVE-2018-1123.patch
new file mode 100644
index 000..a2060e8
--- /dev/null
+++ b/meta/recipes-extended/procps/procps/CVE-2018-1123.patch
@@ -0,0 +1,84 @@
+From 136e3724952827bbae8887a42d9d2b6f658a48ab Mon Sep 17 00:00:00 2001
+From: Qualys Security Advisory 
+Date: Thu, 1 Jan 1970 00:00:00 +
+Subject: [PATCH] ps/output.c: Fix outbuf overflows in pr_args() etc.
+
+Because there is usually less than OUTBUF_SIZE available at endp.
+
+Signed-off-by: Qualys Security Advisory 
+---
+ ps/output.c | 23 ++-
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/ps/output.c b/ps/output.c
+index 0c63bb6..4456f28 100644
+--- a/ps/output.c
 b/ps/output.c
+@@ -389,6 +389,9 @@ Modifications to the arguments are not shown.
+ 
+ // FIXME: some of these may hit the guard page in forest mode
+ 
++#define OUTBUF_SIZE_AT(endp) \
++  (((endp) >= outbuf && (endp) < outbuf + OUTBUF_SIZE) ? (outbuf + 
OUTBUF_SIZE) - (endp) : 0)
++
+ /*
+  * "args", "cmd", "command" are all the same:  long  unless  c
+  * "comm", "ucmd", "ucomm"  are all the same:  short unless -f
+@@ -402,15 +405,15 @@ static int pr_args(char *restrict const outbuf, const 
proc_t *restrict const pp)
+   rightward -= fh;
+ 
+   if(pp->cmdline && !bsd_c_option)
+-endp += escaped_copy(endp, *pp->cmdline, OUTBUF_SIZE, );
++endp += escaped_copy(endp, *pp->cmdline, OUTBUF_SIZE_AT(endp), 
);
+   else
+-endp += escape_command(endp, pp, OUTBUF_SIZE, , ESC_DEFUNCT);
++endp += escape_command(endp, pp, OUTBUF_SIZE_AT(endp), , 
ESC_DEFUNCT);
+ 
+-  if(bsd_e_option && rightward>1) {
++  if(bsd_e_option && rightward>1 && 

[OE-core] [meta][PATCH v5 0/2] Add kernel-sample tests for runtime test

2018-06-29 Thread Hongzhi.Song
V5:
* remove a part of ksample.py code on 'OETestID'
V4:
* add support for qemu by default
V3:
* remove duplicated code
V2:
* use shared function to replace similar code

Hongzhi.Song (2):
  meta runtime testcases: enable kernel-sample features for runtime
tests
  Meta runtime cases: add testcases for kernel sample

 meta/lib/oeqa/runtime/cases/ksample.py| 206 ++
 meta/recipes-kernel/linux/linux-yocto.inc |   3 +
 2 files changed, 209 insertions(+)
 create mode 100644 meta/lib/oeqa/runtime/cases/ksample.py

-- 
2.8.1

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


[OE-core] [meta][PATCH 2/2] Meta runtime cases: add testcases for kernel sample

2018-06-29 Thread Hongzhi.Song
We are going to let runtime test support kernel tests. Now we just add
kernel self-contained sample tests. And we plan to add overall kernel
tests in the future.

This patch is just add kernel samples test which contains about 13 tests
enabled by kernel-sample.scc. So it needs statement,
KERNEL_FEATURES_append += " features/kernel-sample/kernel-sample.scc" in
local.conf.

Signed-off-by: Hongzhi.Song 
---
 meta/lib/oeqa/runtime/cases/ksample.py | 206 +
 1 file changed, 206 insertions(+)
 create mode 100644 meta/lib/oeqa/runtime/cases/ksample.py

diff --git a/meta/lib/oeqa/runtime/cases/ksample.py 
b/meta/lib/oeqa/runtime/cases/ksample.py
new file mode 100644
index 000..260bc3c
--- /dev/null
+++ b/meta/lib/oeqa/runtime/cases/ksample.py
@@ -0,0 +1,206 @@
+import os
+import time
+
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+from oeqa.core.decorator.oeid import OETestID
+from oeqa.core.decorator.data import skipIfNotFeature
+
+# need some kernel fragments
+# echo "KERNEL_FEATURES_append += \" 
features\/kernel\-sample\/kernel\-sample.scc\"" >> local.conf
+class KSample(OERuntimeTestCase):
+def cmd_and_check(self, cmd='', match_string=''):
+status, output = self.target.run(cmd)
+if not match_string:
+# send cmd
+msg = '%s failed, %s' % (cmd, output)
+self.assertEqual(status, 0, msg=msg)
+else:
+# check result
+result = ("%s" % match_string) in output
+self.assertTrue(result)
+self.assertEqual(status, 0, cmd)
+
+def check_config(self, config_opt=''):
+cmd = "zcat /proc/config.gz | grep %s" % config_opt
+status, output = self.target.run(cmd)
+result = ("%s=y" % config_opt) in output
+if not result:
+self.skipTest("%s is not set" % config_opt)
+
+def check_module_exist(self, path='', module_name=''):
+status, output = self.target.run("uname -r")
+cmd = "ls " + "/lib/modules/" + output + "/kernel/samples/" + path + 
module_name
+status, output = self.target.run(cmd)
+if status != 0:
+error_info = module_name + "doesn't exist"
+self.skipTest(error_info)
+
+def kfifo_func(self, name=''):
+module_prename = name + "-example"
+module_name = name + "-example.ko"
+sysmbol_name = name + "_example"
+
+# make sure if module exists
+self.check_module_exist("kfifo/", module_name)
+# modprobe
+self.cmd_and_check("modprobe %s" % module_prename)
+# lsmod
+self.cmd_and_check("lsmod | grep %s | cut -d\' \' -f1" % sysmbol_name, 
sysmbol_name)
+# check result
+self.cmd_and_check("dmesg | grep \"test passed\" ", "test passed")
+# rmmod
+self.cmd_and_check("rmmod %s" %  module_prename)
+
+def kprobe_func(self, name=''):
+# check config
+self.check_config("CONFIG_KPROBES")
+
+module_prename = name + "_example"
+module_name = name + "_example.ko"
+sysmbol_name = module_prename
+
+# make sure if module exists
+self.check_module_exist("kprobes/", module_name)
+# modprobe
+self.cmd_and_check("modprobe %s" % module_prename)
+# lsmod
+self.cmd_and_check("lsmod | grep %s | cut -d\' \' -f1" % sysmbol_name, 
sysmbol_name)
+# check result
+self.cmd_and_check("dmesg | grep Planted | head -n10", "Planted")
+# rmmod
+self.cmd_and_check("rmmod %s" % module_prename)
+
+def kobject_func(self, name=''):
+module_prename = name + "_example"
+module_name = name + "-example.ko"
+sysmbol_name = module_prename
+
+# make sure if module exists
+self.check_module_exist("kobject/", module_name)
+# modprobe
+self.cmd_and_check("modprobe %s" % module_prename)
+# lsmod
+self.cmd_and_check("lsmod | grep %s | cut -d\' \' -f1" % sysmbol_name, 
sysmbol_name)
+# check result
+self.cmd_and_check("ls /sys/kernel/%s/" % sysmbol_name, "bar")
+# rmmod
+self.cmd_and_check("rmmod %s" % module_prename)
+
+class KSampleTest(KSample):
+# kfifo
+@OETestDepends(['ssh.SSHTest.test_ssh'])
+def test_kfifo_test(self):
+index = ["dma", "bytestream", "inttype", "record"]
+for i in index:
+self.kfifo_func(i)
+
+# kprobe
+@OETestDepends(['ssh.SSHTest.test_ssh'])
+def test_kprobe_test(self):
+index = ["kprobe", "kretprobe"]
+for i in index:
+self.kprobe_func(i)
+
+# kobject
+@OETestDepends(['ssh.SSHTest.test_ssh'])
+def test_kobject_test(self):
+index = ["kobject", "kset"]
+for i in index:
+self.kobject_func(i)
+
+#trace
+@OETestDepends(['ssh.SSHTest.test_ssh'])
+def test_trace_events(self):
+# check config
+  

[OE-core] [meta][PATCH 1/2] meta runtime testcases: enable kernel-sample features for runtime tests

2018-06-29 Thread Hongzhi.Song
Enable kernel-sample features by default with the machine of qemu.

Signed-off-by: Hongzhi.Song 
---
 meta/recipes-kernel/linux/linux-yocto.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-kernel/linux/linux-yocto.inc 
b/meta/recipes-kernel/linux/linux-yocto.inc
index 3bb872a..b7511e5 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -67,3 +67,6 @@ do_install_append(){
 addtask kernel_version_sanity_check after do_kernel_metadata 
do_kernel_checkout before do_compile
 addtask validate_branches before do_patch after do_kernel_checkout
 addtask kernel_configcheck after do_configure before do_compile
+
+# enable kernel-sample for oeqa/runtime/cases's ksample.py test
+KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc"
-- 
2.8.1

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