Re: [oe] [meta-oe][sumo][PATCH] protobuf: make python-protobuf dependency optional and default to off
On Wed, Sep 26, 2018 at 7:36 AM Paul Eggleton wrote: > > A dependency on python-protobuf was added in commit > 5f6fcfd36272768a3ff9078c07c572cf5dc01ccd for the sole purpose of > providing a ptest, however python-protobuf is in meta-python and thus > this means that meta-oe would depend on meta-python by default (assuming > your distro enables ptest by default), and we don't want that - meta-oe > isn't supposed to depend upon any layer other than openembedded-core. > Luckily we can still have a ptest even without the python support, so > add a PACKAGECONFIG and leave it disabled by default. > > Note: the PACKAGECONFIG here is not particularly useful since it's only > about what goes into the -ptest package and thus also the dependency. I > contemplated just using LANG_SUPPORT instead, but PACKAGECONFIG does > have the advantage that it's introspectable and fairly well understood > so in the end I went with it. > > Signed-off-by: Paul Eggleton thanks Paul! With this patch applied and after cherry-picking 251878e8b6b9 (grpc: move it from oe to networking layer) from master, then yocto-check-layer reports that meta-oe is passing the compliance. I will send the backport for grpc shortly. > --- > meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > b/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > index 1ffb79da7..073dfaef0 100644 > --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > @@ -12,7 +12,7 @@ DEPENDS = "zlib" > DEPENDS_append_class-target = " protobuf-native" > RDEPENDS_${PN}-compiler = "${PN}" > RDEPENDS_${PN}-dev += "${PN}-compiler" > -RDEPENDS_${PN}-ptest = "bash python-protobuf" > +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', > 'python-protobuf', '', d)}" > > LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095" > > @@ -24,13 +24,16 @@ SRC_URI = > "git://github.com/google/protobuf.git;branch=3.5.x \ >file://run-ptest \ >" > > +PACKAGECONFIG ??= "" > +PACKAGECONFIG[python] = ",," > + > EXTRA_OECONF += " --with-protoc=echo" > > inherit autotools-brokensep pkgconfig ptest > > S = "${WORKDIR}/git" > TEST_SRC_DIR="examples" > -LANG_SUPPORT="cpp python" > +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', > 'python', '', d)}" > > do_compile_ptest() { > # Modify makefile to use the cross-compiler > -- > 2.17.1 > > -- > ___ > 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][sumo][PATCH] protobuf: make python-protobuf dependency optional and default to off
A dependency on python-protobuf was added in commit 5f6fcfd36272768a3ff9078c07c572cf5dc01ccd for the sole purpose of providing a ptest, however python-protobuf is in meta-python and thus this means that meta-oe would depend on meta-python by default (assuming your distro enables ptest by default), and we don't want that - meta-oe isn't supposed to depend upon any layer other than openembedded-core. Luckily we can still have a ptest even without the python support, so add a PACKAGECONFIG and leave it disabled by default. Note: the PACKAGECONFIG here is not particularly useful since it's only about what goes into the -ptest package and thus also the dependency. I contemplated just using LANG_SUPPORT instead, but PACKAGECONFIG does have the advantage that it's introspectable and fairly well understood so in the end I went with it. Signed-off-by: Paul Eggleton --- meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb index 1ffb79da7..073dfaef0 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb @@ -12,7 +12,7 @@ DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" RDEPENDS_${PN}-compiler = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" -RDEPENDS_${PN}-ptest = "bash python-protobuf" +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" LIC_FILES_CHKSUM = "file://LICENSE;md5=35953c752efc9299b184f91bef540095" @@ -24,13 +24,16 @@ SRC_URI = "git://github.com/google/protobuf.git;branch=3.5.x \ file://run-ptest \ " +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = ",," + EXTRA_OECONF += " --with-protoc=echo" inherit autotools-brokensep pkgconfig ptest S = "${WORKDIR}/git" TEST_SRC_DIR="examples" -LANG_SUPPORT="cpp python" +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" do_compile_ptest() { # Modify makefile to use the cross-compiler -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH V2] layers: Update layer compatibility to thud
Signed-off-by: Khem Raj Cc: Andreas Müller Cc: Derek Straka Cc: Tim Orling Cc: Hongxu Jia Cc: Armin Kuster Cc: Joe MacDonald Cc: Andrea Adami --- v2: Drop unnecessary recipe changes meta-filesystems/conf/layer.conf | 2 +- meta-gnome/conf/layer.conf | 2 +- meta-initramfs/conf/layer.conf | 2 +- meta-multimedia/conf/layer.conf | 2 +- meta-networking/conf/layer.conf | 2 +- meta-oe/conf/layer.conf | 2 +- meta-perl/conf/layer.conf| 2 +- meta-python/conf/layer.conf | 2 +- meta-webserver/conf/layer.conf | 2 +- meta-xfce/conf/layer.conf| 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index dbcff42d44..002f099760 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "sumo" +LAYERSERIES_COMPAT_filesystems-layer = "thud" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index e6e9532b41..e9d0785b1d 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -14,7 +14,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "sumo" +LAYERSERIES_COMPAT_gnome-layer = "thud" # Sanity check for meta-gnome layer. # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index 97afc9374e..bd92ddfbc2 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "sumo" +LAYERSERIES_COMPAT_meta-initramfs = "thud" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index cfedf2f6b6..e2a7701c33 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -29,4 +29,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core" -LAYERSERIES_COMPAT_multimedia-layer = "sumo" +LAYERSERIES_COMPAT_multimedia-layer = "thud" diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index e594b7b957..d36ff5bf95 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = "sumo" +LAYERSERIES_COMPAT_networking-layer = "thud" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 1a43575304..64c888d51d 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -29,7 +29,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "sumo" +LAYERSERIES_COMPAT_openembedded-layer = "thud" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index ece6dd05eb..b2bb379105 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "sumo" +LAYERSERIES_COMPAT_perl-layer = "thud" diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index 7089071faf..321d51bee7 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "sumo" +LAYERSERIES_COMPAT_meta-python = "thud" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index f205ef23b1..aaa3a95c4f 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "sumo" +LAYERSERIES_COMPAT_webserver = "thud" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index bee8e70441..f5f44d64bc 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -18,7 +18,7 @@ LAYERDEPENDS_xfce-layer += "gnome-layer" LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" -LAYERSERIES_COMPAT_xfce-layer = "sumo" +LAYERSERIES_COMPAT_xfce-layer = "thud" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ xfce4-session->machine-host \ -- 2.19.0 -- ___
Re: [oe] [PATCH] layers: Update layer compatibility to thud
On Tue, Sep 25, 2018 at 10:20 PM akuster808 wrote: > > > > On 09/25/2018 09:14 PM, Khem Raj wrote: > > Signed-off-by: Khem Raj > > Cc: Andreas Müller > > Cc: Derek Straka > > Cc: Tim Orling > > Cc: Hongxu Jia > > Cc: Armin Kuster > > Cc: Joe MacDonald > > Cc: Andrea Adami > > --- > > meta-filesystems/conf/layer.conf | 2 +- > > meta-gnome/conf/layer.conf | 2 +- > > meta-initramfs/conf/layer.conf | 2 +- > > meta-multimedia/conf/layer.conf| 2 +- > > meta-networking/conf/layer.conf| 2 +- > > meta-networking/recipes-support/netperf/netperf_git.bb | 2 +- > > meta-oe/conf/layer.conf| 2 +- > > meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 7 +++ > Hang on, the mongodb nor the netperf have anything to do 'thud'. > > what are those changes for? > thanks for pointing it out. They are not meant to be part here. I will send a v2 > > meta-perl/conf/layer.conf | 2 +- > > meta-python/conf/layer.conf| 2 +- > > meta-webserver/conf/layer.conf | 2 +- > > meta-xfce/conf/layer.conf | 2 +- > > 12 files changed, 14 insertions(+), 15 deletions(-) > > > > diff --git a/meta-filesystems/conf/layer.conf > > b/meta-filesystems/conf/layer.conf > > index dbcff42d44..002f099760 100644 > > --- a/meta-filesystems/conf/layer.conf > > +++ b/meta-filesystems/conf/layer.conf > > @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" > > > > LAYERDEPENDS_filesystems-layer = "core openembedded-layer" > > > > -LAYERSERIES_COMPAT_filesystems-layer = "sumo" > > +LAYERSERIES_COMPAT_filesystems-layer = "thud" > > diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf > > index e6e9532b41..e9d0785b1d 100644 > > --- a/meta-gnome/conf/layer.conf > > +++ b/meta-gnome/conf/layer.conf > > @@ -14,7 +14,7 @@ LAYERVERSION_gnome-layer = "1" > > > > LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" > > > > -LAYERSERIES_COMPAT_gnome-layer = "sumo" > > +LAYERSERIES_COMPAT_gnome-layer = "thud" > > > > # Sanity check for meta-gnome layer. > > # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend > > files check. > > diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf > > index 97afc9374e..bd92ddfbc2 100644 > > --- a/meta-initramfs/conf/layer.conf > > +++ b/meta-initramfs/conf/layer.conf > > @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" > > BBFILE_PRIORITY_meta-initramfs = "8" > > LAYERDEPENDS_meta-initramfs = "core" > > > > -LAYERSERIES_COMPAT_meta-initramfs = "sumo" > > +LAYERSERIES_COMPAT_meta-initramfs = "thud" > > > > SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ > >dracut->virtual/kernel \ > > diff --git a/meta-multimedia/conf/layer.conf > > b/meta-multimedia/conf/layer.conf > > index cfedf2f6b6..e2a7701c33 100644 > > --- a/meta-multimedia/conf/layer.conf > > +++ b/meta-multimedia/conf/layer.conf > > @@ -29,4 +29,4 @@ LAYERVERSION_multimedia-layer = "1" > > > > LAYERDEPENDS_multimedia-layer = "core" > > > > -LAYERSERIES_COMPAT_multimedia-layer = "sumo" > > +LAYERSERIES_COMPAT_multimedia-layer = "thud" > > diff --git a/meta-networking/conf/layer.conf > > b/meta-networking/conf/layer.conf > > index e594b7b957..d36ff5bf95 100644 > > --- a/meta-networking/conf/layer.conf > > +++ b/meta-networking/conf/layer.conf > > @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" > > LAYERDEPENDS_networking-layer += "openembedded-layer" > > LAYERDEPENDS_networking-layer += "meta-python" > > > > -LAYERSERIES_COMPAT_networking-layer = "sumo" > > +LAYERSERIES_COMPAT_networking-layer = "thud" > > > > LICENSE_PATH += "${LAYERDIR}/licenses" > > > > diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb > > b/meta-networking/recipes-support/netperf/netperf_git.bb > > index f0e0f9cf1f..b6c8027b87 100644 > > --- a/meta-networking/recipes-support/netperf/netperf_git.bb > > +++ b/meta-networking/recipes-support/netperf/netperf_git.bb > > @@ -13,7 +13,7 @@ SRC_URI="git://github.com/HewlettPackard/netperf.git \ > > file://vfork.patch \ > > file://init" > > > > -SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" > > +SRCREV = "bcb868bde7f0203bbab69609f65d4088ba7398db" > > > > S = "${WORKDIR}/git" > > > > diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf > > index 1a43575304..64c888d51d 100644 > > --- a/meta-oe/conf/layer.conf > > +++ b/meta-oe/conf/layer.conf > > @@ -29,7 +29,7 @@ LAYERVERSION_openembedded-layer = "1" > > > > LAYERDEPENDS_openembedded-layer = "core" > > > > -LAYERSERIES_COMPAT_openembedded-layer = "sumo" > > +LAYERSERIES_COMPAT_openembedded-layer = "thud" > > > > LICENSE_PATH += "${LAYERDIR}/licenses" > > > > diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb > > b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb > >
Re: [oe] [meta-oe][PATCH] protobuf: make python-protobuf dependency optional and default to off
On 09/25/2018 06:53 PM, Paul Eggleton wrote: > A dependency on python-protobuf was added in commit > 5f6fcfd36272768a3ff9078c07c572cf5dc01ccd for the sole purpose of > providing a ptest, however python-protobuf is in meta-python and thus > this means that meta-oe would depend on meta-python by default (assuming > your distro enables ptest by default), and we don't want that - meta-oe > isn't supposed to depend upon any layer other than openembedded-core. > Luckily we can still have a ptest even without the python support, so > add a PACKAGECONFIG and leave it disabled by default. > > Note: the PACKAGECONFIG here is not particularly useful since it's only > about what goes into the -ptest package and thus also the dependency. I > contemplated just using LANG_SUPPORT instead, but PACKAGECONFIG does > have the advantage that it's introspectable and fairly well understood > so in the end I went with it. thanks. with backport to sumo ? > > Signed-off-by: Paul Eggleton > --- > meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb > b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb > index f8498c4c8..cf72d9ca7 100644 > --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb > +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb > @@ -22,10 +22,13 @@ S = "${WORKDIR}/git" > > inherit autotools-brokensep pkgconfig ptest > > +PACKAGECONFIG ??= "" > +PACKAGECONFIG[python] = ",," > + > EXTRA_OECONF += "--with-protoc=echo" > > TEST_SRC_DIR = "examples" > -LANG_SUPPORT = "cpp python" > +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', > 'python', '', d)}" > > do_compile_ptest() { > # Modify makefile to use the cross-compiler > @@ -78,7 +81,7 @@ FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" > > RDEPENDS_${PN}-compiler = "${PN}" > RDEPENDS_${PN}-dev += "${PN}-compiler" > -RDEPENDS_${PN}-ptest = "bash python-protobuf" > +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', > 'python-protobuf', '', d)}" > > MIPS_INSTRUCTION_SET = "mips" > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] layers: Update layer compatibility to thud
On 09/25/2018 09:14 PM, Khem Raj wrote: > Signed-off-by: Khem Raj > Cc: Andreas Müller > Cc: Derek Straka > Cc: Tim Orling > Cc: Hongxu Jia > Cc: Armin Kuster > Cc: Joe MacDonald > Cc: Andrea Adami > --- > meta-filesystems/conf/layer.conf | 2 +- > meta-gnome/conf/layer.conf | 2 +- > meta-initramfs/conf/layer.conf | 2 +- > meta-multimedia/conf/layer.conf| 2 +- > meta-networking/conf/layer.conf| 2 +- > meta-networking/recipes-support/netperf/netperf_git.bb | 2 +- > meta-oe/conf/layer.conf| 2 +- > meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 7 +++ Hang on, the mongodb nor the netperf have anything to do 'thud'. what are those changes for? > meta-perl/conf/layer.conf | 2 +- > meta-python/conf/layer.conf| 2 +- > meta-webserver/conf/layer.conf | 2 +- > meta-xfce/conf/layer.conf | 2 +- > 12 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/meta-filesystems/conf/layer.conf > b/meta-filesystems/conf/layer.conf > index dbcff42d44..002f099760 100644 > --- a/meta-filesystems/conf/layer.conf > +++ b/meta-filesystems/conf/layer.conf > @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" > > LAYERDEPENDS_filesystems-layer = "core openembedded-layer" > > -LAYERSERIES_COMPAT_filesystems-layer = "sumo" > +LAYERSERIES_COMPAT_filesystems-layer = "thud" > diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf > index e6e9532b41..e9d0785b1d 100644 > --- a/meta-gnome/conf/layer.conf > +++ b/meta-gnome/conf/layer.conf > @@ -14,7 +14,7 @@ LAYERVERSION_gnome-layer = "1" > > LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" > > -LAYERSERIES_COMPAT_gnome-layer = "sumo" > +LAYERSERIES_COMPAT_gnome-layer = "thud" > > # Sanity check for meta-gnome layer. > # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files > check. > diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf > index 97afc9374e..bd92ddfbc2 100644 > --- a/meta-initramfs/conf/layer.conf > +++ b/meta-initramfs/conf/layer.conf > @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" > BBFILE_PRIORITY_meta-initramfs = "8" > LAYERDEPENDS_meta-initramfs = "core" > > -LAYERSERIES_COMPAT_meta-initramfs = "sumo" > +LAYERSERIES_COMPAT_meta-initramfs = "thud" > > SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ >dracut->virtual/kernel \ > diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf > index cfedf2f6b6..e2a7701c33 100644 > --- a/meta-multimedia/conf/layer.conf > +++ b/meta-multimedia/conf/layer.conf > @@ -29,4 +29,4 @@ LAYERVERSION_multimedia-layer = "1" > > LAYERDEPENDS_multimedia-layer = "core" > > -LAYERSERIES_COMPAT_multimedia-layer = "sumo" > +LAYERSERIES_COMPAT_multimedia-layer = "thud" > diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf > index e594b7b957..d36ff5bf95 100644 > --- a/meta-networking/conf/layer.conf > +++ b/meta-networking/conf/layer.conf > @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" > LAYERDEPENDS_networking-layer += "openembedded-layer" > LAYERDEPENDS_networking-layer += "meta-python" > > -LAYERSERIES_COMPAT_networking-layer = "sumo" > +LAYERSERIES_COMPAT_networking-layer = "thud" > > LICENSE_PATH += "${LAYERDIR}/licenses" > > diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb > b/meta-networking/recipes-support/netperf/netperf_git.bb > index f0e0f9cf1f..b6c8027b87 100644 > --- a/meta-networking/recipes-support/netperf/netperf_git.bb > +++ b/meta-networking/recipes-support/netperf/netperf_git.bb > @@ -13,7 +13,7 @@ SRC_URI="git://github.com/HewlettPackard/netperf.git \ > file://vfork.patch \ > file://init" > > -SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" > +SRCREV = "bcb868bde7f0203bbab69609f65d4088ba7398db" > > S = "${WORKDIR}/git" > > diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf > index 1a43575304..64c888d51d 100644 > --- a/meta-oe/conf/layer.conf > +++ b/meta-oe/conf/layer.conf > @@ -29,7 +29,7 @@ LAYERVERSION_openembedded-layer = "1" > > LAYERDEPENDS_openembedded-layer = "core" > > -LAYERSERIES_COMPAT_openembedded-layer = "sumo" > +LAYERSERIES_COMPAT_openembedded-layer = "thud" > > LICENSE_PATH += "${LAYERDIR}/licenses" > > diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb > b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb > index bcb15e6c5b..dae1125265 100644 > --- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb > +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb > @@ -10,9 +10,9 @@ DEPENDS = "openssl libpcre libpcap zlib boost curl python \ > > inherit scons dos2unix siteinfo pythonnative > > -PV = "4.0.1+git${SRCPV}" > -#v4.0.1 > -SRCREV = "54f1582fc6eb01de4d4c4
[oe] [PATCH] layers: Update layer compatibility to thud
Signed-off-by: Khem Raj Cc: Andreas Müller Cc: Derek Straka Cc: Tim Orling Cc: Hongxu Jia Cc: Armin Kuster Cc: Joe MacDonald Cc: Andrea Adami --- meta-filesystems/conf/layer.conf | 2 +- meta-gnome/conf/layer.conf | 2 +- meta-initramfs/conf/layer.conf | 2 +- meta-multimedia/conf/layer.conf| 2 +- meta-networking/conf/layer.conf| 2 +- meta-networking/recipes-support/netperf/netperf_git.bb | 2 +- meta-oe/conf/layer.conf| 2 +- meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 7 +++ meta-perl/conf/layer.conf | 2 +- meta-python/conf/layer.conf| 2 +- meta-webserver/conf/layer.conf | 2 +- meta-xfce/conf/layer.conf | 2 +- 12 files changed, 14 insertions(+), 15 deletions(-) diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index dbcff42d44..002f099760 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "sumo" +LAYERSERIES_COMPAT_filesystems-layer = "thud" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index e6e9532b41..e9d0785b1d 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -14,7 +14,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "sumo" +LAYERSERIES_COMPAT_gnome-layer = "thud" # Sanity check for meta-gnome layer. # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index 97afc9374e..bd92ddfbc2 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "sumo" +LAYERSERIES_COMPAT_meta-initramfs = "thud" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index cfedf2f6b6..e2a7701c33 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -29,4 +29,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core" -LAYERSERIES_COMPAT_multimedia-layer = "sumo" +LAYERSERIES_COMPAT_multimedia-layer = "thud" diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index e594b7b957..d36ff5bf95 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = "sumo" +LAYERSERIES_COMPAT_networking-layer = "thud" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index f0e0f9cf1f..b6c8027b87 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb @@ -13,7 +13,7 @@ SRC_URI="git://github.com/HewlettPackard/netperf.git \ file://vfork.patch \ file://init" -SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" +SRCREV = "bcb868bde7f0203bbab69609f65d4088ba7398db" S = "${WORKDIR}/git" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 1a43575304..64c888d51d 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -29,7 +29,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "sumo" +LAYERSERIES_COMPAT_openembedded-layer = "thud" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb index bcb15e6c5b..dae1125265 100644 --- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb @@ -10,9 +10,9 @@ DEPENDS = "openssl libpcre libpcap zlib boost curl python \ inherit scons dos2unix siteinfo pythonnative -PV = "4.0.1+git${SRCPV}" -#v4.0.1 -SRCREV = "54f1582fc6eb01de4d4c42f26fc133e623f065fb" +PV = "4.0.2+git${SRCPV}" +#v4.0.2 +SRCREV = "fc1573ba18aee42f97a3bb13b67af7d837826b47" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.0 \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ @@ -20,7 +20,6 @@ SRC_URI = "git://github.com/mongodb/mongo.gi
[oe] [meta-oe][PATCH] protobuf: make python-protobuf dependency optional and default to off
A dependency on python-protobuf was added in commit 5f6fcfd36272768a3ff9078c07c572cf5dc01ccd for the sole purpose of providing a ptest, however python-protobuf is in meta-python and thus this means that meta-oe would depend on meta-python by default (assuming your distro enables ptest by default), and we don't want that - meta-oe isn't supposed to depend upon any layer other than openembedded-core. Luckily we can still have a ptest even without the python support, so add a PACKAGECONFIG and leave it disabled by default. Note: the PACKAGECONFIG here is not particularly useful since it's only about what goes into the -ptest package and thus also the dependency. I contemplated just using LANG_SUPPORT instead, but PACKAGECONFIG does have the advantage that it's introspectable and fairly well understood so in the end I went with it. Signed-off-by: Paul Eggleton --- meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb index f8498c4c8..cf72d9ca7 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.1.bb @@ -22,10 +22,13 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig ptest +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = ",," + EXTRA_OECONF += "--with-protoc=echo" TEST_SRC_DIR = "examples" -LANG_SUPPORT = "cpp python" +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" do_compile_ptest() { # Modify makefile to use the cross-compiler @@ -78,7 +81,7 @@ FILES_${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" RDEPENDS_${PN}-compiler = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" -RDEPENDS_${PN}-ptest = "bash python-protobuf" +RDEPENDS_${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-protobuf', '', d)}" MIPS_INSTRUCTION_SET = "mips" -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] [meta-python][PATCH] python-cmd2: upgrade to 0.9.2
Please note the following from the project github ( https://github.com/python-cmd2/cmd2): The last version of cmd2 to support Python 2.7 is *0.8.9*, released on August 21, 2018. Supporting Python 2 was an increasing burden on our limited resources. Switching to support only Python 3 is allowing us to clean up the codebase, remove some cruft, and focus on developing new features. Was the 0.9.2 version validated at run-time to work on python 2.7? On Tue, Sep 25, 2018 at 8:43 PM Hong Liu wrote: > 1.Upgrade python-cmd2 from 0.8.8 to 0.9.2. > > Signed-off-by: Hong Liu > --- > .../python/{python-cmd2_0.8.8.bb => python-cmd2_0.9.2.bb} | > 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta-python/recipes-devtools/python/{python-cmd2_0.8.8.bb => > python-cmd2_0.9.2.bb} (79%) > > diff --git a/meta-python/recipes-devtools/python/python-cmd2_0.8.8.bb > b/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb > similarity index 79% > rename from meta-python/recipes-devtools/python/python-cmd2_0.8.8.bb > rename to meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb > index b3bea82..1b75e34 100644 > --- a/meta-python/recipes-devtools/python/python-cmd2_0.8.8.bb > +++ b/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb > @@ -3,8 +3,8 @@ HOMEPAGE = "http://packages.python.org/cmd2/"; > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://LICENSE;md5=60bc6842001870a418935bd84570b676" > > -SRC_URI[md5sum] = "1f555bb656d361d9b0212b07e232752f" > -SRC_URI[sha256sum] = > "b08bc5088fdd131d659354e6b4f8cf7c01a70566f68aed146e00d296a24b687b" > +SRC_URI[md5sum] = "bfe0900a2288283a40f0ee7533486a2f" > +SRC_URI[sha256sum] = > "e7b6b4b76272a051c943c3c709cd760142af16fbc9218e0ed3c22b28ea38d0a8" > > inherit pypi setuptools > > -- > 2.7.4 > > > > -- > ___ > 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] [PATCH] [meta-python][PATCH] python-cmd2: upgrade to 0.9.2
1.Upgrade python-cmd2 from 0.8.8 to 0.9.2. Signed-off-by: Hong Liu --- .../python/{python-cmd2_0.8.8.bb => python-cmd2_0.9.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-cmd2_0.8.8.bb => python-cmd2_0.9.2.bb} (79%) diff --git a/meta-python/recipes-devtools/python/python-cmd2_0.8.8.bb b/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb similarity index 79% rename from meta-python/recipes-devtools/python/python-cmd2_0.8.8.bb rename to meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb index b3bea82..1b75e34 100644 --- a/meta-python/recipes-devtools/python/python-cmd2_0.8.8.bb +++ b/meta-python/recipes-devtools/python/python-cmd2_0.9.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://packages.python.org/cmd2/"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=60bc6842001870a418935bd84570b676" -SRC_URI[md5sum] = "1f555bb656d361d9b0212b07e232752f" -SRC_URI[sha256sum] = "b08bc5088fdd131d659354e6b4f8cf7c01a70566f68aed146e00d296a24b687b" +SRC_URI[md5sum] = "bfe0900a2288283a40f0ee7533486a2f" +SRC_URI[sha256sum] = "e7b6b4b76272a051c943c3c709cd760142af16fbc9218e0ed3c22b28ea38d0a8" inherit pypi setuptools -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] [meta-oe][PATCH] nodejs: upgrade to 8.12.0
Upgrade nodejs from 8.11.4 to 8.12.0. Signed-off-by: Hong Liu --- .../recipes-devtools/nodejs/{nodejs_8.11.4.bb => nodejs_8.12.0.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/nodejs/{nodejs_8.11.4.bb => nodejs_8.12.0.bb} (96%) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.11.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb similarity index 96% rename from meta-oe/recipes-devtools/nodejs/nodejs_8.11.4.bb rename to meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb index 60f60d2..e3b46bc 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.11.4.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_8.12.0.bb @@ -12,8 +12,8 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ " -SRC_URI[md5sum] = "ba3ef2f12e911d7e64c2ab135378792a" -SRC_URI[sha256sum] = "fbce7de6d96b0bcb0db0bf77f0e6ea999b6755e6930568aedaab06847552a609" +SRC_URI[md5sum] = "8b3abd033dae96b6fadcb6a872a44d3c" +SRC_URI[sha256sum] = "5a9dff58016c18fb4bf902d963b124ff058a550ebcd9840c677757387bce419a" S = "${WORKDIR}/node-v${PV}" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] [meta-oe][PATCH] mozjs: upgrade to 52.9.1
Upgrade mozjs from 52.8.1 to 52.9.1 Signed-off-by: Hong Liu renamed:mozjs_52.8.1.bb -> mozjs_52.9.1.bb --- meta-oe/recipes-extended/mozjs/{mozjs_52.8.1.bb => mozjs_52.9.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-extended/mozjs/{mozjs_52.8.1.bb => mozjs_52.9.1.bb} (95%) diff --git a/meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb similarity index 95% rename from meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb rename to meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb index 626522e..0dfe2f8 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_52.8.1.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonk LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" -SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.8.1.orig.tar.bz2 \ +SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.orig.tar.xz \ file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ file://0010-fix-cross-compilation-on-i586-targets.patch \ file://0001-do-not-create-python-environment.patch \ @@ -22,8 +22,8 @@ SRC_URI_append_mipsarchn32 = " \ file://0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ " -SRC_URI[md5sum] = "3a44c2fd3d7b5a370ed9184163c74bc4" -SRC_URI[sha256sum] = "fb5e11b7f31a33be820d5c947c5fa114751b0d5033778c1cd8e0cf2dad91e8fa" +SRC_URI[md5sum] = "c9473c625ee0a9edaaac8b742ff24c5f" +SRC_URI[sha256sum] = "f9324a6724233ab15f10381fe13e635e89d725ef1e78025a0a7d36c58a84a0f9" inherit autotools pkgconfig perlnative pythonnative -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] nodejs-native and OpenSSL
Hi folks I've recently been trying to build nodejs-native with oe-core/meta-oe master on Ubuntu 14.04, and unfortunately it's failing for me: - snip - /home/paul/poky/poky/build-minnow/tmp/work/x86_64-linux/nodejs-native/8.11.4-r0/node-v8.11.4/out/Release/obj.target/node_lib/src/node_crypto.o: In function `node::crypto::RandomBytesWork(uv_work_s*)': node_crypto.cc:(.text+0x31): undefined reference to `RAND_poll' node_crypto.cc:(.text+0x3a): undefined reference to `RAND_status' node_crypto.cc:(.text+0x52): undefined reference to `RAND_bytes' node_crypto.cc:(.text+0x89): undefined reference to `ERR_get_error' /home/paul/poky/poky/build-minnow/tmp/work/x86_64-linux/nodejs-native/8.11.4-r0/node-v8.11.4/out/Release/obj.target/node_lib/src/node_crypto.o: In function `node::crypto::DiffieHellman::GetPrime(v8::FunctionCallbackInfo const&)::{lambda(dh_st const*)#1}::_FUN(dh_st const*)': node_crypto.cc:(.text+0x121): undefined reference to `DH_get0_pqg' /home/paul/poky/poky/build-minnow/tmp/work/x86_64-linux/nodejs-native/8.11.4-r0/node-v8.11.4/out/Release/obj.target/node_lib/src/node_crypto.o: In function `node::crypto::DiffieHellman::GetGenerator(v8::FunctionCallbackInfo const&)::{lambda(dh_st const*)#1}::_FUN(dh_st const*)': node_crypto.cc:(.text+0x141): undefined reference to `DH_get0_pqg' /home/paul/poky/poky/build-minnow/tmp/work/x86_64-linux/nodejs-native/8.11.4-r0/node-v8.11.4/out/Release/obj.target/node_lib/src/node_crypto.o: In function `node::crypto::SecureContext::TicketCompatibilityCallback(ssl_st*, unsigned char*, unsigned char*, evp_cipher_ctx_st*, hmac_ctx_st*, int)': node_crypto.cc:(.text+0x172): undefined reference to `SSL_get_SSL_CTX' node_crypto.cc:(.text+0x17c): undefined reference to `SSL_CTX_get_ex_data' node_crypto.cc:(.text+0x1c1): undefined reference to `EVP_aes_128_cbc' - snip - At first, since I haven't seen reports of this elsewhere I thought maybe it had something to do with the host OpenSSL version being 1.0, but adding -H to CFLAGS/CXXFLAGS and -Wl,--trace to LDFLAGS seems to suggest that it's using both the headers and libraries for OpenSSL from the sysroot as it should. Has anyone else seen this? Any suggestions? (other than perhaps "update your host distro and try again")? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] klibc.inc: lazy assign GCCPIE in case security_flags.inc was not included
fix build error (GCCPIE is unset): EXTRA_KLIBCAFLAGS=${SECURITY_CFLAGS} -Wa,--noexecstack EXTRA_KLIBCLDFLAGS=${@-z relro -z now -pie if else } -z noexecstack | make: invalid option -- 'z' | make: invalid option -- ' ' Signed-off-by: Andrea Adami --- meta-initramfs/recipes-devtools/klibc/klibc.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 6342be0..be01c2f 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -75,6 +75,7 @@ KLIBC_ARCH_powerpc = "ppc" KLIBC_ARCH_powerpc64 = "ppc64" THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" +GCCPIE ?= "" SECURITY_LDFLAGS = "${@'-z relro -z now -pie' if '${GCCPIE}' else ''}" SECURITY_LDFLAGS_mips = "" SECURITY_LDFLAGS_mips64 = "" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] meta-oe and yocto-check-layer
On Tue, Sep 25, 2018 at 07:16:56PM +0200, Nicolas Dechesne wrote: > On Tue, Sep 25, 2018 at 7:10 PM Martin Jansa wrote: > > > > On Tue, Sep 25, 2018 at 03:05:19PM +0200, Nicolas Dechesne wrote: > > > On Tue, Sep 25, 2018 at 12:29 PM Martin Jansa > > > wrote: > > > > > > > > On Tue, Sep 25, 2018 at 12:24:31PM +0200, Martin Jansa wrote: > > > > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > > > > > > > This causes another circular dependency which we don't want, doesn't > > > > > it? > > > > > > What are the issues with circular dependency? LAYERDEPENDS only lists > > > each layers own dependencies, which is helpful for integrators to know > > > which layer they need to pull into bblayers.conf. If all layers from > > > LAYERDEPENDS are pulled in, then it is expected that each recipe will > > > build fine. > > > > It prevents using these layers separately. > > > > Now people can include just meta-oe without meta-python (as long as they > > fix or mask the python-protobuf dependency from protobuf-ptest - which > > is a bug not a feature). > > > > If they have circular dependency then everybody using meta-oe will be > > forced to use meta-python as well and then why should we keep them in > > separate layers? It would be the same as adding all meta-python recipes > > into meta-oe. > > It is not because there are circular dependencies that meta-oe > requires meta-python, it is because of protobuf , it really depends on > meta-python... I am tempted to agree with Paul, we should make the > dependency explicitly optional using PACKAGECONFIG instead of > requiring users to fix/mask it. I meant circular dependency meta-oe -> meta-python -> meta-oe I agree with Paul as well, I was just saying that adding dependency on meta-python to meta-oe doesn't make any sense. > > > > There was similar issue with meta-perl not so long time ago, before with > > meta-multimedia and meta-networking.. so if we don't fix these issues > > properly and just add more dependencies from meta-oe, then whole > > meta-openembedded as a repository will became one layer soon. > > agreed. I think it's good to spot these issues and fix them as they come. > > > > > > The only circular dependency that I am aware is with yocto-check-layer > > > script , and I sent a patch yesterday to fix this issue. With this > > > patch, yocto-check-layer works fine even when layers have inter > > > dependencies. > > > > > > https://patchwork.openembedded.org/patch/155113/ > > > > > > > > > > > Especially if it's caused only by python-protobuf runtime dependency > > > > added in: > > > > > > > > https://patchwork.openembedded.org/patch/146867/ > > > > > > yes. this is the culprit. > > > > > > > > > > > > On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < > > > > > nicolas.deche...@linaro.org> wrote: > > > > > > > > > > > hi Armin, > > > > > > > > > > > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > > > > > > wrote: > > > > > > > > > > > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > > > > > > Hi Nicolas, > > > > > > > > > > > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas > > > > > > > > > Dechesne wrote: > > > > > > > > >> hi Armin, Paul, Richard, > > > > > > > > >> > > > > > > > > >> I was looking at getting the compliance report for meta-oe > > > > > > > > >> (sumo > > > > > > > > >> branch), and I have found a few issues. > > > > > > > > >> > > > > > > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while > > > > > > > > >> it > > > > > > > > >> depends on meta-networking (c-ares). It was fixes in master, > > > > > > > > >> with > > > > > > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so > > > > > > > > >> I think > > > > > > > > >> this fix needs to be backported to sumo as well if we want > > > > > > > > >> the YP > > > > > > 2.0 > > > > > > > > >> compliance script to even work. If agreed, once merged, > > > > > > > > >> please let > > > > > > me > > > > > > > > >> know so that I can try again to generate a compliance report. > > > > > > > > > Is it appropriate to make such moves in a stable branch? I > > > > > > > > > wouldn't > > > > > > have > > > > > > > > > thought so. > > > > > > > > > > > > > > > > > > > > > > > > > We have to. Per my understanding and why I tried very hard to > > > > > > > > make > > > > > > > > meta-openembedded clean ( appears I failed) is that if you want > > > > > > > > to be > > > > > > > > Yocto Compliant and include any layer that does not pass this > > > > > > > > test, you > > > > > > > > can not become Yocto Compliant. > > > > > > > > > > > > > > I believe that we want meta-openembedded to be compliant, and a > > > > > > > good > > > > > > > example in general. I will send a backport your way for this > > > > > > > change. > > > > > > > > > > > > Running the compliance sc
Re: [oe] meta-oe and yocto-check-layer
On Tue, Sep 25, 2018 at 10:17 AM Nicolas Dechesne wrote: > > On Tue, Sep 25, 2018 at 7:10 PM Martin Jansa wrote: > > > > On Tue, Sep 25, 2018 at 03:05:19PM +0200, Nicolas Dechesne wrote: > > > On Tue, Sep 25, 2018 at 12:29 PM Martin Jansa > > > wrote: > > > > > > > > On Tue, Sep 25, 2018 at 12:24:31PM +0200, Martin Jansa wrote: > > > > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > > > > > > > This causes another circular dependency which we don't want, doesn't > > > > > it? > > > > > > What are the issues with circular dependency? LAYERDEPENDS only lists > > > each layers own dependencies, which is helpful for integrators to know > > > which layer they need to pull into bblayers.conf. If all layers from > > > LAYERDEPENDS are pulled in, then it is expected that each recipe will > > > build fine. > > > > It prevents using these layers separately. > > > > Now people can include just meta-oe without meta-python (as long as they > > fix or mask the python-protobuf dependency from protobuf-ptest - which > > is a bug not a feature). > > > > If they have circular dependency then everybody using meta-oe will be > > forced to use meta-python as well and then why should we keep them in > > separate layers? It would be the same as adding all meta-python recipes > > into meta-oe. > > It is not because there are circular dependencies that meta-oe > requires meta-python, it is because of protobuf , it really depends on > meta-python... I am tempted to agree with Paul, we should make the > dependency explicitly optional using PACKAGECONFIG instead of > requiring users to fix/mask it. > packageconfig seems a good approach for now > > > > There was similar issue with meta-perl not so long time ago, before with > > meta-multimedia and meta-networking.. so if we don't fix these issues > > properly and just add more dependencies from meta-oe, then whole > > meta-openembedded as a repository will became one layer soon. > > agreed. I think it's good to spot these issues and fix them as they come. > > > > > > The only circular dependency that I am aware is with yocto-check-layer > > > script , and I sent a patch yesterday to fix this issue. With this > > > patch, yocto-check-layer works fine even when layers have inter > > > dependencies. > > > > > > https://patchwork.openembedded.org/patch/155113/ > > > > > > > > > > > Especially if it's caused only by python-protobuf runtime dependency > > > > added in: > > > > > > > > https://patchwork.openembedded.org/patch/146867/ > > > > > > yes. this is the culprit. > > > > > > > > > > > > On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < > > > > > nicolas.deche...@linaro.org> wrote: > > > > > > > > > > > hi Armin, > > > > > > > > > > > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > > > > > > wrote: > > > > > > > > > > > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > > > > > > Hi Nicolas, > > > > > > > > > > > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas > > > > > > > > > Dechesne wrote: > > > > > > > > >> hi Armin, Paul, Richard, > > > > > > > > >> > > > > > > > > >> I was looking at getting the compliance report for meta-oe > > > > > > > > >> (sumo > > > > > > > > >> branch), and I have found a few issues. > > > > > > > > >> > > > > > > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while > > > > > > > > >> it > > > > > > > > >> depends on meta-networking (c-ares). It was fixes in master, > > > > > > > > >> with > > > > > > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so > > > > > > > > >> I think > > > > > > > > >> this fix needs to be backported to sumo as well if we want > > > > > > > > >> the YP > > > > > > 2.0 > > > > > > > > >> compliance script to even work. If agreed, once merged, > > > > > > > > >> please let > > > > > > me > > > > > > > > >> know so that I can try again to generate a compliance report. > > > > > > > > > Is it appropriate to make such moves in a stable branch? I > > > > > > > > > wouldn't > > > > > > have > > > > > > > > > thought so. > > > > > > > > > > > > > > > > > > > > > > > > > We have to. Per my understanding and why I tried very hard to > > > > > > > > make > > > > > > > > meta-openembedded clean ( appears I failed) is that if you want > > > > > > > > to be > > > > > > > > Yocto Compliant and include any layer that does not pass this > > > > > > > > test, you > > > > > > > > can not become Yocto Compliant. > > > > > > > > > > > > > > I believe that we want meta-openembedded to be compliant, and a > > > > > > > good > > > > > > > example in general. I will send a backport your way for this > > > > > > > change. > > > > > > > > > > > > Running the compliance script on meta-oe turned out to be an > > > > > > interesting exercise ;) > > > > > > > > > > > > I have found several issues, which I have mention
Re: [oe] meta-oe and yocto-check-layer
On Tue, Sep 25, 2018 at 7:10 PM Martin Jansa wrote: > > On Tue, Sep 25, 2018 at 03:05:19PM +0200, Nicolas Dechesne wrote: > > On Tue, Sep 25, 2018 at 12:29 PM Martin Jansa > > wrote: > > > > > > On Tue, Sep 25, 2018 at 12:24:31PM +0200, Martin Jansa wrote: > > > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > > > > > This causes another circular dependency which we don't want, doesn't it? > > > > What are the issues with circular dependency? LAYERDEPENDS only lists > > each layers own dependencies, which is helpful for integrators to know > > which layer they need to pull into bblayers.conf. If all layers from > > LAYERDEPENDS are pulled in, then it is expected that each recipe will > > build fine. > > It prevents using these layers separately. > > Now people can include just meta-oe without meta-python (as long as they > fix or mask the python-protobuf dependency from protobuf-ptest - which > is a bug not a feature). > > If they have circular dependency then everybody using meta-oe will be > forced to use meta-python as well and then why should we keep them in > separate layers? It would be the same as adding all meta-python recipes > into meta-oe. It is not because there are circular dependencies that meta-oe requires meta-python, it is because of protobuf , it really depends on meta-python... I am tempted to agree with Paul, we should make the dependency explicitly optional using PACKAGECONFIG instead of requiring users to fix/mask it. > > There was similar issue with meta-perl not so long time ago, before with > meta-multimedia and meta-networking.. so if we don't fix these issues > properly and just add more dependencies from meta-oe, then whole > meta-openembedded as a repository will became one layer soon. agreed. I think it's good to spot these issues and fix them as they come. > > > The only circular dependency that I am aware is with yocto-check-layer > > script , and I sent a patch yesterday to fix this issue. With this > > patch, yocto-check-layer works fine even when layers have inter > > dependencies. > > > > https://patchwork.openembedded.org/patch/155113/ > > > > > > > > Especially if it's caused only by python-protobuf runtime dependency > > > added in: > > > > > > https://patchwork.openembedded.org/patch/146867/ > > > > yes. this is the culprit. > > > > > > > > > On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < > > > > nicolas.deche...@linaro.org> wrote: > > > > > > > > > hi Armin, > > > > > > > > > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > > > > > wrote: > > > > > > > > > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > > > > > Hi Nicolas, > > > > > > > > > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne > > > > > > > > wrote: > > > > > > > >> hi Armin, Paul, Richard, > > > > > > > >> > > > > > > > >> I was looking at getting the compliance report for meta-oe > > > > > > > >> (sumo > > > > > > > >> branch), and I have found a few issues. > > > > > > > >> > > > > > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > > > > > > > >> depends on meta-networking (c-ares). It was fixes in master, > > > > > > > >> with > > > > > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so I > > > > > > > >> think > > > > > > > >> this fix needs to be backported to sumo as well if we want the > > > > > > > >> YP > > > > > 2.0 > > > > > > > >> compliance script to even work. If agreed, once merged, please > > > > > > > >> let > > > > > me > > > > > > > >> know so that I can try again to generate a compliance report. > > > > > > > > Is it appropriate to make such moves in a stable branch? I > > > > > > > > wouldn't > > > > > have > > > > > > > > thought so. > > > > > > > > > > > > > > > > > > > > > > We have to. Per my understanding and why I tried very hard to make > > > > > > > meta-openembedded clean ( appears I failed) is that if you want > > > > > > > to be > > > > > > > Yocto Compliant and include any layer that does not pass this > > > > > > > test, you > > > > > > > can not become Yocto Compliant. > > > > > > > > > > > > I believe that we want meta-openembedded to be compliant, and a good > > > > > > example in general. I will send a backport your way for this change. > > > > > > > > > > Running the compliance script on meta-oe turned out to be an > > > > > interesting exercise ;) > > > > > > > > > > I have found several issues, which I have mentioned in a few different > > > > > threads, so I will summary here. > > > > > > > > > > * oe-core: fix the yocto-check-layer for dependency loop > > > > > * I have the following local commits in meta-oe: > > > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > > grpc: move it from oe to networking layer > > > > > meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) > > > > > > > > >
Re: [oe] meta-oe and yocto-check-layer
On Tue, Sep 25, 2018 at 03:05:19PM +0200, Nicolas Dechesne wrote: > On Tue, Sep 25, 2018 at 12:29 PM Martin Jansa wrote: > > > > On Tue, Sep 25, 2018 at 12:24:31PM +0200, Martin Jansa wrote: > > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > > > This causes another circular dependency which we don't want, doesn't it? > > What are the issues with circular dependency? LAYERDEPENDS only lists > each layers own dependencies, which is helpful for integrators to know > which layer they need to pull into bblayers.conf. If all layers from > LAYERDEPENDS are pulled in, then it is expected that each recipe will > build fine. It prevents using these layers separately. Now people can include just meta-oe without meta-python (as long as they fix or mask the python-protobuf dependency from protobuf-ptest - which is a bug not a feature). If they have circular dependency then everybody using meta-oe will be forced to use meta-python as well and then why should we keep them in separate layers? It would be the same as adding all meta-python recipes into meta-oe. There was similar issue with meta-perl not so long time ago, before with meta-multimedia and meta-networking.. so if we don't fix these issues properly and just add more dependencies from meta-oe, then whole meta-openembedded as a repository will became one layer soon. > The only circular dependency that I am aware is with yocto-check-layer > script , and I sent a patch yesterday to fix this issue. With this > patch, yocto-check-layer works fine even when layers have inter > dependencies. > > https://patchwork.openembedded.org/patch/155113/ > > > > > Especially if it's caused only by python-protobuf runtime dependency added > > in: > > > > https://patchwork.openembedded.org/patch/146867/ > > yes. this is the culprit. > > > > > > On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < > > > nicolas.deche...@linaro.org> wrote: > > > > > > > hi Armin, > > > > > > > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > > > > wrote: > > > > > > > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > > > > wrote: > > > > > > > > > > > > > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > > > > Hi Nicolas, > > > > > > > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne > > > > > > > wrote: > > > > > > >> hi Armin, Paul, Richard, > > > > > > >> > > > > > > >> I was looking at getting the compliance report for meta-oe (sumo > > > > > > >> branch), and I have found a few issues. > > > > > > >> > > > > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > > > > > > >> depends on meta-networking (c-ares). It was fixes in master, with > > > > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so I > > > > > > >> think > > > > > > >> this fix needs to be backported to sumo as well if we want the YP > > > > 2.0 > > > > > > >> compliance script to even work. If agreed, once merged, please > > > > > > >> let > > > > me > > > > > > >> know so that I can try again to generate a compliance report. > > > > > > > Is it appropriate to make such moves in a stable branch? I > > > > > > > wouldn't > > > > have > > > > > > > thought so. > > > > > > > > > > > > > > > > > > > We have to. Per my understanding and why I tried very hard to make > > > > > > meta-openembedded clean ( appears I failed) is that if you want to > > > > > > be > > > > > > Yocto Compliant and include any layer that does not pass this test, > > > > > > you > > > > > > can not become Yocto Compliant. > > > > > > > > > > I believe that we want meta-openembedded to be compliant, and a good > > > > > example in general. I will send a backport your way for this change. > > > > > > > > Running the compliance script on meta-oe turned out to be an > > > > interesting exercise ;) > > > > > > > > I have found several issues, which I have mentioned in a few different > > > > threads, so I will summary here. > > > > > > > > * oe-core: fix the yocto-check-layer for dependency loop > > > > * I have the following local commits in meta-oe: > > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > grpc: move it from oe to networking layer > > > > meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) > > > > > > > > With all changes above, the compliance script finds another issue with > > > > meta-xfce: > > > > > > > > AssertionError: Adding layer meta-xfce changed signatures. > > > > 7 signatures changed, initial differences (first hash before, second > > > > after): > > > >vim:do_install: 588d445122dccf317f15b0dd852f3888 -> > > > > ec086472d75d663c2fe836b935517810 > > > > > > > > This is definitely a violation of one our rule since adding meta-xfce > > > > changed changes vim recipe. > > > > > > > > > > > > > > > > > > > > > Or relax your rules!!!. > > > > > > > > > > > > - armin > > > > > > >> * in order to run the compliance report, i locally added > > > > > > >> networking-layer in m
Re: [oe] meta-oe and yocto-check-layer
On 9/25/18 2:43 AM, Nicolas Dechesne wrote: > hi Armin, > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > wrote: >> >> On Mon, Sep 24, 2018 at 11:51 PM akuster808 wrote: >>> >>> >>> >>> On 09/24/2018 02:03 PM, Paul Eggleton wrote: Hi Nicolas, On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne wrote: > hi Armin, Paul, Richard, > > I was looking at getting the compliance report for meta-oe (sumo > branch), and I have found a few issues. > > * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > depends on meta-networking (c-ares). It was fixes in master, with > 251878e8b6b9 (grpc: move it from oe to networking layer), so I think > this fix needs to be backported to sumo as well if we want the YP 2.0 > compliance script to even work. If agreed, once merged, please let me > know so that I can try again to generate a compliance report. Is it appropriate to make such moves in a stable branch? I wouldn't have thought so. >>> >>> We have to. Per my understanding and why I tried very hard to make >>> meta-openembedded clean ( appears I failed) is that if you want to be >>> Yocto Compliant and include any layer that does not pass this test, you >>> can not become Yocto Compliant. >> >> I believe that we want meta-openembedded to be compliant, and a good >> example in general. I will send a backport your way for this change. > > Running the compliance script on meta-oe turned out to be an > interesting exercise ;) > > I have found several issues, which I have mentioned in a few different > threads, so I will summary here. > > * oe-core: fix the yocto-check-layer for dependency loop > * I have the following local commits in meta-oe: > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > grpc: move it from oe to networking layer > meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) > > With all changes above, the compliance script finds another issue with > meta-xfce: > > AssertionError: Adding layer meta-xfce changed signatures. > 7 signatures changed, initial differences (first hash before, second after): >vim:do_install: 588d445122dccf317f15b0dd852f3888 -> > ec086472d75d663c2fe836b935517810 > > This is definitely a violation of one our rule since adding meta-xfce > changed changes vim recipe. yes vim changes should be looked at and consolidated in one layer if possible. > >> >>> >>> Or relax your rules!!!. >>> >>> - armin > * in order to run the compliance report, i locally added > networking-layer in meta-oe/conf/layer.conf, and it creates a > dependency loop since meta-oe <-> meta-networking. I found out that > yocto-check-layer doesn't like that too much, and brutally fails. The > following patch makes yocto-check-layer work again even with > dependency loop. I am going to do a few more tests and send that over > as a patch. > > diff --git a/scripts/lib/checklayer/__init__.py > b/scripts/lib/checklayer/__init__.py > index 2618416fab..0cc9bf3b6d 100644 > --- a/scripts/lib/checklayer/__init__.py > +++ b/scripts/lib/checklayer/__init__.py > @@ -151,11 +151,21 @@ def add_layer_dependencies(bblayersconf, layer, > layers, logger): > logger.debug('Processing dependencies %s for layer %s.' % \ > (depends, layer['name'])) > > +# To avoid never ending recursion, we keep track of layers while > +# they are being processed in this 'static' attribute. > +if not hasattr(recurse_dependencies, "layers"): > +recurse_dependencies.layers = [] > + > for depend in depends.split(): > # core (oe-core) is suppose to be provided > if depend == 'core': > continue > > +if depend in recurse_dependencies.layers: > +continue > + > +recurse_dependencies.layers.append(depend) > + > layer_depend = _find_layer_depends(depend, layers) > if not layer_depend: > logger.error('Layer %s depends on %s and isn\'t found.' > % \ Patch looks reasonable to me FWIW. Cheers, Paul >>> -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking V2][PATCH 4/4] crda: use gcrypt as default crypt
As Makefile told us, if `USE_OPENSSL=1', only openssl10 works, even though the recipe depends libgcrypt. [Makefile snip] |ifeq ($(USE_OPENSSL),1) |CFLAGS += -DUSE_OPENSSL [snip] |else |CFLAGS += -DUSE_GCRYPT [Makefile snip] The crda dpends openssl 1.0.x which there is a build failure with openssl 1.1.x. So use gcrypt instead of openssl by default. The idea refers: https://bugs.chromium.org/p/chromium/issues/detail?id=735782 https://gitweb.gentoo.org/repo/gentoo.git/tree/net-wireless/crda/crda-3.18-r1.ebuild#n36 Signed-off-by: Hongxu Jia --- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index c596ded..853a523 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -4,8 +4,10 @@ SECTION = "net" LICENSE = "copyleft-next-0.3.0" LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" -DEPENDS = "python-m2crypto-native python-typing-native python-native \ - libgcrypt libnl openssl10" +DEPENDS = "python-m2crypto-native python-typing-native python-native libnl \ + ${@oe.utils.conditional("DEFAULT_CRYPT", "gcrypt", "libgcrypt", "", d)} \ + ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "openssl10", "", d)} \ + " SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ @@ -21,9 +23,12 @@ SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e inherit python-dir pythonnative siteinfo +# "gcrypt" or "openssl" +DEFAULT_CRYPT ??= "gcrypt" + # Recursive make problem EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'" -EXTRA_OEMAKE_append = " USE_OPENSSL=1" +EXTRA_OEMAKE_append = " ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "USE_OPENSSL=1", "", d)}" TARGET_BITS = "${SITEINFO_BITS}" export TARGET_BITS -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 4/4] crda: use gcrypt ad default crypt
As Makefile told us, if `USE_OPENSSL=1', only openssl10 works, even though the recipe depends libgcrypt. [Makefile snip] |ifeq ($(USE_OPENSSL),1) |CFLAGS += -DUSE_OPENSSL [snip] |else |CFLAGS += -DUSE_GCRYPT [Makefile snip] The crda dpends openssl 1.0.x which there is a build failure with openssl 1.1.x. So use gcrypt instead of openssl by default. The idea refers: https://bugs.chromium.org/p/chromium/issues/detail?id=735782 https://gitweb.gentoo.org/repo/gentoo.git/tree/net-wireless/crda/crda-3.18-r1.ebuild#n36 Signed-off-by: Hongxu Jia --- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index c596ded..853a523 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -4,8 +4,10 @@ SECTION = "net" LICENSE = "copyleft-next-0.3.0" LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" -DEPENDS = "python-m2crypto-native python-typing-native python-native \ - libgcrypt libnl openssl10" +DEPENDS = "python-m2crypto-native python-typing-native python-native libnl \ + ${@oe.utils.conditional("DEFAULT_CRYPT", "gcrypt", "libgcrypt", "", d)} \ + ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "openssl10", "", d)} \ + " SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ @@ -21,9 +23,12 @@ SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e inherit python-dir pythonnative siteinfo +# "gcrypt" or "openssl" +DEFAULT_CRYPT ??= "gcrypt" + # Recursive make problem EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'" -EXTRA_OEMAKE_append = " USE_OPENSSL=1" +EXTRA_OEMAKE_append = " ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "USE_OPENSSL=1", "", d)}" TARGET_BITS = "${SITEINFO_BITS}" export TARGET_BITS -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/4] umip: support openssl 1.1.x
Long time no maintain from upstream since 2013, backport a fix from openSUSE Signed-off-by: Hongxu Jia --- .../umip/files/0001-support-openssl-1.1.x.patch| 88 ++ meta-oe/recipes-connectivity/umip/umip_1.0.bb | 3 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch diff --git a/meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch b/meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch new file mode 100644 index 000..d8355e2 --- /dev/null +++ b/meta-oe/recipes-connectivity/umip/files/0001-support-openssl-1.1.x.patch @@ -0,0 +1,88 @@ +From 62784e8b6df8ff3a907c1f816154808bea9d7064 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 25 Sep 2018 14:38:14 +0800 +Subject: [PATCH] support openssl 1.1.x + +Long time no maintain from upstream since 2013 +(git://git.umip.org/umip/umip.git), backport a +fix from openSUSE + +Upstream-Status: Backport [openSUSE] +http://ftp.gwdg.de/pub/opensuse/source/distribution/leap/15.0/repo/oss/src/mipv6d-2.0.2.umip.0.4-lp150.1.2.src.rpm + +Signed-off-by: Hongxu Jia +--- + src/keygen.c | 12 + src/mh.c | 17 - + 2 files changed, 28 insertions(+), 1 deletion(-) + +diff --git a/src/keygen.c b/src/keygen.c +index e434a38..b902644 100644 +--- a/src/keygen.c b/src/keygen.c +@@ -172,6 +172,7 @@ static void build_kgen_token(struct in6_addr *addr, uint8_t *nonce, + uint8_t tmp[20]; + #ifdef HAVE_LIBCRYPTO + unsigned int len = 20; ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL + HMAC_CTX ctx; + + HMAC_CTX_init(&ctx); +@@ -182,6 +183,17 @@ static void build_kgen_token(struct in6_addr *addr, uint8_t *nonce, + HMAC_Final(&ctx, tmp, &len); + HMAC_CTX_cleanup(&ctx); + #else ++ HMAC_CTX *ctx; ++ ctx = HMAC_CTX_new(); ++ HMAC_Init_ex(ctx, key_cn, sizeof(key_cn), EVP_sha1(), NULL); ++ HMAC_Update(ctx, (unsigned char *)addr, sizeof(*addr)); ++ HMAC_Update(ctx, nonce, NONCE_LENGTH); ++ HMAC_Update(ctx, &id, sizeof(id)); ++ HMAC_Final(ctx, tmp, &len); ++ HMAC_CTX_free(ctx); ++#endif // End of defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL ++ ++#else + HMAC_SHA1_CTX ctx; + + HMAC_SHA1_init(&ctx, key_cn, sizeof(key_cn)); +diff --git a/src/mh.c b/src/mh.c +index cba9a33..212eb5a 100644 +--- a/src/mh.c b/src/mh.c +@@ -518,9 +518,10 @@ static int calculate_auth_data(const struct iovec *iov, int iovlen, + + #ifdef HAVE_LIBCRYPTO + unsigned int len = HMAC_SHA1_HASH_LEN; +- HMAC_CTX ctx; + const EVP_MD *evp_md = EVP_sha1(); + ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL ++ HMAC_CTX ctx; + HMAC_CTX_init(&ctx); + HMAC_Init_ex(&ctx, key, HMAC_SHA1_KEY_SIZE, evp_md, NULL); + +@@ -532,6 +533,20 @@ static int calculate_auth_data(const struct iovec *iov, int iovlen, + HMAC_Final(&ctx, buf, &len); + HMAC_CTX_cleanup(&ctx); + #else ++ HMAC_CTX *ctx; ++ ctx = HMAC_CTX_new(); ++ HMAC_Init_ex(ctx, key, HMAC_SHA1_KEY_SIZE, evp_md, NULL); ++ ++ HMAC_Update(ctx, (uint8_t *)coa, sizeof(*coa)); ++ HMAC_Update(ctx, (uint8_t *)cn, sizeof(*coa)); ++ for (i = 0; i < iovlen; i++) { ++ HMAC_Update(ctx, (uint8_t *)iov[i].iov_base, iov[i].iov_len); ++ } ++ HMAC_Final(ctx, buf, &len); ++ HMAC_CTX_free(ctx); ++#endif ++ ++#else + HMAC_SHA1_CTX ctx; + + HMAC_SHA1_init(&ctx, key, HMAC_SHA1_KEY_SIZE); +-- +2.7.4 + diff --git a/meta-oe/recipes-connectivity/umip/umip_1.0.bb b/meta-oe/recipes-connectivity/umip/umip_1.0.bb index cee44f6..e2abc02 100644 --- a/meta-oe/recipes-connectivity/umip/umip_1.0.bb +++ b/meta-oe/recipes-connectivity/umip/umip_1.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://umip.org/"; SECTION = "System Environment/Base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=073dc31ccb2ebed70db54f1e8aeb4c33" -DEPENDS = "openssl10 ipsec-tools radvd indent-native bison-native" +DEPENDS = "openssl ipsec-tools radvd indent-native bison-native" SRC_URI = "git://git.umip.org/umip/umip.git \ file://add-dependency-to-support-parallel-compilation.patch \ @@ -16,6 +16,7 @@ SRC_URI = "git://git.umip.org/umip/umip.git \ file://0001-Add-format-string-to-fprintf-call.patch \ file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \ file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \ + file://0001-support-openssl-1.1.x.patch \ " SRCREV = "cbd441c5db719db554ff2b4fcb02fef88ae2f791" -- 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/4] mailx: support openssl 1.1.x
Long time no maintain from upstream since 2013-06-04, backport a fix from openSUSE Signed-off-by: Hongxu Jia --- .../mailx/files/0001-support-openssl-1.1.x.patch | 72 ++ meta-oe/recipes-extended/mailx/mailx_12.5-5.bb | 3 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch diff --git a/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch b/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch new file mode 100644 index 000..6a8911d --- /dev/null +++ b/meta-oe/recipes-extended/mailx/files/0001-support-openssl-1.1.x.patch @@ -0,0 +1,72 @@ +From 7db6d8a657d13bb562a27c6181accaf3e53c0efd Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 25 Sep 2018 14:03:10 +0800 +Subject: [PATCH] support openssl 1.1.x + +Long time no maintain from upstream since 2013-06-04 +(https://sourceforge.net/projects/nail/), backport a +fix from openSUSE + +Upstream-Status: Backport [openSUSE] +https://build.opensuse.org/package/view_file/openSUSE:Leap:15.0/mailx/mailx-12.5-openssl-1.1.0f.patch?expand=1 + +Signed-off-by: Hongxu Jia +--- + openssl.c | 25 - + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/openssl.c b/openssl.c +index 44fe4e5..0ccc517 100644 +--- a/openssl.c b/openssl.c +@@ -137,7 +137,12 @@ ssl_rand_init(void) + + if ((cp = value("ssl-rand-egd")) != NULL) { + cp = expand(cp); +- if (RAND_egd(cp) == -1) { ++#ifndef OPENSSL_NO_EGD ++ if (RAND_egd(cp) == -1) ++#else ++ if (1) ++#endif ++ { + fprintf(stderr, catgets(catd, CATSET, 245, + "entropy daemon at \"%s\" not available\n"), + cp); +@@ -216,6 +221,7 @@ ssl_select_method(const char *uhp) + + cp = ssl_method_string(uhp); + if (cp != NULL) { ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL + if (equal(cp, "ssl3")) + method = SSLv3_client_method(); + else if (equal(cp, "tls1")) +@@ -225,8 +231,25 @@ ssl_select_method(const char *uhp) + "Invalid SSL method \"%s\"\n"), cp); + method = SSLv23_client_method(); + } ++#else ++ method = NULL; ++ if (equal(cp, "tls")) ++ method = TLS_client_method(); ++ else if (equal(cp, "dtls")) ++ method = DTLS_client_method(); ++ ++ if (!method) { ++ fprintf(stderr, catgets(catd, CATSET, 244, ++ "Invalid SSL method \"%s\"\n"), cp); ++ method = TLS_client_method(); ++ } ++#endif + } else ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010006fL + method = SSLv23_client_method(); ++#else ++ method = TLS_client_method(); ++#endif + return method; + } + +-- +2.7.4 + diff --git a/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb b/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb index 0a191a0..4161ea6 100644 --- a/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb +++ b/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb @@ -9,7 +9,7 @@ SECTION = "console/network" LICENSE = "BSD & MPL-1" LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd" -DEPENDS = "openssl10" +DEPENDS = "openssl" SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5.orig.tar.gz;name=archive \ file://0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch \ @@ -21,6 +21,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/ file://0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch \ file://0015-usr-sbin-sendmail.patch \ file://explicitly.disable.krb5.support.patch \ + file://0001-support-openssl-1.1.x.patch \ " SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/4] ipsec-tools: support openssl 1.1.x
Long time no maintain from upstream since 2015, backport a fix from openwrt Signed-off-by: Hongxu Jia --- .../0001-ipsec-tools-add-openssl-1.1-support.patch | 1086 .../ipsec-tools/ipsec-tools_0.8.2.bb |3 +- 2 files changed, 1088 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-ipsec-tools-add-openssl-1.1-support.patch diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-ipsec-tools-add-openssl-1.1-support.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-ipsec-tools-add-openssl-1.1-support.patch new file mode 100644 index 000..2282744 --- /dev/null +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-ipsec-tools-add-openssl-1.1-support.patch @@ -0,0 +1,1086 @@ +From b572350a922187d43dd4629c3b43e19979fae3ef Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz +Date: Tue, 25 Sep 2018 15:30:04 +0800 +Subject: [PATCH] ipsec-tools: add openssl 1.1 support + +To: equei...@troianet.com.br + +This patch updates the calls to openssl 1.1 API, and adds a +compatibility layer so it compiles with (at least) openssl 1.0.2, I +haven't tested it with lower versions, but all that's needed is to edit +the openssl_compat.* files and add the missing functions there--they're +usually trivial. + +Signed-off-by: Eneas U de Queiroz + +Upstream-Status: Submitted [https://sourceforge.net/p/ipsec-tools/mailman/message/36327963/] +https://github.com/openwrt/packages/blob/master/net/ipsec-tools/patches/015-openssl-1.1.patch + +Signed-off-by: Hongxu Jia +--- + src/racoon/Makefile.am | 10 +-- + src/racoon/algorithm.c | 6 +- + src/racoon/crypto_openssl.c | 197 +--- + src/racoon/crypto_openssl.h | 2 +- + src/racoon/eaytest.c| 7 +- + src/racoon/ipsec_doi.c | 2 +- + src/racoon/openssl_compat.c | 213 + src/racoon/openssl_compat.h | 45 ++ + src/racoon/plainrsa-gen.c | 41 + + src/racoon/prsa_par.y | 28 -- + src/racoon/rsalist.c| 5 +- + 11 files changed, 430 insertions(+), 126 deletions(-) + create mode 100644 src/racoon/openssl_compat.c + create mode 100644 src/racoon/openssl_compat.h + +diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am +index 0662957..272b009 100644 +--- a/src/racoon/Makefile.am b/src/racoon/Makefile.am +@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen + noinst_PROGRAMS = eaytest + include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \ + schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \ +- isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h ++ isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h + lib_LTLIBRARIES = libracoon.la + + adminsockdir=${localstatedir}/racoon +@@ -32,7 +32,7 @@ racoon_SOURCES = \ + gssapi.c dnssec.c getcertsbyname.c privsep.c \ + pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \ + policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \ +- proposal.c sainfo.c strnames.c \ ++ openssl_compat.c proposal.c sainfo.c strnames.c \ + plog.c logger.c schedule.c str2val.c \ + safefile.c backupsa.c genlist.c rsalist.c \ + cftoken.l cfparse.y prsa_tok.l prsa_par.y +@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c + libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS) + + plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \ +- crypto_openssl.c logger.c ++ crypto_openssl.c logger.c openssl_compat.c + EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS) + plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o + plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o + +-eaytest_SOURCES = eaytest.c plog.c logger.c ++eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c + EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c + eaytest_LDADD = crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \ + $(CRYPTOBJS) +@@ -75,7 +75,7 @@ noinst_HEADERS = \ + debugrm.h isakmp.h misc.h sainfo.h \ + dhgroup.h isakmp_agg.h netdb_dnssec.h schedule.h \ + isakmp_cfg.h isakmp_xauth.h isakmp_unity.h isakmp_frag.h \ +- throttle.hprivsep.h \ ++ throttle.hprivsep.h openssl_compat.h \ + cfparse_proto.h cftoken_proto.h genlist.h rsalist.h \ + missing/crypto/sha2/sha2.h missing/crypto/rijndael/rijndael_local.h \ + missing/crypto/rijndael/rijndael-api-fst.h \ +diff --git a/src/racoon/algorithm.c b/src/racoon/algorithm.c +index 3fd50f6..66c874b 100644 +--- a/src/racoon/algorithm.c b/src/racoon/algorithm.c +@@ -128,7 +128,7 @@ static struct enc_algorithm oakley_encdef[] = { + { "aes", algtype_aes,OAKLEY_ATTR_ENC_ALG_AES,16, + eay_aes_encrypt,eay_aes_decrypt, + eay_a
Re: [oe] meta-oe and yocto-check-layer
On Tue, Sep 25, 2018 at 12:29 PM Martin Jansa wrote: > > On Tue, Sep 25, 2018 at 12:24:31PM +0200, Martin Jansa wrote: > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > > This causes another circular dependency which we don't want, doesn't it? What are the issues with circular dependency? LAYERDEPENDS only lists each layers own dependencies, which is helpful for integrators to know which layer they need to pull into bblayers.conf. If all layers from LAYERDEPENDS are pulled in, then it is expected that each recipe will build fine. The only circular dependency that I am aware is with yocto-check-layer script , and I sent a patch yesterday to fix this issue. With this patch, yocto-check-layer works fine even when layers have inter dependencies. https://patchwork.openembedded.org/patch/155113/ > > Especially if it's caused only by python-protobuf runtime dependency added in: > > https://patchwork.openembedded.org/patch/146867/ yes. this is the culprit. > > > On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < > > nicolas.deche...@linaro.org> wrote: > > > > > hi Armin, > > > > > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > > > wrote: > > > > > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > > > wrote: > > > > > > > > > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > > > Hi Nicolas, > > > > > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne > > > > > > wrote: > > > > > >> hi Armin, Paul, Richard, > > > > > >> > > > > > >> I was looking at getting the compliance report for meta-oe (sumo > > > > > >> branch), and I have found a few issues. > > > > > >> > > > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > > > > > >> depends on meta-networking (c-ares). It was fixes in master, with > > > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so I > > > > > >> think > > > > > >> this fix needs to be backported to sumo as well if we want the YP > > > 2.0 > > > > > >> compliance script to even work. If agreed, once merged, please let > > > me > > > > > >> know so that I can try again to generate a compliance report. > > > > > > Is it appropriate to make such moves in a stable branch? I wouldn't > > > have > > > > > > thought so. > > > > > > > > > > > > > > > > We have to. Per my understanding and why I tried very hard to make > > > > > meta-openembedded clean ( appears I failed) is that if you want to be > > > > > Yocto Compliant and include any layer that does not pass this test, > > > > > you > > > > > can not become Yocto Compliant. > > > > > > > > I believe that we want meta-openembedded to be compliant, and a good > > > > example in general. I will send a backport your way for this change. > > > > > > Running the compliance script on meta-oe turned out to be an > > > interesting exercise ;) > > > > > > I have found several issues, which I have mentioned in a few different > > > threads, so I will summary here. > > > > > > * oe-core: fix the yocto-check-layer for dependency loop > > > * I have the following local commits in meta-oe: > > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > > grpc: move it from oe to networking layer > > > meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) > > > > > > With all changes above, the compliance script finds another issue with > > > meta-xfce: > > > > > > AssertionError: Adding layer meta-xfce changed signatures. > > > 7 signatures changed, initial differences (first hash before, second > > > after): > > >vim:do_install: 588d445122dccf317f15b0dd852f3888 -> > > > ec086472d75d663c2fe836b935517810 > > > > > > This is definitely a violation of one our rule since adding meta-xfce > > > changed changes vim recipe. > > > > > > > > > > > > > > > > > Or relax your rules!!!. > > > > > > > > > > - armin > > > > > >> * in order to run the compliance report, i locally added > > > > > >> networking-layer in meta-oe/conf/layer.conf, and it creates a > > > > > >> dependency loop since meta-oe <-> meta-networking. I found out that > > > > > >> yocto-check-layer doesn't like that too much, and brutally fails. > > > The > > > > > >> following patch makes yocto-check-layer work again even with > > > > > >> dependency loop. I am going to do a few more tests and send that > > > over > > > > > >> as a patch. > > > > > >> > > > > > >> diff --git a/scripts/lib/checklayer/__init__.py > > > > > >> b/scripts/lib/checklayer/__init__.py > > > > > >> index 2618416fab..0cc9bf3b6d 100644 > > > > > >> --- a/scripts/lib/checklayer/__init__.py > > > > > >> +++ b/scripts/lib/checklayer/__init__.py > > > > > >> @@ -151,11 +151,21 @@ def add_layer_dependencies(bblayersconf, > > > layer, > > > > > >> layers, logger): > > > > > >> logger.debug('Processing dependencies %s for layer %s.' % > > > > > >> \ > > > > > >> (depends, layer['name'])) > > > > > >> > > > > > >> +# To avoid never ending recursion, we keep tr
Re: [oe] meta-oe and yocto-check-layer
On Tue, Sep 25, 2018 at 12:24:31PM +0200, Martin Jansa wrote: > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > This causes another circular dependency which we don't want, doesn't it? Especially if it's caused only by python-protobuf runtime dependency added in: https://patchwork.openembedded.org/patch/146867/ > On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < > nicolas.deche...@linaro.org> wrote: > > > hi Armin, > > > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > > wrote: > > > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > > wrote: > > > > > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > > Hi Nicolas, > > > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne wrote: > > > > >> hi Armin, Paul, Richard, > > > > >> > > > > >> I was looking at getting the compliance report for meta-oe (sumo > > > > >> branch), and I have found a few issues. > > > > >> > > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > > > > >> depends on meta-networking (c-ares). It was fixes in master, with > > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so I think > > > > >> this fix needs to be backported to sumo as well if we want the YP > > 2.0 > > > > >> compliance script to even work. If agreed, once merged, please let > > me > > > > >> know so that I can try again to generate a compliance report. > > > > > Is it appropriate to make such moves in a stable branch? I wouldn't > > have > > > > > thought so. > > > > > > > > > > > > > We have to. Per my understanding and why I tried very hard to make > > > > meta-openembedded clean ( appears I failed) is that if you want to be > > > > Yocto Compliant and include any layer that does not pass this test, you > > > > can not become Yocto Compliant. > > > > > > I believe that we want meta-openembedded to be compliant, and a good > > > example in general. I will send a backport your way for this change. > > > > Running the compliance script on meta-oe turned out to be an > > interesting exercise ;) > > > > I have found several issues, which I have mentioned in a few different > > threads, so I will summary here. > > > > * oe-core: fix the yocto-check-layer for dependency loop > > * I have the following local commits in meta-oe: > > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > > grpc: move it from oe to networking layer > > meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) > > > > With all changes above, the compliance script finds another issue with > > meta-xfce: > > > > AssertionError: Adding layer meta-xfce changed signatures. > > 7 signatures changed, initial differences (first hash before, second > > after): > >vim:do_install: 588d445122dccf317f15b0dd852f3888 -> > > ec086472d75d663c2fe836b935517810 > > > > This is definitely a violation of one our rule since adding meta-xfce > > changed changes vim recipe. > > > > > > > > > > > > > Or relax your rules!!!. > > > > > > > > - armin > > > > >> * in order to run the compliance report, i locally added > > > > >> networking-layer in meta-oe/conf/layer.conf, and it creates a > > > > >> dependency loop since meta-oe <-> meta-networking. I found out that > > > > >> yocto-check-layer doesn't like that too much, and brutally fails. > > The > > > > >> following patch makes yocto-check-layer work again even with > > > > >> dependency loop. I am going to do a few more tests and send that > > over > > > > >> as a patch. > > > > >> > > > > >> diff --git a/scripts/lib/checklayer/__init__.py > > > > >> b/scripts/lib/checklayer/__init__.py > > > > >> index 2618416fab..0cc9bf3b6d 100644 > > > > >> --- a/scripts/lib/checklayer/__init__.py > > > > >> +++ b/scripts/lib/checklayer/__init__.py > > > > >> @@ -151,11 +151,21 @@ def add_layer_dependencies(bblayersconf, > > layer, > > > > >> layers, logger): > > > > >> logger.debug('Processing dependencies %s for layer %s.' % \ > > > > >> (depends, layer['name'])) > > > > >> > > > > >> +# To avoid never ending recursion, we keep track of layers > > while > > > > >> +# they are being processed in this 'static' attribute. > > > > >> +if not hasattr(recurse_dependencies, "layers"): > > > > >> +recurse_dependencies.layers = [] > > > > >> + > > > > >> for depend in depends.split(): > > > > >> # core (oe-core) is suppose to be provided > > > > >> if depend == 'core': > > > > >> continue > > > > >> > > > > >> +if depend in recurse_dependencies.layers: > > > > >> +continue > > > > >> + > > > > >> +recurse_dependencies.layers.append(depend) > > > > >> + > > > > >> layer_depend = _find_layer_depends(depend, layers) > > > > >> if not layer_depend: > > > > >> logger.error('Layer %s depends on %s and isn\'t > > found.' % \ > > > > > Patch looks reasonable to me FWI
Re: [oe] meta-oe and yocto-check-layer
On Tuesday, 25 September 2018 9:43:43 PM NZST Nicolas Dechesne wrote: > Running the compliance script on meta-oe turned out to be an > interesting exercise ;) > > I have found several issues, which I have mentioned in a few different > threads, so I will summary here. > > * oe-core: fix the yocto-check-layer for dependency loop > * I have the following local commits in meta-oe: > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) Right, yeah, I noticed that one too a week or so ago and forgot to raise it. I actually think this needs to be fixed - meta-oe (at least by previous design) is not supposed to depend upon any other layer than OE-Core. I believe the dependency is optional though so we should be able to add a PACKAGECONFIG for it and default it to disabled. Assuming there is no violent objection and nobody else gets there first, I'll volunteer to make this fix. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] meta-oe and yocto-check-layer
> meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) This causes another circular dependency which we don't want, doesn't it? On Tue, Sep 25, 2018 at 11:44 AM Nicolas Dechesne < nicolas.deche...@linaro.org> wrote: > hi Armin, > > On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne > wrote: > > > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 > wrote: > > > > > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > > Hi Nicolas, > > > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne wrote: > > > >> hi Armin, Paul, Richard, > > > >> > > > >> I was looking at getting the compliance report for meta-oe (sumo > > > >> branch), and I have found a few issues. > > > >> > > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > > > >> depends on meta-networking (c-ares). It was fixes in master, with > > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so I think > > > >> this fix needs to be backported to sumo as well if we want the YP > 2.0 > > > >> compliance script to even work. If agreed, once merged, please let > me > > > >> know so that I can try again to generate a compliance report. > > > > Is it appropriate to make such moves in a stable branch? I wouldn't > have > > > > thought so. > > > > > > > > > > We have to. Per my understanding and why I tried very hard to make > > > meta-openembedded clean ( appears I failed) is that if you want to be > > > Yocto Compliant and include any layer that does not pass this test, you > > > can not become Yocto Compliant. > > > > I believe that we want meta-openembedded to be compliant, and a good > > example in general. I will send a backport your way for this change. > > Running the compliance script on meta-oe turned out to be an > interesting exercise ;) > > I have found several issues, which I have mentioned in a few different > threads, so I will summary here. > > * oe-core: fix the yocto-check-layer for dependency loop > * I have the following local commits in meta-oe: > meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) > grpc: move it from oe to networking layer > meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) > > With all changes above, the compliance script finds another issue with > meta-xfce: > > AssertionError: Adding layer meta-xfce changed signatures. > 7 signatures changed, initial differences (first hash before, second > after): >vim:do_install: 588d445122dccf317f15b0dd852f3888 -> > ec086472d75d663c2fe836b935517810 > > This is definitely a violation of one our rule since adding meta-xfce > changed changes vim recipe. > > > > > > > > > Or relax your rules!!!. > > > > > > - armin > > > >> * in order to run the compliance report, i locally added > > > >> networking-layer in meta-oe/conf/layer.conf, and it creates a > > > >> dependency loop since meta-oe <-> meta-networking. I found out that > > > >> yocto-check-layer doesn't like that too much, and brutally fails. > The > > > >> following patch makes yocto-check-layer work again even with > > > >> dependency loop. I am going to do a few more tests and send that > over > > > >> as a patch. > > > >> > > > >> diff --git a/scripts/lib/checklayer/__init__.py > > > >> b/scripts/lib/checklayer/__init__.py > > > >> index 2618416fab..0cc9bf3b6d 100644 > > > >> --- a/scripts/lib/checklayer/__init__.py > > > >> +++ b/scripts/lib/checklayer/__init__.py > > > >> @@ -151,11 +151,21 @@ def add_layer_dependencies(bblayersconf, > layer, > > > >> layers, logger): > > > >> logger.debug('Processing dependencies %s for layer %s.' % \ > > > >> (depends, layer['name'])) > > > >> > > > >> +# To avoid never ending recursion, we keep track of layers > while > > > >> +# they are being processed in this 'static' attribute. > > > >> +if not hasattr(recurse_dependencies, "layers"): > > > >> +recurse_dependencies.layers = [] > > > >> + > > > >> for depend in depends.split(): > > > >> # core (oe-core) is suppose to be provided > > > >> if depend == 'core': > > > >> continue > > > >> > > > >> +if depend in recurse_dependencies.layers: > > > >> +continue > > > >> + > > > >> +recurse_dependencies.layers.append(depend) > > > >> + > > > >> layer_depend = _find_layer_depends(depend, layers) > > > >> if not layer_depend: > > > >> logger.error('Layer %s depends on %s and isn\'t > found.' % \ > > > > Patch looks reasonable to me FWIW. > > > > > > > > Cheers, > > > > Paul > > > > > > > > > > > > -- > ___ > 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/mailm
Re: [oe] meta-oe and yocto-check-layer
hi Armin, On Tue, Sep 25, 2018 at 8:59 AM Nicolas Dechesne wrote: > > On Mon, Sep 24, 2018 at 11:51 PM akuster808 wrote: > > > > > > > > On 09/24/2018 02:03 PM, Paul Eggleton wrote: > > > Hi Nicolas, > > > > > > On Monday, 24 September 2018 10:05:02 PM NZST Nicolas Dechesne wrote: > > >> hi Armin, Paul, Richard, > > >> > > >> I was looking at getting the compliance report for meta-oe (sumo > > >> branch), and I have found a few issues. > > >> > > >> * in meta-openembedded/sumo, grpc is in meta-oe layer, while it > > >> depends on meta-networking (c-ares). It was fixes in master, with > > >> 251878e8b6b9 (grpc: move it from oe to networking layer), so I think > > >> this fix needs to be backported to sumo as well if we want the YP 2.0 > > >> compliance script to even work. If agreed, once merged, please let me > > >> know so that I can try again to generate a compliance report. > > > Is it appropriate to make such moves in a stable branch? I wouldn't have > > > thought so. > > > > > > > We have to. Per my understanding and why I tried very hard to make > > meta-openembedded clean ( appears I failed) is that if you want to be > > Yocto Compliant and include any layer that does not pass this test, you > > can not become Yocto Compliant. > > I believe that we want meta-openembedded to be compliant, and a good > example in general. I will send a backport your way for this change. Running the compliance script on meta-oe turned out to be an interesting exercise ;) I have found several issues, which I have mentioned in a few different threads, so I will summary here. * oe-core: fix the yocto-check-layer for dependency loop * I have the following local commits in meta-oe: meta-oe: add meta-python in LAYERDEPENDS (needed for protobuf) grpc: move it from oe to networking layer meta-multimedia: fixup LAYERDEPENDS (for dos2unix issue) With all changes above, the compliance script finds another issue with meta-xfce: AssertionError: Adding layer meta-xfce changed signatures. 7 signatures changed, initial differences (first hash before, second after): vim:do_install: 588d445122dccf317f15b0dd852f3888 -> ec086472d75d663c2fe836b935517810 This is definitely a violation of one our rule since adding meta-xfce changed changes vim recipe. > > > > > Or relax your rules!!!. > > > > - armin > > >> * in order to run the compliance report, i locally added > > >> networking-layer in meta-oe/conf/layer.conf, and it creates a > > >> dependency loop since meta-oe <-> meta-networking. I found out that > > >> yocto-check-layer doesn't like that too much, and brutally fails. The > > >> following patch makes yocto-check-layer work again even with > > >> dependency loop. I am going to do a few more tests and send that over > > >> as a patch. > > >> > > >> diff --git a/scripts/lib/checklayer/__init__.py > > >> b/scripts/lib/checklayer/__init__.py > > >> index 2618416fab..0cc9bf3b6d 100644 > > >> --- a/scripts/lib/checklayer/__init__.py > > >> +++ b/scripts/lib/checklayer/__init__.py > > >> @@ -151,11 +151,21 @@ def add_layer_dependencies(bblayersconf, layer, > > >> layers, logger): > > >> logger.debug('Processing dependencies %s for layer %s.' % \ > > >> (depends, layer['name'])) > > >> > > >> +# To avoid never ending recursion, we keep track of layers while > > >> +# they are being processed in this 'static' attribute. > > >> +if not hasattr(recurse_dependencies, "layers"): > > >> +recurse_dependencies.layers = [] > > >> + > > >> for depend in depends.split(): > > >> # core (oe-core) is suppose to be provided > > >> if depend == 'core': > > >> continue > > >> > > >> +if depend in recurse_dependencies.layers: > > >> +continue > > >> + > > >> +recurse_dependencies.layers.append(depend) > > >> + > > >> layer_depend = _find_layer_depends(depend, layers) > > >> if not layer_depend: > > >> logger.error('Layer %s depends on %s and isn\'t found.' > > >> % \ > > > Patch looks reasonable to me FWIW. > > > > > > Cheers, > > > Paul > > > > > > > > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] openjdk-8-native: hotspot: handle format-overflow error for gcc >= 7
fixed the format-overflow warnings by patch affected files in openjdk-8-hotspot Signed-off-by: Andreas Obergschwandtner --- .../hotspot-handle-gcc7-format-overflow.patch | 25 +++ 1 file changed, 25 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch b/recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch new file mode 100644 index 000..83626b3 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/hotspot-handle-gcc7-format-overflow.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User Andreas Obergschwandtner +# Date 1537519446 -7200 +# Fri Sep 21 10:44:06 2018 +0200 +# Node ID 213da2c3ee54a558abd30b0230afa40d4b4e7f83 +# Parent 80ee2541504ec08d65da9d968a18a00a69858ce0 +Handle format error for GCC >= 7 + +diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp +--- a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp +@@ -436,9 +436,11 @@ + for (i = maxcycleused; i > 0; i /= 10) + cycledigit++; + +- int maskdigit = 0; +- for (i = rescount; i > 0; i /= 10) ++ int maskdigit = 1; ++ for (i = rescount / 10; i > 0; i /= 10) + maskdigit++; ++ if (maskdigit > 10) ++maskdigit = 10; + + static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; + static const char* pipeline_use_element= "Pipeline_Use_Element"; -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel