[OE-core] [PATCH 2/5] openssl_1.0: drop obsolete exporting of AS, EX_LIBS and DIRS
Previously (when EXTRA_OEMAKE contained -e) exporting these variables
over-rode default values in the top-level openssl Makefile. However,
since -e was removed from EXTRA_OEMAKE as part of:
http://git.openembedded.org/openembedded-core/commit/?id=537a404cfbb811fcb526cdb5f2e059257de6ef13
exporting these variables does nothing. The comment from that commit
that only AR is affected by removing -e wasn't correct, but the
effects of letting the openssl Makefile also control AS, EX_LIBS and
DIRS seem to be either benign or beneficial.
Since without -e make ignores DIRS from the environment and always
runs for all subdirs (including "test"), adding "test" to DIRS and
calling "make depend" again from do_compile_ptest() can be dropped.
Signed-off-by: Andre McCurdy
---
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 6 --
1 file changed, 6 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index ee1c1f7..c2d9264 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -72,9 +72,6 @@ PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV
-DUSE_CRYPTODEV_DIGESTS,,cryp
# vulnerability
EXTRA_OECONF = "no-ssl3"
-export DIRS = "crypto ssl apps engines"
-export AS = "${CC} -c"
-export EX_LIBS = "-lgcc -ldl"
export OE_LDFLAGS = "${LDFLAGS}"
# openssl fails with ccache:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810
@@ -222,9 +219,6 @@ do_compile_class-target () {
}
do_compile_ptest () {
- # build dependencies for test directory too
- export DIRS="$DIRS test"
- oe_runmake depend
oe_runmake buildtest
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] openssl_1.0: drop obsolete ca.patch
This patch adds a second line to the -help output of the CA.pl script
(which lists almost the same command line options as the line above
it but in a slightly different order). Although it's tagged as a
Debian backport, there's no patch like it in recent Debian patch sets
for openssl 1.0.2.
Signed-off-by: Andre McCurdy
---
.../openssl/openssl-1.0.2o/debian/ca.patch | 22 --
.../recipes-connectivity/openssl/openssl_1.0.2o.bb | 1 -
2 files changed, 23 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
deleted file mode 100644
index fb745e4..000
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/apps/CA.pl.in
-===
openssl-0.9.8m.orig/apps/CA.pl.in 2006-04-28 00:28:51.0 +
-+++ openssl-0.9.8m/apps/CA.pl.in 2010-02-27 00:36:51.0 +
-@@ -65,6 +65,7 @@
- foreach (@ARGV) {
- if ( /^(-\?|-h|-help)$/ ) {
- print STDERR "usage: CA
-newcert|-newreq|-newreq-nodes|-newca|-sign|-signcert|-verify\n";
-+ print STDERR "usage: CA -signcert certfile
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
- exit 0;
- } elsif (/^-newcert$/) {
- # create a certificate
-@@ -165,6 +166,7 @@
- } else {
- print STDERR "Unknown arg $_\n";
- print STDERR "usage: CA
-newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+ print STDERR "usage: CA -signcert certfile
keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
- exit 1;
- }
- }
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 9e5e7ec..ee1c1f7 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -23,7 +23,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://engines-install-in-libdir-ssl.patch \
file://debian1.0.2/block_diginotar.patch \
file://debian1.0.2/block_digicert_malaysia.patch \
- file://debian/ca.patch \
file://debian/c_rehash-compat.patch \
file://debian/debian-targets.patch \
file://debian/man-dir.patch \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] openssl_1.0: squash whitespace in CC_INFO
Squash whitespace in CC_INFO to avoid recipe whitespace changes to
CFLAG affecting the final openssl binaries (the value of CC_INFO gets
embedded in libcrypto, via buildinf.h).
Signed-off-by: Andre McCurdy
---
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 527be72..f33ca97 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -211,7 +211,7 @@ do_compile () {
do_compile_class-target () {
sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
oe_runmake depend
- cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e
's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'`
+ cc_sanitized=$(echo "${CC} ${CFLAG}" | sed -e
's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g' -e 's/[
\t]\+/ /g')
oe_runmake CC_INFO="$cc_sanitized"
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] openssl_1.0: add PACKAGECONFIG option to control manpages
Creating the openssl manpages, which happens as part of do_install(),
can take a significant amount of time (e.g. ~50 seconds on a quad
core laptop). Provide a PACKAGECONFIG option to allow creation of the
manpages to be skipped completely if not required. Leave manpages
enabled by default for target builds, but disable by default for
-native and -nativesdk.
Signed-off-by: Andre McCurdy
---
.../0001-allow-manpages-to-be-disabled.patch | 31 ++
.../recipes-connectivity/openssl/openssl_1.0.2o.bb | 8 --
2 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch
new file mode 100644
index 000..3f7d649
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch
@@ -0,0 +1,31 @@
+From e1c39b80b01d4d18feeadfdc6e45a3e1dd110634 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy
+Date: Fri, 27 Jul 2018 21:41:06 +
+Subject: [PATCH] allow manpages to be disabled
+
+Define OE_DISABLE_MANPAGES (via environment or the make command line)
+to skip creation and installation of manpages.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andre McCurdy
+---
+ Makefile.org | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index ed98d2a..747d8cb 100644
+--- a/Makefile.org
b/Makefile.org
+@@ -549,7 +549,7 @@ dist:
+ @$(MAKE) SDIRS='$(SDIRS)' clean
+ @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
+
+-install: all install_docs install_sw
++install: all $(if $(OE_DISABLE_MANPAGES),,install_docs) install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+--
+1.9.1
+
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 2804203..527be72 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -43,6 +43,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://Use-SHA256-not-MD5-as-default-digest.patch \
file://0001-Fix-build-with-clang-using-external-assembler.patch \
file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
+ file://0001-allow-manpages-to-be-disabled.patch \
"
SRC_URI_append_class-target = " \
@@ -61,17 +62,20 @@ UPSTREAM_CHECK_REGEX = "openssl-(?P1\.0.+)\.tar"
inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
-PACKAGECONFIG ?= "cryptodev-linux"
+PACKAGECONFIG ?= "cryptodev-linux manpages"
PACKAGECONFIG_class-native = ""
PACKAGECONFIG_class-nativesdk = ""
-PACKAGECONFIG[perl] = ",,,"
PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV
-DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux"
+PACKAGECONFIG[manpages] = ",,,"
+PACKAGECONFIG[perl] = ",,,"
# Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE
# vulnerability
EXTRA_OECONF = "no-ssl3"
+EXTRA_OEMAKE = "${@bb.utils.contains('PACKAGECONFIG', 'manpages', '',
'OE_DISABLE_MANPAGES=1', d)}"
+
export OE_LDFLAGS = "${LDFLAGS}"
# openssl fails with ccache:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] openssl_1.0: drop unmaintained darwin support
The fact that the darwin support only appears to consider x86 (and
not x86_64) suggests that it's not maintained or tested. In general
oe-core doesn't support building on darwin.
Signed-off-by: Andre McCurdy
---
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 7 ---
1 file changed, 7 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index c2d9264..2804203 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -89,10 +89,6 @@ CFLAG += "-Wa,--noexecstack"
CFLAG_append_class-native = " -fPIC"
-do_configure_prepend_darwin () {
- sed -i -e '/version-script=openssl\.ld/d' Configure
-}
-
do_configure () {
# The crypto_use_bigint patch means that perl's bignum module needs to
be
# installed, but some distributions (for example Fedora 23) don't ship
it by
@@ -190,9 +186,6 @@ do_configure () {
linux-sparc)
target=linux-sparcv8
;;
- darwin-i386)
- target=darwin-i386-cc
- ;;
esac
# inject machine-specific flags
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] defaultsetup.conf: Enable security flags+pie by default
On Fri, Jul 27, 2018 at 1:49 PM Peter Kjellerstedt
wrote:
>
> > -Original Message-
> > From: openembedded-core-boun...@lists.openembedded.org > core-boun...@lists.openembedded.org> On Behalf Of Khem Raj
> > Sent: den 24 juli 2018 16:12
> > To: ChenQi
> > Cc: Patches and discussions about the oe-core layer > c...@lists.openembedded.org>
> > Subject: Re: [OE-core] [PATCH] defaultsetup.conf: Enable security
> > flags+pie by default
> >
> > On Tue, Jul 24, 2018 at 12:30 AM ChenQi wrote:
> > >
> > > Hi Khem,
> > >
> > > The comments in security-flags.inc also needs to be modified to
> > remove
> > > 'poky-lsb' info.
> > >
> > > I'd suggest we still put it into distro conf file (poky.conf) instead
> > of
> > > defaultsetup.conf, because defaultsetup.conf is included by
> > > bitbake.conf. I think things in defaultsetup.conf should be necessary
> > > default values to build things out. I don't think security flags is
> > > necessary to build things out.
> >
> > this is the default setup, even non-poky users will get consistent
> > experience.
>
> I have to agree with Chen here. I think requiring security_flags.inc from
> defaultsetup.conf is the wrong thing to do. We use security_flags.inc in
> our setup, and I know how much trouble it has brought. To me, using it
> should be a distro decision, not something that is enforced by the use
> of bitbake.
Thats fine, I can move this to poky distro settings, using it by
default would have
been in sync for all since reference distro is using it would be
easier for others when
submitting patches, as a phase 2 I was also thinking of defaulting to
hardeing in the toolchain itself
and remove this file completely that would have made it much better,
then folks who dont want hardeing could just disable
it in toolchain. but I am fine to leave it a distro decision for now.
>
> > > Also, I got a question when I just looked at this file.
> > > Do you think we should adjust CFLAGS and LDFALGS in security_flags.inc
> > > instead of the current TARGET_CC_ARCH and TARGET_LDFLAGS?
> >
> > in many cases packages do not honor CFLAGS/LDFLAGS say during configure
> >
> > > We are naming
> > > variables to SECURITY_CFLAGS and SECURITY_LDFLAGS, it seems that they
> > > belong to CFLAGS and LDFLAGS naturally. But I'm not sure about it.
> > >
> > yes they do, but this makes it easy to override the setting for
> > packages where these options are needed to be overridden or modified.
>
> Actually, with the changes introduced in Pyro, SECURITY_CFLAGS became a
> mess. Before Pyro, you either set SECURITY_CFLAGS to
> "${SECURITY_NO_PIE_CFLAGS}" (to disable the use of -fpie), or you set it
> to the empty string (to disable all security options). With Pyro and later,
> you instead have to set SECURITY_CFLAGS to "${SECURITY_NO_PIE_CFLAGS}
> ${SECURITY_NOPIE_CFLAGS}" to make sure -fpie is disabled, or set it to
> "${SECURITY_NOPIE_CFLAGS}" to disable everything. Alternatively you can
> set SECURITY_PIE_CFLAGS to "${SECURITY_NOPIE_CFLAGS}" to only disable
> -fpie.
>
> I have considered to suggest changing the definition of
> SECURITY_NOPIE_CFLAGS to:
>
> SECURITY_NOPIE_CFLAGS ?= "${@'-no-pie -fno-PIE' if '${GCCPIE}' else ''}"
>
> and then change SECURITY_NO_PIE_CFLAGS to:
>
> SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${SECURITY_NOPIE_CFLAGS}
> ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
>
> That would better have matched the situation before Pyro, in that one yet
> again would set SECURITY_CFLAGS to "${SECURITY_NO_PIE_CFLAGS}" to disable
> -fpie. Unfortunately one would still have to set SECURITY_CFLAGS to
> "${SECURITY_NOPIE_CFLAGS}" to disable everything.
>
> > > Best Regards,
> > > Chen Qi
> > >
> > >
> > > On 07/24/2018 03:09 AM, Khem Raj wrote:
> > > > This has been an opt-in for so long, some distributions e.g.
> > > > poky-lsb uses it by default however, since most of linux
> > > > distros have started to default to these settings for security
> > > > enhancements, time has come for OE to make it default too
> > > >
> > > > Signed-off-by: Khem Raj
> > > > ---
> > > > meta/conf/distro/defaultsetup.conf | 1 +
> > > > 1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/meta/conf/distro/defaultsetup.conf
> > b/meta/conf/distro/defaultsetup.conf
> > > > index ca2f9178d2..352e279596 100644
> > > > --- a/meta/conf/distro/defaultsetup.conf
> > > > +++ b/meta/conf/distro/defaultsetup.conf
> > > > @@ -1,6 +1,7 @@
> > > > include conf/distro/include/default-providers.inc
> > > > include conf/distro/include/default-versions.inc
> > > > include conf/distro/include/default-distrovars.inc
> > > > +require conf/distro/include/security_flags.inc
> > > > include conf/distro/include/world-broken.inc
> > > >
> > > > TCMODE ?= "default"
>
> //Peter
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] defaultsetup.conf: Enable security flags+pie by default
On Fri, Jul 27, 2018 at 1:49 PM, Peter Kjellerstedt
wrote:
>> -Original Message-
>> From: openembedded-core-boun...@lists.openembedded.org > core-boun...@lists.openembedded.org> On Behalf Of Khem Raj
>> Sent: den 24 juli 2018 16:12
>> To: ChenQi
>> Cc: Patches and discussions about the oe-core layer > c...@lists.openembedded.org>
>> Subject: Re: [OE-core] [PATCH] defaultsetup.conf: Enable security
>> flags+pie by default
>>
>> On Tue, Jul 24, 2018 at 12:30 AM ChenQi wrote:
>> >
>> > Hi Khem,
>> >
>> > The comments in security-flags.inc also needs to be modified to
>> remove
>> > 'poky-lsb' info.
>> >
>> > I'd suggest we still put it into distro conf file (poky.conf) instead
>> of
>> > defaultsetup.conf, because defaultsetup.conf is included by
>> > bitbake.conf. I think things in defaultsetup.conf should be necessary
>> > default values to build things out. I don't think security flags is
>> > necessary to build things out.
>>
>> this is the default setup, even non-poky users will get consistent
>> experience.
>
> I have to agree with Chen here. I think requiring security_flags.inc from
> defaultsetup.conf is the wrong thing to do. We use security_flags.inc in
> our setup, and I know how much trouble it has brought. To me, using it
> should be a distro decision, not something that is enforced by the use
> of bitbake.
The current approach taken by security_flags.inc is basically to
enable every possible option related to security. Some of these
options cause trouble and but some are trouble free... and
unfortunately up to now we've lumped them all in together.
If we enable security related flags by default it would be better to
do so step by step - starting with the smallest and least risky change
and (for now) leaving the rest for distros who want/need them.
ie I agree that enabling the current security_flags.inc by default
isn't the right approach.
>> > Also, I got a question when I just looked at this file.
>> > Do you think we should adjust CFLAGS and LDFALGS in security_flags.inc
>> > instead of the current TARGET_CC_ARCH and TARGET_LDFLAGS?
>>
>> in many cases packages do not honor CFLAGS/LDFLAGS say during configure
>>
>> > We are naming
>> > variables to SECURITY_CFLAGS and SECURITY_LDFLAGS, it seems that they
>> > belong to CFLAGS and LDFLAGS naturally. But I'm not sure about it.
>> >
>> yes they do, but this makes it easy to override the setting for
>> packages where these options are needed to be overridden or modified.
>
> Actually, with the changes introduced in Pyro, SECURITY_CFLAGS became a
> mess. Before Pyro, you either set SECURITY_CFLAGS to
> "${SECURITY_NO_PIE_CFLAGS}" (to disable the use of -fpie), or you set it
> to the empty string (to disable all security options). With Pyro and later,
> you instead have to set SECURITY_CFLAGS to "${SECURITY_NO_PIE_CFLAGS}
> ${SECURITY_NOPIE_CFLAGS}" to make sure -fpie is disabled, or set it to
> "${SECURITY_NOPIE_CFLAGS}" to disable everything. Alternatively you can
> set SECURITY_PIE_CFLAGS to "${SECURITY_NOPIE_CFLAGS}" to only disable
> -fpie.
>
> I have considered to suggest changing the definition of
> SECURITY_NOPIE_CFLAGS to:
>
> SECURITY_NOPIE_CFLAGS ?= "${@'-no-pie -fno-PIE' if '${GCCPIE}' else ''}"
>
> and then change SECURITY_NO_PIE_CFLAGS to:
>
> SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${SECURITY_NOPIE_CFLAGS}
> ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
>
> That would better have matched the situation before Pyro, in that one yet
> again would set SECURITY_CFLAGS to "${SECURITY_NO_PIE_CFLAGS}" to disable
> -fpie. Unfortunately one would still have to set SECURITY_CFLAGS to
> "${SECURITY_NOPIE_CFLAGS}" to disable everything.
>
>> > Best Regards,
>> > Chen Qi
>> >
>> >
>> > On 07/24/2018 03:09 AM, Khem Raj wrote:
>> > > This has been an opt-in for so long, some distributions e.g.
>> > > poky-lsb uses it by default however, since most of linux
>> > > distros have started to default to these settings for security
>> > > enhancements, time has come for OE to make it default too
>> > >
>> > > Signed-off-by: Khem Raj
>> > > ---
>> > > meta/conf/distro/defaultsetup.conf | 1 +
>> > > 1 file changed, 1 insertion(+)
>> > >
>> > > diff --git a/meta/conf/distro/defaultsetup.conf
>> b/meta/conf/distro/defaultsetup.conf
>> > > index ca2f9178d2..352e279596 100644
>> > > --- a/meta/conf/distro/defaultsetup.conf
>> > > +++ b/meta/conf/distro/defaultsetup.conf
>> > > @@ -1,6 +1,7 @@
>> > > include conf/distro/include/default-providers.inc
>> > > include conf/distro/include/default-versions.inc
>> > > include conf/distro/include/default-distrovars.inc
>> > > +require conf/distro/include/security_flags.inc
>> > > include conf/distro/include/world-broken.inc
>> > >
>> > > TCMODE ?= "default"
>
> //Peter
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
[OE-core] [PATCH] Revert "gnutls: rationalise libunistring arguments"
This reverts commit 60fef4940de7f0440f1216eb2ea0ea683b3e8fdd.
---
meta/recipes-support/gnutls/gnutls.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index b62a137e59..98ec8d9667 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -41,6 +41,7 @@ EXTRA_OECONF = " \
--enable-local-libopts \
--enable-openssl-compatibility \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
+--without-libunistring-prefix \
"
LDFLAGS_append_libc-musl = " -largp"
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] defaultsetup.conf: Enable security flags+pie by default
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org core-boun...@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 24 juli 2018 16:12
> To: ChenQi
> Cc: Patches and discussions about the oe-core layer c...@lists.openembedded.org>
> Subject: Re: [OE-core] [PATCH] defaultsetup.conf: Enable security
> flags+pie by default
>
> On Tue, Jul 24, 2018 at 12:30 AM ChenQi wrote:
> >
> > Hi Khem,
> >
> > The comments in security-flags.inc also needs to be modified to
> remove
> > 'poky-lsb' info.
> >
> > I'd suggest we still put it into distro conf file (poky.conf) instead
> of
> > defaultsetup.conf, because defaultsetup.conf is included by
> > bitbake.conf. I think things in defaultsetup.conf should be necessary
> > default values to build things out. I don't think security flags is
> > necessary to build things out.
>
> this is the default setup, even non-poky users will get consistent
> experience.
I have to agree with Chen here. I think requiring security_flags.inc from
defaultsetup.conf is the wrong thing to do. We use security_flags.inc in
our setup, and I know how much trouble it has brought. To me, using it
should be a distro decision, not something that is enforced by the use
of bitbake.
> > Also, I got a question when I just looked at this file.
> > Do you think we should adjust CFLAGS and LDFALGS in security_flags.inc
> > instead of the current TARGET_CC_ARCH and TARGET_LDFLAGS?
>
> in many cases packages do not honor CFLAGS/LDFLAGS say during configure
>
> > We are naming
> > variables to SECURITY_CFLAGS and SECURITY_LDFLAGS, it seems that they
> > belong to CFLAGS and LDFLAGS naturally. But I'm not sure about it.
> >
> yes they do, but this makes it easy to override the setting for
> packages where these options are needed to be overridden or modified.
Actually, with the changes introduced in Pyro, SECURITY_CFLAGS became a
mess. Before Pyro, you either set SECURITY_CFLAGS to
"${SECURITY_NO_PIE_CFLAGS}" (to disable the use of -fpie), or you set it
to the empty string (to disable all security options). With Pyro and later,
you instead have to set SECURITY_CFLAGS to "${SECURITY_NO_PIE_CFLAGS}
${SECURITY_NOPIE_CFLAGS}" to make sure -fpie is disabled, or set it to
"${SECURITY_NOPIE_CFLAGS}" to disable everything. Alternatively you can
set SECURITY_PIE_CFLAGS to "${SECURITY_NOPIE_CFLAGS}" to only disable
-fpie.
I have considered to suggest changing the definition of
SECURITY_NOPIE_CFLAGS to:
SECURITY_NOPIE_CFLAGS ?= "${@'-no-pie -fno-PIE' if '${GCCPIE}' else ''}"
and then change SECURITY_NO_PIE_CFLAGS to:
SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${SECURITY_NOPIE_CFLAGS}
${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
That would better have matched the situation before Pyro, in that one yet
again would set SECURITY_CFLAGS to "${SECURITY_NO_PIE_CFLAGS}" to disable
-fpie. Unfortunately one would still have to set SECURITY_CFLAGS to
"${SECURITY_NOPIE_CFLAGS}" to disable everything.
> > Best Regards,
> > Chen Qi
> >
> >
> > On 07/24/2018 03:09 AM, Khem Raj wrote:
> > > This has been an opt-in for so long, some distributions e.g.
> > > poky-lsb uses it by default however, since most of linux
> > > distros have started to default to these settings for security
> > > enhancements, time has come for OE to make it default too
> > >
> > > Signed-off-by: Khem Raj
> > > ---
> > > meta/conf/distro/defaultsetup.conf | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/meta/conf/distro/defaultsetup.conf
> b/meta/conf/distro/defaultsetup.conf
> > > index ca2f9178d2..352e279596 100644
> > > --- a/meta/conf/distro/defaultsetup.conf
> > > +++ b/meta/conf/distro/defaultsetup.conf
> > > @@ -1,6 +1,7 @@
> > > include conf/distro/include/default-providers.inc
> > > include conf/distro/include/default-versions.inc
> > > include conf/distro/include/default-distrovars.inc
> > > +require conf/distro/include/security_flags.inc
> > > include conf/distro/include/world-broken.inc
> > >
> > > TCMODE ?= "default"
//Peter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4] binutils : enable x86_64-pep for producing EFI binaries on x86/x86-64
On x86 and x86_64 architectures, add the x86_64-pep emulation support
to the linker to enable production of Portable Executables for EFI
binaries.
Enables building the EFI variant of the Xen hypervisor.
Signed-off-by: Christopher Clark
---
Changes in v4: unbreak non-x86/x86-64: only supply the configure flag
"--enable-targets=" if also supplying a value to it.
meta/recipes-devtools/binutils/binutils.inc | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/binutils/binutils.inc
b/meta/recipes-devtools/binutils/binutils.inc
index 37813dd..e269bdb 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -74,12 +74,17 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
--enable-deterministic-archives \
--enable-plugins \
${LDGOLD} \
-${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
'--enable-64-bit-bfd', '', d)}"
+${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
'--enable-64-bit-bfd', '', d)} \
+${ENABLE_EXTRA_TARGETS}"
LDGOLD_class-native = ""
LDGOLD_class-crosssdk = ""
LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold',
'--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default
--enable-threads', d)}"
+ARCH_EFI_EMULATION_x86-64 = "x86_64-pep"
+ARCH_EFI_EMULATION_x86 = "x86_64-pep"
+ENABLE_EXTRA_TARGETS ?= "${@ "--enable-targets=" +
d.getVar('ARCH_EFI_EMULATION') if d.getVar('ARCH_EFI_EMULATION') else ""}"
+
# This is necessary due to a bug in the binutils Makefiles
# EXTRA_OEMAKE = "configure-build-libiberty all"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs
On Fri, Jul 27, 2018 at 6:07 AM, Daniel Gomez
wrote:
> Check if libcc1 directory exits before disabling hardcode_into_libs
> configuration because of broken libtool in gcc recipes.
A patch for morty should either be a backport which has already been
merged into all applicable later branches (ie if the same fix is
needed in sumo, rocko or pyro it needs to be merged to those branches
first) or it should explain clearly why it's only applicable to morty.
> Signed-off-by: Daniel Gomez
> ---
> meta/recipes-devtools/gcc/gcc_5.4.bb | 3 ++-
> meta/recipes-devtools/gcc/gcc_6.4.bb | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc_5.4.bb
> b/meta/recipes-devtools/gcc/gcc_5.4.bb
> index b0a523c..9da8ece 100644
> --- a/meta/recipes-devtools/gcc/gcc_5.4.bb
> +++ b/meta/recipes-devtools/gcc/gcc_5.4.bb
> @@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
> do_configure_prepend() {
> # Easiest way to stop bad RPATHs getting into the library since we
> have a
> # broken libtool here
> - sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
> ${S}/libcc1/configure
> + if [ -d "${S}/libcc1" ]; then
> + sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
> ${S}/libcc1/configure
Missing fi ?
> }
>
> BBCLASSEXTEND = "nativesdk"
> diff --git a/meta/recipes-devtools/gcc/gcc_6.4.bb
> b/meta/recipes-devtools/gcc/gcc_6.4.bb
> index b0a523c..9da8ece 100644
> --- a/meta/recipes-devtools/gcc/gcc_6.4.bb
> +++ b/meta/recipes-devtools/gcc/gcc_6.4.bb
> @@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
> do_configure_prepend() {
> # Easiest way to stop bad RPATHs getting into the library since we
> have a
> # broken libtool here
> - sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
> ${S}/libcc1/configure
> + if [ -d "${S}/libcc1" ]; then
> + sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
> ${S}/libcc1/configure
> }
>
> BBCLASSEXTEND = "nativesdk"
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] binutils : enable x86_64-pep for producing EFI binaries on x86/x86-64
On Fri, Jul 27, 2018 at 10:31 AM, Burton, Ross
wrote:
> On 27 July 2018 at 00:51, Christopher Clark
> wrote:
> > @@ -74,12 +74,17 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
> > --enable-deterministic-archives \
> > --enable-plugins \
> > ${LDGOLD} \
> > -${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
> '--enable-64-bit-bfd', '', d)}"
> > +${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
> '--enable-64-bit-bfd', '', d)} \
> > +${ENABLE_EXTRA_TARGETS}"
> >
> > LDGOLD_class-native = ""
> > LDGOLD_class-crosssdk = ""
> > LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold',
> '--enable-gold=default --enable-threads', '--enable-gold
> --enable-ld=default --enable-threads', d)}"
> >
> > +ARCH_EFI_EMULATION_x86-64 = "x86_64-pep"
> > +ARCH_EFI_EMULATION_x86 = "x86_64-pep"
> > +ENABLE_EXTRA_TARGETS ?= "--enable-targets=${ARCH_EFI_EMULATION}"
>
> Can't believe I didn't spot this when reviewing by hand but:
>
> | checking for archiver @FILE support... configure: error:
> --enable-targets option must specify target names or 'all'
>
>
> Under non-x86, this passes --enable-targets=
>
Groan, oops - that makes sense. Will repin with a fix.
thanks
Christopher
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 16/16] pax-utils: remove
If someone wants to use it, it will be in meta-oe.
Ross
On 27 July 2018 at 18:52, Khem Raj wrote:
>
>
> On Fri, Jul 27, 2018 at 8:34 AM Ross Burton wrote:
>>
>> This was packaged originally to perform QA tests on binaries (text
>> relocations
>> and RPATHs), but we perform those tests at build-time now.
>
>
> So how did we replace scanelf functionality
> I still think that it is a core tool from hardening point of view
>>
>>
>>
>> Signed-off-by: Ross Burton
>> ---
>> meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 36
>> --
>> 1 file changed, 36 deletions(-)
>> delete mode 100644 meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>>
>> diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>> b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>> deleted file mode 100644
>> index 9635a5e7082..000
>> --- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>> +++ /dev/null
>> @@ -1,36 +0,0 @@
>> -SUMMARY = "Security-focused ELF files checking tool"
>> -DESCRIPTION = "This is a small set of various PaX aware and related \
>> -utilities for ELF binaries. It can check ELF binary files and running \
>> -processes for issues that might be relevant when using ELF binaries \
>> -along with PaX, such as non-PIC code or executable stack and heap."
>> -HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml;
>> -LICENSE = "GPLv2+"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
>> -
>> -SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz;
>> -SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942"
>> -SRC_URI[sha256sum] =
>> "7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9"
>> -
>> -RDEPENDS_${PN} += "bash"
>> -
>> -export GNULIB_OVERRIDES_WINT_T = "0"
>> -
>> -do_configure_prepend() {
>> -touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
>> -}
>> -
>> -do_install() {
>> -oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
>> -}
>> -
>> -BBCLASSEXTEND = "native"
>> -
>> -inherit autotools pkgconfig
>> -
>> -PACKAGECONFIG ??= ""
>> -
>> -PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
>> -PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp,
>> libseccomp"
>> -PACKAGECONFIG[pyelftools] = "--with-python, --without-python,,
>> pyelftools"
>> -
>> -EXTRA_OECONF += "--enable-largefile"
>> --
>> 2.11.0
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 16/16] pax-utils: remove
On Fri, Jul 27, 2018 at 8:34 AM Ross Burton wrote:
> This was packaged originally to perform QA tests on binaries (text
> relocations
> and RPATHs), but we perform those tests at build-time now.
So how did we replace scanelf functionality
I still think that it is a core tool from hardening point of view
>
>
> Signed-off-by: Ross Burton
> ---
> meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 36
> --
> 1 file changed, 36 deletions(-)
> delete mode 100644 meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>
> diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
> b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
> deleted file mode 100644
> index 9635a5e7082..000
> --- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -SUMMARY = "Security-focused ELF files checking tool"
> -DESCRIPTION = "This is a small set of various PaX aware and related \
> -utilities for ELF binaries. It can check ELF binary files and running \
> -processes for issues that might be relevant when using ELF binaries \
> -along with PaX, such as non-PIC code or executable stack and heap."
> -HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml;
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
> -
> -SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz;
> -SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942"
> -SRC_URI[sha256sum] =
> "7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9"
> -
> -RDEPENDS_${PN} += "bash"
> -
> -export GNULIB_OVERRIDES_WINT_T = "0"
> -
> -do_configure_prepend() {
> -touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
> -}
> -
> -do_install() {
> -oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
> -}
> -
> -BBCLASSEXTEND = "native"
> -
> -inherit autotools pkgconfig
> -
> -PACKAGECONFIG ??= ""
> -
> -PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
> -PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp,
> libseccomp"
> -PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools"
> -
> -EXTRA_OECONF += "--enable-largefile"
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] binutils : enable x86_64-pep for producing EFI binaries on x86/x86-64
On 27 July 2018 at 00:51, Christopher Clark
wrote:
> @@ -74,12 +74,17 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
> --enable-deterministic-archives \
> --enable-plugins \
> ${LDGOLD} \
> -${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
> '--enable-64-bit-bfd', '', d)}"
> +${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
> '--enable-64-bit-bfd', '', d)} \
> +${ENABLE_EXTRA_TARGETS}"
>
> LDGOLD_class-native = ""
> LDGOLD_class-crosssdk = ""
> LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold',
> '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default
> --enable-threads', d)}"
>
> +ARCH_EFI_EMULATION_x86-64 = "x86_64-pep"
> +ARCH_EFI_EMULATION_x86 = "x86_64-pep"
> +ENABLE_EXTRA_TARGETS ?= "--enable-targets=${ARCH_EFI_EMULATION}"
Can't believe I didn't spot this when reviewing by hand but:
| checking for archiver @FILE support... configure: error:
--enable-targets option must specify target names or 'all'
Under non-x86, this passes --enable-targets=
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 3/4] image.bbclass: inherit and use image-postinst-intercepts
From: Christopher Larson
Signed-off-by: Christopher Larson
---
meta/classes/image.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c3e73676dca..c0f6ffe31d4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -14,6 +14,7 @@ IMGCLASSES += "${@bb.utils.contains_any('IMAGE_FSTYPES',
'live iso hddimg', 'ima
IMGCLASSES += "${@bb.utils.contains('IMAGE_FSTYPES', 'container',
'image-container', '', d)}"
IMGCLASSES += "image_types_wic"
IMGCLASSES += "rootfs-postcommands"
+IMGCLASSES += "image-postinst-intercepts"
inherit ${IMGCLASSES}
TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"
@@ -246,6 +247,7 @@ fakeroot python do_rootfs () {
do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
do_rootfs[umask] = "022"
+do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
addtask rootfs after do_prepare_recipe_sysroot
fakeroot python do_image () {
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 4/4] populate_sdk_base.bbclass: inherit and use image-postinst-intercepts
From: Christopher Larson
Signed-off-by: Christopher Larson
---
meta/classes/populate_sdk_base.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index 7ffaf84a45d..c456c52866a 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -1,4 +1,4 @@
-inherit meta
+inherit meta image-postinst-intercepts
# Wildcards specifying complementary packages to install for every package
that has been explicitly
# installed into the rootfs
@@ -307,4 +307,5 @@ do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in
d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends',
False)}"
do_populate_sdk[rdepends] = "${@' '.join([x +
':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in
d.getVar('SDK_RDEPENDS').split()])}"
do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm
do_package_write_ipk do_package_write_deb"
+do_populate_sdk[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
addtask populate_sdk
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 2/4] image-postinst-intercepts.bbclass: add class
From: Christopher Larson
This class sets POSTINST_INTERCEPTS and POSTINST_INTERCEPTS_CHECKSUMS,
to allow us to pull intercepts from BBPATH. This is kept as a separate
class, as it's needed by both image construction and sdk construction,
the latter to support meta-toolchain & similar recipes.
Signed-off-by: Christopher Larson
---
meta/classes/image-postinst-intercepts.bbclass | 23 +++
1 file changed, 23 insertions(+)
create mode 100644 meta/classes/image-postinst-intercepts.bbclass
diff --git a/meta/classes/image-postinst-intercepts.bbclass
b/meta/classes/image-postinst-intercepts.bbclass
new file mode 100644
index 000..ed30bbd98d9
--- /dev/null
+++ b/meta/classes/image-postinst-intercepts.bbclass
@@ -0,0 +1,23 @@
+# Gather existing and candidate postinst intercepts from BBPATH
+POSTINST_INTERCEPTS_DIR ?= "${COREBASE}/scripts/postinst-intercepts"
+POSTINST_INTERCEPTS_PATHS ?= "${@':'.join('%s/postinst-intercepts' % p for p
in '${BBPATH}'.split(':'))}:${POSTINST_INTERCEPTS_DIR}"
+
+python find_intercepts() {
+intercepts = {}
+search_paths = []
+paths = d.getVar('POSTINST_INTERCEPTS_PATHS').split(':')
+overrides = (':' + d.getVar('FILESOVERRIDES')).split(':') + ['']
+search_paths = [os.path.join(p, op) for p in paths for op in overrides]
+searched = oe.path.which_wild('*', ':'.join(search_paths), candidates=True)
+files, chksums = [], []
+for pathname, candidates in searched:
+if os.path.isfile(pathname):
+files.append(pathname)
+chksums.append('%s:True' % pathname)
+chksums.extend('%s:False' % c for c in candidates[:-1])
+
+d.setVar('POSTINST_INTERCEPT_CHECKSUMS', ' '.join(chksums))
+d.setVar('POSTINST_INTERCEPTS', ' '.join(files))
+}
+find_intercepts[eventmask] += "bb.event.RecipePreFinalise"
+addhandler find_intercepts
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 1/4] oe.package_manager: support loading intercepts from multiple paths
From: Christopher Larson
- if POSTINST_INTERCEPTS is set, use the listed intercept files, or
- if POSTINST_INTERCEPTS_PATH is set, load from the listed paths, or
- if POSTINST_INTERCEPTS_DIR is set, load from it (for compatibility), or
- load from ${COREBASE}/meta/postinst-intercepts
Signed-off-by: Christopher Larson
---
meta/lib/oe/package_manager.py | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 64c8a912160..b983943f1f6 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -335,17 +335,24 @@ class PackageManager(object, metaclass=ABCMeta):
def _initialize_intercepts(self):
bb.note("Initializing intercept dir for %s" % self.target_rootfs)
-postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR")
-if not postinst_intercepts_dir:
-postinst_intercepts_dir =
self.d.expand("${COREBASE}/scripts/postinst-intercepts")
# As there might be more than one instance of PackageManager operating
at the same time
# we need to isolate the intercept_scripts directories from each other,
# hence the ugly hash digest in dir name.
-self.intercepts_dir = os.path.join(self.d.getVar('WORKDIR'),
- "intercept_scripts-%s"
%(hashlib.sha256(self.target_rootfs.encode()).hexdigest()) )
+self.intercepts_dir = os.path.join(self.d.getVar('WORKDIR'),
"intercept_scripts-%s" %
+
(hashlib.sha256(self.target_rootfs.encode()).hexdigest()))
+postinst_intercepts = (self.d.getVar("POSTINST_INTERCEPTS") or
"").split()
+if not postinst_intercepts:
+postinst_intercepts_path =
self.d.getVar("POSTINST_INTERCEPTS_PATH")
+if not postinst_intercepts_path:
+postinst_intercepts_path =
self.d.getVar("POSTINST_INTERCEPTS_DIR") or
self.d.expand("${COREBASE}/scripts/postinst-intercepts")
+postinst_intercepts = oe.path.which_wild('*',
postinst_intercepts_path)
+
+bb.debug(1, 'Collected intercepts:\n%s' % ''.join(' %s\n' % i for i
in postinst_intercepts))
bb.utils.remove(self.intercepts_dir, True)
-shutil.copytree(postinst_intercepts_dir, self.intercepts_dir)
+bb.utils.mkdirhier(self.intercepts_dir)
+for intercept in postinst_intercepts:
+bb.utils.copyfile(intercept, os.path.join(self.intercepts_dir,
os.path.basename(intercept)))
@abstractmethod
def _handle_intercept_failure(self, failed_script):
--
2.11.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 0/4] Pull postinst-intercepts from BBPATH
From: Christopher Larson These are the bits to allow us to pull intercepts from BBPATH. This is kept as a separate class, as it's needed by both image construction and sdk construction, the latter to support meta-toolchain & similar recipes. The following changes since commit 364449251ffe4ff2c11acaa258edcec244c38818: classes/package: fix variable name in comment (2018-07-26 16:55:21 +0100) are available in the git repository at: g...@github.com:kergoth/openembedded-core.git bbpath-intercepts for you to fetch changes up to fc32ec263034818cd182e093685d776b8d50a3a2: populate_sdk_base.bbclass: inherit and use image-postinst-intercepts (2018-07-27 22:04:40 +0500) v2 changes: - rebased - renamed bbpath-intercepts.bbclass to image-postinst-intercepts.bbclass, as requested by Richard Christopher Larson (4): oe.package_manager: support loading intercepts from multiple paths image-postinst-intercepts.bbclass: add class image.bbclass: inherit and use image-postinst-intercepts populate_sdk_base.bbclass: inherit and use image-postinst-intercepts meta/classes/image-postinst-intercepts.bbclass | 23 +++ meta/classes/image.bbclass | 2 ++ meta/classes/populate_sdk_base.bbclass | 3 ++- meta/lib/oe/package_manager.py | 19 +-- 4 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 meta/classes/image-postinst-intercepts.bbclass -- 2.11.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] mdadm： systemd service question
Presumably because the recipe doesn't install it. Patches welcome. Ross On 26 July 2018 at 04:35, Zheng, Ruoqin wrote: > Hi All： > > I found there is a systemd service file in the source code of mdadm-4.0. > mdadm-4.0/systemd/mdmonitor.service > > And why this service was not added into the rpm package? > > rpm -qpl deploy-rpms/x86_64/mdadm-4.0-r0.x86_64.rpm > /lib > /lib/udev > /lib/udev/rules.d > /lib/udev/rules.d/63-md-raid-arrays.rules > /lib/udev/rules.d/64-md-raid-assembly.rules > /sbin > /sbin/mdadm > /sbin/mdmon > > -- > Zheng Ruoqin > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > ADDR.: No.6 Wenzhu Road, Software Avenue, >Nanjing, 210012, China > MAIL : zhengrq.f...@cn.fujistu.com > > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 16/16] pax-utils: remove
Yes, I had it in a branch already, just hit the send button.
Ross
On 27 July 2018 at 17:01, Christopher Larson wrote:
> Should this be moved to meta-oe rather than just removed?
>
> On Fri, Jul 27, 2018 at 8:34 AM Ross Burton wrote:
>>
>> This was packaged originally to perform QA tests on binaries (text
>> relocations
>> and RPATHs), but we perform those tests at build-time now.
>>
>> Signed-off-by: Ross Burton
>> ---
>> meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 36
>> --
>> 1 file changed, 36 deletions(-)
>> delete mode 100644 meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>>
>> diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>> b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>> deleted file mode 100644
>> index 9635a5e7082..000
>> --- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>> +++ /dev/null
>> @@ -1,36 +0,0 @@
>> -SUMMARY = "Security-focused ELF files checking tool"
>> -DESCRIPTION = "This is a small set of various PaX aware and related \
>> -utilities for ELF binaries. It can check ELF binary files and running \
>> -processes for issues that might be relevant when using ELF binaries \
>> -along with PaX, such as non-PIC code or executable stack and heap."
>> -HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml;
>> -LICENSE = "GPLv2+"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
>> -
>> -SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz;
>> -SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942"
>> -SRC_URI[sha256sum] =
>> "7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9"
>> -
>> -RDEPENDS_${PN} += "bash"
>> -
>> -export GNULIB_OVERRIDES_WINT_T = "0"
>> -
>> -do_configure_prepend() {
>> -touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
>> -}
>> -
>> -do_install() {
>> -oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
>> -}
>> -
>> -BBCLASSEXTEND = "native"
>> -
>> -inherit autotools pkgconfig
>> -
>> -PACKAGECONFIG ??= ""
>> -
>> -PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
>> -PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp,
>> libseccomp"
>> -PACKAGECONFIG[pyelftools] = "--with-python, --without-python,,
>> pyelftools"
>> -
>> -EXTRA_OECONF += "--enable-largefile"
>> --
>> 2.11.0
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> Christopher Larson
> kergoth at gmail dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Senior Software Engineer, Mentor Graphics
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH v3 0/1] snappy: add a new recipe
On 07/26/2018 02:47 AM, Hongzhi.Song wrote: v3: modify license BSD-3 Hongzhi.Song (1): snappy: add a new recipe meta-oe/recipes-extended/snappy/snappy_1.1.7.bb | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta-oe/recipes-extended/snappy/snappy_1.1.7.bb Wrong list, meta-oe goes to: openembedded-de...@lists.openembedded.org Hongzhi has already sent v4 to the right list. -- # Randy MacLeod # Wind River Linux -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for "oeqa/sdk: add test that CMake ..." and 15 more
== Series Details == Series: "oeqa/sdk: add test that CMake ..." and 15 more Revision: 1 URL : https://patchwork.openembedded.org/series/13257/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue LIC_FILES_CHKSUM changed on target usbutils but there is no "License-Update" tag in commit message [test_lic_files_chksum_modified_not_mentioned] Suggested fixInclude "License-Update: " into the commit message with a brief description Current checksum file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 New checksum file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe3 file://lsusb.py.in;beginline=2;endline=2;md5=194d6a0226bf90f4f683e8968878b6cd If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 16/16] pax-utils: remove
Should this be moved to meta-oe rather than just removed?
On Fri, Jul 27, 2018 at 8:34 AM Ross Burton wrote:
> This was packaged originally to perform QA tests on binaries (text
> relocations
> and RPATHs), but we perform those tests at build-time now.
>
> Signed-off-by: Ross Burton
> ---
> meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 36
> --
> 1 file changed, 36 deletions(-)
> delete mode 100644 meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
>
> diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
> b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
> deleted file mode 100644
> index 9635a5e7082..000
> --- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -SUMMARY = "Security-focused ELF files checking tool"
> -DESCRIPTION = "This is a small set of various PaX aware and related \
> -utilities for ELF binaries. It can check ELF binary files and running \
> -processes for issues that might be relevant when using ELF binaries \
> -along with PaX, such as non-PIC code or executable stack and heap."
> -HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml;
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
> -
> -SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz;
> -SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942"
> -SRC_URI[sha256sum] =
> "7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9"
> -
> -RDEPENDS_${PN} += "bash"
> -
> -export GNULIB_OVERRIDES_WINT_T = "0"
> -
> -do_configure_prepend() {
> -touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
> -}
> -
> -do_install() {
> -oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
> -}
> -
> -BBCLASSEXTEND = "native"
> -
> -inherit autotools pkgconfig
> -
> -PACKAGECONFIG ??= ""
> -
> -PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
> -PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp,
> libseccomp"
> -PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools"
> -
> -EXTRA_OECONF += "--enable-largefile"
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/16] pax-utils: remove
This was packaged originally to perform QA tests on binaries (text relocations
and RPATHs), but we perform those tests at build-time now.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 36 --
1 file changed, 36 deletions(-)
delete mode 100644 meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
deleted file mode 100644
index 9635a5e7082..000
--- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Security-focused ELF files checking tool"
-DESCRIPTION = "This is a small set of various PaX aware and related \
-utilities for ELF binaries. It can check ELF binary files and running \
-processes for issues that might be relevant when using ELF binaries \
-along with PaX, such as non-PIC code or executable stack and heap."
-HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml;
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
-
-SRC_URI = "https://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz;
-SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942"
-SRC_URI[sha256sum] =
"7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9"
-
-RDEPENDS_${PN} += "bash"
-
-export GNULIB_OVERRIDES_WINT_T = "0"
-
-do_configure_prepend() {
-touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
-}
-
-do_install() {
-oe_runmake PREFIX=${D}${prefix} DESTDIR=${D} install
-}
-
-BBCLASSEXTEND = "native"
-
-inherit autotools pkgconfig
-
-PACKAGECONFIG ??= ""
-
-PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
-PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp"
-PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools"
-
-EXTRA_OECONF += "--enable-largefile"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/16] cups: depend on libusb1
There is no need to depend on the compatibility library libusb-compat, as CUPS
links directly to libusb1.
Signed-off-by: Ross Burton
---
meta/recipes-extended/cups/cups.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/cups/cups.inc
b/meta/recipes-extended/cups/cups.inc
index ac4d225c1a7..717eef03a75 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -2,7 +2,7 @@ SUMMARY = "An Internet printing system for Unix"
HOMEPAGE = "https://www.cups.org/;
SECTION = "console/utils"
LICENSE = "GPLv2 & LGPLv2"
-DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb"
+DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb1"
SRC_URI =
"https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \
file://use_echo_only_in_init.patch \
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/16] gccmakedep: remove
Nothing uses this in oe-core or meta-oe, so drop it.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb | 21 -
1 file changed, 21 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
deleted file mode 100644
index be3a667449d..000
--- a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Program to create dependencies in makefiles"
-
-DESCRIPTION = "The gccmakedep program calls 'gcc -M' to output makefile \
-rules describing the dependencies of each sourcefile, so that make knows \
-which object files must be recompiled when a dependency has changed."
-
-require xorg-util-common.inc
-LIC_FILES_CHKSUM =
"file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d"
-DESCRIPTION = "create dependencies in makefiles using 'gcc -M'"
-DEPENDS = "util-macros"
-RDEPENDS_${PN} = "gcc"
-
-PR = "r3"
-PE = "1"
-
-SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788"
-SRC_URI[sha256sum] =
"f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548"
-
-do_install_append() {
- sed -i "s,--sysroot=${STAGING_DIR_TARGET},," ${D}${bindir}/gccmakedep
-}
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/16] oeqa/runtime/scanelf: remove
These tests are intended to search for bad RPATHs and text relocations, but we do these tests at buildtime and as pax-utils is never installed in any default images the tests are never executed. Signed-off-by: Ross Burton --- meta/lib/oeqa/runtime/cases/scanelf.py | 26 -- 1 file changed, 26 deletions(-) delete mode 100644 meta/lib/oeqa/runtime/cases/scanelf.py diff --git a/meta/lib/oeqa/runtime/cases/scanelf.py b/meta/lib/oeqa/runtime/cases/scanelf.py deleted file mode 100644 index 3ba1f78af9b..000 --- a/meta/lib/oeqa/runtime/cases/scanelf.py +++ /dev/null @@ -1,26 +0,0 @@ -from oeqa.runtime.case import OERuntimeTestCase -from oeqa.core.decorator.depends import OETestDepends -from oeqa.core.decorator.oeid import OETestID -from oeqa.runtime.decorator.package import OEHasPackage - -class ScanelfTest(OERuntimeTestCase): -scancmd = 'scanelf --quiet --recursive --mount --ldpath --path' - -@OETestID(966) -@OETestDepends(['ssh.SSHTest.test_ssh']) -@OEHasPackage(['pax-utils']) -def test_scanelf_textrel(self): -# print TEXTREL information -cmd = '%s --textrel' % self.scancmd -status, output = self.target.run(cmd) -msg = '\n'.join([cmd, output]) -self.assertEqual(output.strip(), '', msg=msg) - -@OETestID(967) -@OETestDepends(['scanelf.ScanelfTest.test_scanelf_textrel']) -def test_scanelf_rpath(self): -# print RPATH information -cmd = '%s --textrel --rpath' % self.scancmd -status, output = self.target.run(cmd) -msg = '\n'.join([cmd, output]) -self.assertEqual(output.strip(), '', msg=msg) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/16] icon-naming-utils: remove
The last user of this was the sato theme, removed in 2016.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/maintainers.inc | 1 -
.../icon-naming-utils/icon-naming-utils_0.8.90.bb | 30 --
2 files changed, 31 deletions(-)
delete mode 100644
meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index f80627c6710..82c3bc4123a 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -242,7 +242,6 @@ RECIPE_MAINTAINER_pn-hicolor-icon-theme = "Maxin B. John
"
RECIPE_MAINTAINER_pn-hwlatdetect = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-i2c-tools = "Maxin B. John "
RECIPE_MAINTAINER_pn-icecc-create-env = "Joshua Watt "
-RECIPE_MAINTAINER_pn-icon-naming-utils = "Alexander Kanavin
"
RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-ifupdown = "Maxin B. John "
RECIPE_MAINTAINER_pn-init-ifupdown = "Maxin B. John "
diff --git
a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
deleted file mode 100644
index 6b356b0d44d..000
--- a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Enables backwards compatibility with current desktop icon themes"
-DESCRIPTION = "A Perl script used for maintaining backwards \
-compatibility with current desktop icon themes, while migrating to the \
-names specified in the Icon Naming Specification. The Icon Naming \
-Utilities map the icon names used by the GNOME and KDE desktops to the \
-icon names proposed in the Icon Naming Specification, and generate the \
-icon files appropriate to the desktop environment you use. The Icon \
-Naming Specification provides a standard list of common icon contexts \
-and names that can be used to make icon themes work in a desktop \
-environment or application that implements the naming specification. "
-LICENSE = "GPLv2"
-DEPENDS = "libxml-simple-perl-native"
-PR = "r5"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI =
"http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz;
-SRC_URI[md5sum] = "2c5c7a418e5eb3268f65e21993277fba"
-SRC_URI[sha256sum] =
"044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c"
-
-inherit autotools allarch perlnative
-
-do_configure_append() {
- # Make sure we use our nativeperl wrapper.
- sed -i -e "1s:#!.*:#!/usr/bin/env nativeperl:"
${S}/icon-name-mapping.pl.in
-}
-
-FILES_${PN} += "${datadir}/dtds"
-
-BBCLASSEXTEND = "native"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/16] libusb-compat: remove
Nothing in oe-core or meta-oe links to this now, so the recipe can finally be
removed.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/distro_alias.inc | 1 -
meta/conf/distro/include/maintainers.inc | 1 -
.../0001-usb.h-Include-sys-types.h.patch | 30
meta/recipes-support/libusb/libusb-compat_0.1.5.bb | 42 --
4 files changed, 74 deletions(-)
delete mode 100644
meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
delete mode 100644 meta/recipes-support/libusb/libusb-compat_0.1.5.bb
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index 1498e124413..793a1c2f09a 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -190,7 +190,6 @@ DISTRO_PN_ALIAS_pn-libtelepathy = "Debian=libtelepathy2
Ubuntu=libtelepathy2"
DISTRO_PN_ALIAS_pn-libtimedate-perl = "Debian=libtimedate-perl
Ubuntu=libtimedate-perl"
DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0"
DISTRO_PN_ALIAS_pn-libusb1 = "Debian=libusb-1.0-0 Fedora=libusb1"
-DISTRO_PN_ALIAS_pn-libusb-compat = "OSPDT"
DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6
OpenSuSE=xorg-x11-libX11"
DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT
upstream=http://cgit.freedesktop.org/xorg/lib/libXCalibrate/;
DISTRO_PN_ALIAS_pn-libxfont2 = "Fedora=libXfont2 Clear=libXfont2"
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 6e7efd12752..f80627c6710 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -364,7 +364,6 @@ RECIPE_MAINTAINER_pn-libunistring = "Maxin B. John
"
RECIPE_MAINTAINER_pn-libunwind = "Bruce Ashfield
"
RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling
"
-RECIPE_MAINTAINER_pn-libusb-compat = "Maxin B. John "
RECIPE_MAINTAINER_pn-libusb1 = "Maxin B. John "
RECIPE_MAINTAINER_pn-libva = "Anuj Mittal "
RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal "
diff --git
a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
b/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
deleted file mode 100644
index b88440dec93..000
---
a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Thu, 2 Apr 2015 19:18:45 -0700
-Subject: [PATCH] usb.h: Include sys/types.h
-
-We need the definitions for things like u_intX_t
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- libusb/usb.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libusb/usb.h b/libusb/usb.h
-index 84e730f..caffae2 100644
a/libusb/usb.h
-+++ b/libusb/usb.h
-@@ -31,6 +31,8 @@
-
- #include
-
-+#include
-+
- /*
- * USB spec information
- *
---
-2.1.4
-
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
deleted file mode 100644
index 1ddbe238fc0..000
--- a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "libusb-0.1 compatibility layer for libusb1"
-DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \
-that aims to look, feel and behave exactly like libusb-0.1"
-HOMEPAGE = "http://www.libusb.org/;
-BUGTRACKER = "http://www.libusb.org/report;
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423"
-DEPENDS = "libusb1"
-
-# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0),
-# so here libusb-0.1 is removed completely instead of adding virtual/libusb0.
-# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power
-# consumption.
-PROVIDES = "libusb virtual/libusb0"
-BBCLASSEXTEND = "native nativesdk"
-
-PE = "1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
- file://0001-usb.h-Include-sys-types.h.patch \
- "
-
-SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4"
-SRC_URI[sha256sum] =
"404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a"
-
-UPSTREAM_CHECK_URI =
"http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/;
-UPSTREAM_CHECK_REGEX = "/libusb-compat-(?P(\d+[\.\-_]*)+)/$"
-
-BINCONFIG = "${bindir}/libusb-config"
-
-inherit autotools pkgconfig binconfig-disabled lib_package
-
-EXTRA_OECONF = "--libdir=${base_libdir}"
-
-do_install_append() {
- install -d ${D}${libdir}
- if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
- mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
- fi
-}
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
[OE-core] [PATCH 10/16] usbutils: upgrade to 010
Upgrade to 010.
usbutils uses libusb1 not the older libusb-compat library.
Refresh (and submit upstream) the bashism removal for usb-devices.
Fix LICENSE as lsusb.py is GPLv2 or v3, and set per-package LICENSE fields as
appropriate. The actual license texts are missing from the 010 tarball (fixed
in git) so point at the SPDX statements in the source files instead.
Remove FILES_${PN}-dev as usbutils.pc doesn't exist anymore.
Remove lsusb.py hashbang change as this doesn't cause any problems now
(installed hashbang is /usr/bin/env python3).
Remove spurious zlib build dependency that isn't required.
Remove spurious RDEPENDS_${PN}-ptest, which doesn't exist.
Signed-off-by: Ross Burton
---
.../usb-devices-avoid-dependency-on-bash.patch | 32 +++---
.../usbutils/{usbutils_009.bb => usbutils_010.bb} | 22 +++
2 files changed, 26 insertions(+), 28 deletions(-)
rename meta/recipes-bsp/usbutils/{usbutils_009.bb => usbutils_010.bb} (50%)
diff --git
a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
index a6b241f8549..7edff2614a8 100644
---
a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
+++
b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
@@ -1,30 +1,30 @@
-From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton
-Date: Thu, 26 Jul 2012 10:37:32 +0100
-Subject: [PATCH] usb-devices: avoid dependency on bash
+Upstream-Status: Backport
(https://github.com/gregkh/usbutils/commit/508d1acf42e1bfd470c6bf1a188574c69c20aeed)
+Signed-off-by: Ross Burton
-By virtue of having #!/bin/bash this script declared that it requires
-bash, however manual examination, checkbashisms and tests with dash
-and busybox show that it doesn't contain any bashisms, so change the
-header to avoid the dependency.
+From 1c9162a5b30550aec8fa163906067bc179291b57 Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Fri, 27 Jul 2018 15:28:34 +0100
+Subject: [PATCH] usb-devices: use /bin/sh
-Upstream-Status: Pending
+This script doesn't use any bashisms, so change the hashbang to /bin/sh.
-Signed-off-by: Paul Eggleton
+Fixes #73.
+
+Signed-off-by: Ross Burton
---
- usb-devices |2 +-
+ usb-devices | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usb-devices b/usb-devices
-index b2052e2..14a5358 100755
+index afb4217..89d1b7d 100755
--- a/usb-devices
+++ b/usb-devices
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
-
- # Copyright: 2009 Greg Kroah-Hartman
- #2009 Randy Dunlap
+ # SPDX-License-Identifier: GPL-2.0+
+ #
+ # Copyright (c) 2009 Greg Kroah-Hartman
--
-1.7.9.5
+2.11.0
diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb
b/meta/recipes-bsp/usbutils/usbutils_010.bb
similarity index 50%
rename from meta/recipes-bsp/usbutils/usbutils_009.bb
rename to meta/recipes-bsp/usbutils/usbutils_010.bb
index 3ffc0dd97a7..e6d05b8e87c 100644
--- a/meta/recipes-bsp/usbutils/usbutils_009.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_010.bb
@@ -3,32 +3,30 @@ DESCRIPTION = "Contains the lsusb utility for inspecting the
devices connected t
HOMEPAGE = "http://www.linux-usb.org;
SECTION = "base"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LICENSE = "GPLv2+ & (GPLv2 | GPLv3)"
+# License files went missing in 010, when 011 is released add LICENSES/* back
+LIC_FILES_CHKSUM =
"file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe3 \
+
file://lsusb.py.in;beginline=2;endline=2;md5=194d6a0226bf90f4f683e8968878b6cd"
-DEPENDS = "libusb zlib virtual/libiconv udev"
+DEPENDS = "libusb1 virtual/libiconv udev"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
file://usb-devices-avoid-dependency-on-bash.patch \
"
-
-SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"
-SRC_URI[sha256sum] =
"e73543293a17c7803994eac97a49e58b377e08e6299ba11aad09794b91340e8b"
+SRC_URI[md5sum] = "5eb2d2d68f9ed6dc3e9659a5988f7ed6"
+SRC_URI[sha256sum] =
"881ba47fb2df10c3ba54a4cd6755a90377180890788e476f99d480ea9bc8bb58"
inherit autotools pkgconfig distro_features_check update-alternatives
ALTERNATIVE_${PN} = "lsusb"
ALTERNATIVE_PRIORITY = "100"
-FILES_${PN}-dev += "${datadir}/pkgconfig"
+# The binaries are mostly GPLv2+ apart from lsusb.py which is GPLv2 or v3.
+LICENSE_${PN} = "GPLv2+"
+LICENSE_${PN}-python = "GPLv2 | GPLv3"
RRECOMMENDS_${PN} = "udev-hwdb"
-RDEPENDS_${PN}-ptest = "libboost-system libboost-thread"
PACKAGE_BEFORE_PN =+ "${PN}-python"
FILES_${PN}-python += "${bindir}/lsusb.py"
RDEPENDS_${PN}-python = "python3-core"
-
-do_install_append() {
-sed -i -E '1s,#!.+python,#!${bindir}/python3,' ${D}${bindir}/lsusb.py
-}
--
2.11.0
--
___
Openembedded-core mailing list
[OE-core] [PATCH 08/16] update-rc.d: move to git.yoctoproject.org
The update-rc.d repository is now on git.yoctoproject.org, and has merged all of
the patches we were carrying.
Signed-off-by: Ross Burton
---
.../update-rc.d/update-rc.d/add-verbose.patch | 49 --
.../update-rc.d/check-if-symlinks-are-valid.patch | 59 --
.../fix-to-handle-priority-numbers-correctly.patch | 28 --
.../{update-rc.d_0.7.bb => update-rc.d_0.8.bb} | 11 +---
4 files changed, 2 insertions(+), 145 deletions(-)
delete mode 100644 meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
delete mode 100644
meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
delete mode 100644
meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
rename meta/recipes-core/update-rc.d/{update-rc.d_0.7.bb =>
update-rc.d_0.8.bb} (64%)
diff --git a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
b/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
deleted file mode 100644
index fb443ff15e6..000
--- a/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream-Status: Pending
-
update-rc.d/update-rc.d.org2005-01-03 00:30:47.0 +0200
-+++ update-rc.d/update-rc.d2007-12-01 19:41:08.0 +0200
-@@ -19,6 +19,7 @@
- notreally=0
- force=0
- dostart=0
-+verbose=0
-
- usage()
- {
-@@ -28,6 +29,7 @@
-update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
[runlvl] [...] .
- -n: not really
- -f: force
-+ -v: verbose
- -r: alternate root path (default is /)
- -s: invoke start methods if appropriate to current runlevel
- EOF
-@@ -69,7 +71,7 @@
- lev=`echo $2 | cut -d/ -f1`
- nn=`echo $2 | cut -d/ -f2`
- fn="${etcd}${lev}.d/${startstop}${nn}${bn}"
-- echo " $fn -> ../init.d/$bn"
-+ [ $verbose -eq 1 ] && echo " $fn -> ../init.d/$bn"
- if [ $notreally -eq 0 ]; then
- mkdir -p `dirname $fn`
- ln -s ../init.d/$bn $fn
-@@ -89,7 +91,7 @@
- exit 0
- fi
-
-- echo " Adding system startup for $initd/$bn ..."
-+ echo " Adding system startup for $initd/$bn."
-
- for i in $startlinks; do
- dolink S $i
-@@ -105,6 +107,10 @@
- shift
- continue
- ;;
-+ -v) verbose=1
-+ shift
-+ continue
-+ ;;
- -f) force=1
- shift
- continue
diff --git
a/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
b/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
deleted file mode 100644
index 075171a5a38..000
---
a/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Check if symlinks are valid
-
-When using root option and $initd/$bn is a symlink, the script would fail
because
-the symlink points to a path on target. For example:
-
-/path/to/target/rootfs/etc/init.d/syslog -> /etc/init.d/syslog.busybox
-
-Hence, [ -f /path/to/target/rootfs/etc/init.d/syslog ] condition would return
-false.
-
-This patch adds the posibility to check whether the file the symlink points to
-actually exists in rootfs path and then continue.
-
-Upstream-Status: Pending
-
-Signed-off-by: Laurentiu Palcu
-Signed-off-by: Christopher Larson
-
-Index: git/update-rc.d
-===
git.orig/update-rc.d
-+++ git/update-rc.d
-@@ -147,13 +147,34 @@ fi
- bn=$1
- shift
-
-+sn=$initd/$bn
-+if [ -L "$sn" -a -n "$root" ]; then
-+ if which readlink >/dev/null; then
-+ while true; do
-+ linksn="$(readlink "$sn")"
-+ if [ -z "$linksn" ]; then
-+ break
-+ fi
-+
-+ sn="$linksn"
-+ case "$sn" in
-+ /*) sn="$root$sn" ;;
-+ *) sn="$initd/$sn" ;;
-+ esac
-+ done
-+ else
-+ echo "update-rc.d: readlink tool not present, cannot check
whether \
-+ $sn symlink points to a valid file." >&2
-+ fi
-+fi
-+
- if [ $1 != "remove" ]; then
-- if [ ! -f "$initd/$bn" ]; then
-+ if [ ! -f "$sn" ]; then
- echo "update-rc.d: $initd/$bn: file does not exist" >&2
- exit 1
- fi
- else
-- if [ -f "$initd/$bn" ]; then
-+ if [ -f "$sn" ]; then
- if [ $force -eq 1 ]; then
- echo "update-rc.d: $initd/$bn exists during rc.d purge
(continuing)" >&2
- else
diff --git
a/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
[OE-core] [PATCH 07/16] dbus-glib: merge bb and inc
Signed-off-by: Ross Burton
---
meta/recipes-core/dbus/dbus-glib.inc | 37 ---
meta/recipes-core/dbus/dbus-glib_0.110.bb | 37 ++-
2 files changed, 36 insertions(+), 38 deletions(-)
delete mode 100644 meta/recipes-core/dbus/dbus-glib.inc
diff --git a/meta/recipes-core/dbus/dbus-glib.inc
b/meta/recipes-core/dbus/dbus-glib.inc
deleted file mode 100644
index 16dbf4f08a1..000
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "High level language (GLib) binding for D-Bus"
-DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \
-the D-Bus library with the GLib thread abstraction and main loop."
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus;
-LICENSE = "AFL-2 | GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
-
file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c"
-SECTION = "base"
-
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
-DEPENDS_class-native = "glib-2.0-native dbus-native"
-
-SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
- file://no-examples.patch \
- file://test-install-makefile.patch \
-"
-
-inherit autotools pkgconfig gettext bash-completion gtk-doc
-
-#default disable regression tests, some unit test code in non testing code
-#PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[tests] = "--enable-tests,,,"
-
-EXTRA_OECONF_class-target =
"--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
-
-PACKAGES += "${PN}-tests"
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
-RDEPENDS_${PN}-tests += "dbus-x11"
-FILES_${PN}-tests = "${datadir}/${BPN}/tests"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.110.bb
b/meta/recipes-core/dbus/dbus-glib_0.110.bb
index 81205050105..b7383bd2a6b 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.110.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.110.bb
@@ -1,4 +1,39 @@
-require dbus-glib.inc
+SUMMARY = "High level language (GLib) binding for D-Bus"
+DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \
+the D-Bus library with the GLib thread abstraction and main loop."
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus;
+LICENSE = "AFL-2 | GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
+
file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c"
+SECTION = "base"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+DEPENDS_class-native = "glib-2.0-native dbus-native"
+
+SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://no-examples.patch \
+ file://test-install-makefile.patch \
+"
SRC_URI[md5sum] = "d7cebf1d69445cbd28b4983392145192"
SRC_URI[sha256sum] =
"7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
+
+inherit autotools pkgconfig gettext bash-completion gtk-doc
+
+#default disable regression tests, some unit test code in non testing code
+#PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[tests] = "--enable-tests,,,"
+
+EXTRA_OECONF_class-target =
"--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
+
+PACKAGES += "${PN}-tests"
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
+
+RDEPENDS_${PN}-tests += "dbus-x11"
+FILES_${PN}-tests = "${datadir}/${BPN}/tests"
+
+BBCLASSEXTEND = "native"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/16] unzip: fix symlink problem
Large zip files can cause unzip to crash, take a patch from Fedora to fix it.
Signed-off-by: Ross Burton
---
meta/recipes-extended/unzip/unzip/symlink.patch | 26 +
meta/recipes-extended/unzip/unzip_6.0.bb| 1 +
2 files changed, 27 insertions(+)
create mode 100644 meta/recipes-extended/unzip/unzip/symlink.patch
diff --git a/meta/recipes-extended/unzip/unzip/symlink.patch
b/meta/recipes-extended/unzip/unzip/symlink.patch
new file mode 100644
index 000..a38f6f16123
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/symlink.patch
@@ -0,0 +1,26 @@
+Unzip doesn't handle large zip files well and crashes:
+
+"This only happens if you have more then 16k entries and when one of
+the 16k entry infos is reused it happend to be previously used for
+a symlink entry."
+
+This patch is taken from Fedora
(https://bugzilla.redhat.com/show_bug.cgi?id=972427)
+
+Upstream-Status: Pending (upstream is dead)
+Signed-off-by: Ross Burton
+
+--- unzip60/process.c.sav 2013-06-09 12:08:57.070392264 +0200
unzip60/process.c 2013-06-09 12:10:08.641696988 +0200
+@@ -1751,6 +1751,12 @@
+ = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11);
+ #endif
+
++#ifdef SYMLINKS
++/* Initialize the symlink flag, may be set by the platform-specific
++ mapattr function. */
++G.pInfo->symlink = 0;
++#endif
++
+ return PK_COOL;
+
+ } /* end function process_cdir_file_hdr() */
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb
b/meta/recipes-extended/unzip/unzip_6.0.bb
index 105d048f55b..dbf4112a4c6 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -19,6 +19,7 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/
file://fix-security-format.patch \
file://18-cve-2014-9913-unzip-buffer-overflow.patch \
file://19-cve-2016-9844-zipinfo-buffer-overflow.patch \
+ file://symlink.patch \
"
UPSTREAM_VERSION_UNKNOWN = "1"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/16] ossp-uuid: remove
This project is dead (upstream website doesn't respond anymore) and can mostly
be replaced with the uuid.h in util-linux.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/maintainers.inc | 1 -
.../ossp-uuid/0001-Change-library-name.patch | 119 -
...erve-m-option-status-in-v-option-handling.patch | 62 ---
.../ossp-uuid/0003-Fix-whatis-entries.patch| 58 --
.../ossp-uuid/0004-fix-data-uuid-from-string.patch | 43
.../ossp-uuid/ossp-uuid/install-pc.patch | 19
.../ossp-uuid/ossp-uuid/ldflags.patch | 26 -
.../ossp-uuid/ossp-uuid/libtool-tag.patch | 21
.../ossp-uuid/ossp-uuid/uuid-libtool.patch | 27 -
.../ossp-uuid/ossp-uuid/uuid-nostrip.patch | 19
meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 66
11 files changed, 461 deletions(-)
delete mode 100644
meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
delete mode 100644
meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
delete mode 100644
meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
delete mode 100644
meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch
delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
delete mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 4d58766451e..6e7efd12752 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -509,7 +509,6 @@ RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del
Castillo
-Date: Wed, 27 Jan 2010 16:53:11 +0100
-Subject: [PATCH] Change library name
-
-The soname was changed to ossp-uuid to prevend the name clash with e2fsprogs's
-uuid library.
- Makefile.in |6 +++---
- perl/Makefile.PL | 12 ++--
- php/config.m4|2 +-
- uuid-config.in |2 +-
- uuid.pc.in |4 ++--
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-
-Upstream-Status: Inappropriate [not author]
-
-This patch is from debian ossp-uuid 1.6.2 integration.
-
-Signed-off-by: Mark Hatle
-
-diff --git a/Makefile.in b/Makefile.in
-index d28f4be..c2ba99d 100644
a/Makefile.in
-+++ b/Makefile.in
-@@ -62,13 +62,13 @@ PERL= @PERL@
- PHP = @PHP@
- PG_CONFIG = @PG_CONFIG@
-
--LIB_NAME= libuuid.la
-+LIB_NAME= libossp-uuid.la
- LIB_OBJS= uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo
uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
-
--DCE_NAME= libuuid_dce.la
-+DCE_NAME= libossp-uuid_dce.la
- DCE_OBJS= uuid_dce.lo $(LIB_OBJS)
-
--CXX_NAME= libuuid++.la
-+CXX_NAME= libossp-uuid++.la
- CXX_OBJS= uuid++.lo $(LIB_OBJS)
-
- PRG_NAME= uuid
-diff --git a/perl/Makefile.PL b/perl/Makefile.PL
-index 92f4494..9c6fee6 100644
a/perl/Makefile.PL
-+++ b/perl/Makefile.PL
-@@ -33,9 +33,9 @@ use Config;
- use ExtUtils::MakeMaker;
-
- # determine source directory
--my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
-- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
--or die "no source directory found (where libuuid.la is located)";
-+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
-+ grep { -f $_ } ("../libossp-uuid.la",
glob("../*/libossp-uuid.la"))
-+or die "no source directory found (where libossp-uuid.la is located)";
-
- # determine extra build options
- my $compat = 0;
-@@ -47,15 +47,15 @@ WriteMakefile(
- VERSION_FROM => 'uuid.pm',
- ABSTRACT_FROM => 'uuid.pod',
- PREREQ_PM => {},
--LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
-+LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
- DEFINE=> '',
- INC => "-I. -I$srcdir",
- PM=> { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm',
-'uuid.pod' => '$(INST_LIBDIR)/uuid.pod',
-($compat ? ('uuid_compat.pm' =>
'$(INST_LIBDIR)/../Data/UUID.pm') : ()),
-($compat ? ('uuid_compat.pod' =>
'$(INST_LIBDIR)/../Data/UUID.pod') : ()), },
--MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3',
-- ($compat ? ('uuid_compat.pod' =>
'$(INST_MAN3DIR)/Data::UUID.3') : ()), },
-+MAN3PODS => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm',
-+
[OE-core] [PATCH 05/16] ovmf: remove ossp-util from DEPENDS
This was added back in the meta-luv days[1] presumably under the impression that
it needs ossp-uuid but in reality we rename ossp-uuid's library and uuid.h comes
from util-linux.
[1]
https://github.com/intel/luv-yocto/commit/e08817342b9ea7381944e6c10c555d1c5c62aa6e
Signed-off-by: Ross Burton
---
meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb
b/meta/recipes-core/ovmf/ovmf_git.bb
index e57fa097274..d2ecb619d99 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -43,7 +43,7 @@ PARALLEL_MAKE = ""
S = "${WORKDIR}/git"
-DEPENDS_class-native="util-linux-native iasl-native ossp-uuid-native
qemu-native"
+DEPENDS_class-native="util-linux-native iasl-native qemu-native"
DEPENDS_class-target="ovmf-native"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/16] curl: enable libidn
Now that oe-core has libidn2 we can enable it by default in target curl builds.
Signed-off-by: Ross Burton
---
meta/recipes-support/curl/curl_7.61.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/curl/curl_7.61.0.bb
b/meta/recipes-support/curl/curl_7.61.0.bb
index cc983fd4a6d..76f55094a41 100644
--- a/meta/recipes-support/curl/curl_7.61.0.bb
+++ b/meta/recipes-support/curl/curl_7.61.0.bb
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] =
"5f6f336921cf5b84de56afbd08dfb70adeef2303751ffb3e570c936c6d
CVE_PRODUCT = "libcurl"
inherit autotools pkgconfig binconfig multilib_header
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls
proxy threaded-resolver verbose zlib"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls
libidn proxy threaded-resolver verbose zlib"
PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib"
PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/16] oeqa/sdk: add test that CMake works
Add a new SDK testcase that builds assimp, a project that uses cmake.
Signed-off-by: Ross Burton
---
meta/lib/oeqa/sdk/cases/assimp.py | 65 +++
1 file changed, 65 insertions(+)
create mode 100644 meta/lib/oeqa/sdk/cases/assimp.py
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py
b/meta/lib/oeqa/sdk/cases/assimp.py
new file mode 100644
index 000..8f5b0eb63a2
--- /dev/null
+++ b/meta/lib/oeqa/sdk/cases/assimp.py
@@ -0,0 +1,65 @@
+import os, subprocess, unittest
+import bb
+from oeqa.sdk.case import OESDKTestCase
+from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
+
+from oeqa.utils.subprocesstweak import errors_have_output
+errors_have_output()
+
+class BuildAssimp(OESDKTestCase):
+"""
+Test case to build a project using cmake.
+"""
+
+td_vars = ['DATETIME', 'TARGET_OS', 'TARGET_ARCH']
+
+@classmethod
+def setUpClass(self):
+if not (self.tc.hasHostPackage("nativesdk-cmake") or
+self.tc.hasHostPackage("cmake-native")):
+raise unittest.SkipTest("Needs cmake")
+
+def fetch(self, workdir, dl_dir, url, archive=None):
+if not archive:
+from urllib.parse import urlparse
+archive = os.path.basename(urlparse(url).path)
+
+if dl_dir:
+tarball = os.path.join(dl_dir, archive)
+if os.path.exists(tarball):
+return tarball
+
+tarball = os.path.join(workdir, archive)
+subprocess.check_output(["wget", "-O", tarball, url])
+return tarball
+
+def test_assimp(self):
+import tempfile
+import oe.qa, oe.elf
+
+with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir)
as testdir:
+dl_dir = self.td.get('DL_DIR', None)
+tarball = self.fetch(testdir, dl_dir,
"https://github.com/assimp/assimp/archive/v4.1.0.tar.gz;)
+subprocess.check_output(["tar", "xf", tarball, "-C", testdir])
+
+sourcedir = os.path.join(testdir, "assimp-4.1.0")
+builddir = os.path.join(testdir, "build")
+installdir = os.path.join(testdir, "install")
+bb.utils.mkdirhier(builddir)
+
+self._run("cd %s && cmake %s " % (builddir, sourcedir))
+self._run("cmake --build %s -- -j" % builddir)
+self._run("cmake --build %s --target install -- DESTDIR=%s" %
(builddir, installdir))
+
+elf = oe.qa.ELFFile(os.path.join(installdir, "usr", "local",
"lib", "libassimp.so.4.1.0"))
+elf.open()
+
+(machine, osabi, abiversion, littleendian, bits) = \
+
oe.elf.machine_dict(None)[self.td['TARGET_OS']][self.td['TARGET_ARCH']]
+self.assertEqual(machine, elf.machine())
+self.assertEqual(bits, elf.abiSize())
+self.assertEqual(littleendian, elf.isLittleEndian())
+
+@classmethod
+def tearDownClass(self):
+self.project.clean()
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/16] gnutls: fix libidn dependencies
gnutls only works with libidn2, so update the build dependency. Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index b62a137e595..876a3847b0e 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -25,10 +25,8 @@ PACKAGECONFIG ??= "libidn" # You must also have CONFIG_SECCOMP enabled in the kernel for # seccomp to work. -# PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" - -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/16] libidn2: add new version
libidn 1.x is deprecated, add the parallel-installable libidn2.
Signed-off-by: Ross Burton
---
meta/recipes-extended/libidn/libidn2_2.0.5.bb | 23 +++
1 file changed, 23 insertions(+)
create mode 100644 meta/recipes-extended/libidn/libidn2_2.0.5.bb
diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb
b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
new file mode 100644
index 000..aaf9ecd7e78
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn2_2.0.5.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Internationalized Domain Name support library"
+DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA
specifications defined by the IETF Internationalized Domain Names (IDN) working
group."
+HOMEPAGE = "http://www.gnu.org/software/libidn/;
+SECTION = "libs"
+LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \
+
file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+
file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \
+
file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"
+
+SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
+SRC_URI[sha256sum] =
"53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"
+
+DEPENDS = "virtual/libiconv libunistring"
+
+inherit pkgconfig autotools gettext texinfo gtk-doc lib_package
+
+LICENSE_${PN} = "(GPLv2+ | LGPLv3)"
+LICENSE_${PN}-bin = "GPLv3+"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] valgrind: fix compile ptest failure on mips32
- Pass mips32's CFLAGS to tests - Fix broken inline asm in tests on mips32-linux - Build mips n32 successfully, support it. Signed-off-by: Hongxu Jia --- ...-fix-opcode-not-supported-on-mips32-linux.patch | 82 ++ ...roken-inline-asm-in-tests-on-mips32-linux.patch | 47 + meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 3 +- 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch new file mode 100644 index 000..39b624d --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch @@ -0,0 +1,82 @@ +From fb5362f205b37c5060fcd764a7ed393abe4f2f3d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 27 Jul 2018 17:39:37 +0800 +Subject: [PATCH 1/2] fix opcode not supported on mips32-linux + +While build tests(`make check') on mips32-linux, there are +serial failures such as: +[snip] +| mips-wrsmllib32-linux-gcc -meb -mabi=32 -mhard-float -c +-o atomic_incs-atomic_incs.o `test -f 'atomic_incs.c' || echo +'../../../valgrind-3.13.0/memcheck/tests/'`atomic_incs.c +| /tmp/ccqrmINN.s: Assembler messages: +| /tmp/ccqrmINN.s:247: Error: opcode not supported on this +processor: mips1 (mips1) `ll $t3,0($t1)' +| /tmp/ccqrmINN.s:249: Error: opcode not supported on this +processor: mips1 (mips1) `sc $t3,0($t1)' +[snip] + +Since the following commit applied, it defines CLFAGS for mips32, +but missed to pass them to tests which caused the above failure +... +3e344c57f Merge in a port for mips32-linux +... + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396905] +Signed-off-by: Hongxu Jia +--- + helgrind/tests/Makefile.am| 5 + + memcheck/tests/Makefile.am| 5 + + none/tests/mips32/Makefile.am | 4 + 3 files changed, 14 insertions(+) + +diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +index ad1af191a..6209d35a7 100644 +--- a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +@@ -214,6 +214,11 @@ check_PROGRAMS += annotate_rwlock + endif + + AM_CFLAGS += $(AM_FLAG_M3264_PRI) ++ ++if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX ++AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) ++endif ++ + AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) + + LDADD = -lpthread +diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am +index 84e49405f..aff861a32 100644 +--- a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am +@@ -443,6 +443,11 @@ check_PROGRAMS += reach_thread_register + endif + + AM_CFLAGS += $(AM_FLAG_M3264_PRI) ++ ++if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX ++AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) ++endif ++ + AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) + + if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX +diff --git a/none/tests/mips32/Makefile.am b/none/tests/mips32/Makefile.am +index d11591d45..602cd26f6 100644 +--- a/none/tests/mips32/Makefile.am b/none/tests/mips32/Makefile.am +@@ -99,6 +99,10 @@ check_PROGRAMS = \ + round_fpu64 \ + fpu_branches + ++if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX ++AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) ++endif ++ + AM_CFLAGS+= @FLAG_M32@ + AM_CXXFLAGS += @FLAG_M32@ + AM_CCASFLAGS += @FLAG_M32@ +-- +2.17.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch new file mode 100644 index 000..6df295f --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch @@ -0,0 +1,47 @@ +From 63ce36396348e7c4c021cffa652d2e3d20f7963a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 27 Jul 2018 17:51:54 +0800 +Subject: [PATCH 2/2] fix broken inline asm in tests on mips32-linux + +While build tests(`make check') with gcc 8.1.0 on mips32-linux, +there is a failure +[snip] +|mips-wrsmllib32-linux-gcc -meb -mabi=32 -mhard-float -march=mips32 +-c -o tc08_hbl2-tc08_hbl2.o `test -f 'tc08_hbl2.c' || echo '../../../ +valgrind-3.13.0/helgrind/tests/'`tc08_hbl2.c +|/tmp/cc37aJxQ.s: Assembler messages: +|/tmp/cc37aJxQ.s:275: Error: symbol `L1xyzzy1main' is already defined +|Makefile:1323: recipe for target 'tc08_hbl2-tc08_hbl2.o' failed +[snip] + +Remove the duplicated L1xyzzy1main, and use local symbol to replace. +http://tigcc.ticalc.org/doc/gnuasm.html#SEC46 + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396906] +Signed-off-by: Hongxu Jia +--- + helgrind/tests/tc08_hbl2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git
[OE-core] ✗ patchtest: failure for Check libcc1 directory before disabling hardcoding of RPATHs
== Series Details ==
Series: Check libcc1 directory before disabling hardcoding of RPATHs
Revision: 1
URL : https://patchwork.openembedded.org/series/13254/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Series cannot be parsed correctly due to malformed diff
lines [test_mbox_format]
Suggested fixCreate the series again using git-format-patch and ensure it
can be applied using git am
Diff line do_configure_prepend() {
* Issue Series does not apply on top of target branch
[test_series_merge_on_head]
Suggested fixRebase your series on top of targeted branch
Targeted branch morty (currently at 4b32784b8c)
* Patch[morty] Check libcc1 directory before disabling hardcoding
of RPATHs
Issue Shortlog does not follow expected format
[test_shortlog_format]
Suggested fixCommit shortlog (first line of commit message) should follow
the format ": "
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines:
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] distutils/setuptools-native, distutils3/setuptools3-native: do not try to fetch code during do_compile
Thanks a lot.
On Fri, Jul 27, 2018 at 2:43 PM Derek Straka wrote:
> python-daemon - https://patchwork.openembedded.org/patch/153034/
>
> python-stevedore - https://patchwork.openembedded.org/patch/153032/
>
> I think that's everything though my world python build is still going.
> Thanks for pointing the failures out and let me know if there are others.
> I'm guessing this will ripple through the python heavy layers; I found a
> couple yesterday in meta-iot-cloud.
>
> On Fri, Jul 27, 2018 at 7:41 AM, Derek Straka wrote:
>
>> Yes. I was just waiting for my master build to wrap up.
>>
>> On Fri, Jul 27, 2018, 7:39 AM Martin Jansa
>> wrote:
>>
>>> I like this change, some recipes in meta-oe seems to be broken now, is
>>> someone already working on a fix?
>>>
>>> I'm seeing following 5 failures in my world builds:
>>>
>>> python-stevedore-1.28.0-r0 do_compile and python3-stevedore-1.28.0-r0
>>> do_compile
>>> pkg_resources.DistributionNotFound: The 'pbr>=2.0.0' distribution was
>>> not found and is required by the application
>>>
>>> python-dateutil-2.7.3-r0 do_compile and python3-dateutil-2.7.3-r0
>>> do_compile
>>> pkg_resources.DistributionNotFound: The 'setuptools_scm' distribution
>>> was not found and is required by the application
>>>
>>> python-daemon-2.1.2-r0 do_compile
>>> pkg_resources.DistributionNotFound: The 'docutils' distribution was not
>>> found and is required by the application
>>>
>>> I've found a fix for python-dateutils from Derek:
>>> https://patchwork.openembedded.org/patch/153002/
>>>
>>> On Tue, Jul 17, 2018 at 3:27 PM Hongxu Jia
>>> wrote:
>>>
If a python recipe is using setuptools and the setup_requires argument,
where
setuptools will use easy_install to fetch the module if it isn't
present.
The build failed on a machine where a proxy was required, but succeeded
on a
machine which had direct access to the internet
Add var-NO_FETCH_BUILD, and set it in distutils_do_compile which does
not
allow to fetch code from internet during do_compile.
Example result:
...
ERROR: Do not try to fetch `pytest-runner1' for building. Please add
its native recipe to DEPENDS.
Traceback (most recent call last):
File "setup.py", line 56, in
...
The improvement is flexible for test_requirements argument (used at
`setup.py test'), where use easy_install also.
[YOCTO #12084]
Signed-off-by: Hongxu Jia
---
meta/classes/distutils.bbclass | 1 +
meta/classes/distutils3.bbclass| 1 +
...ionally-do-not-fetch-code-by-easy_install.patch | 34
++
meta/recipes-devtools/python/python-setuptools.inc | 2 ++
4 files changed, 38 insertions(+)
create mode 100644
meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
diff --git a/meta/classes/distutils.bbclass
b/meta/classes/distutils.bbclass
index 1930c35..c2f7403 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -8,6 +8,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
--install-data=${D}/${datadir}"
distutils_do_compile() {
+ NO_FETCH_BUILD=1 \
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
setup.py build ${DISTUTILS_BUILD_ARGS} || \
diff --git a/meta/classes/distutils3.bbclass
b/meta/classes/distutils3.bbclass
index d4b92a3..f8aca5e 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -15,6 +15,7 @@ distutils3_do_configure() {
}
distutils3_do_compile() {
+NO_FETCH_BUILD=1 \
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
setup.py \
diff --git
a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
new file mode 100644
index 000..4b17921
--- /dev/null
+++
b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -0,0 +1,34 @@
+From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001
+From: Hongxu Jia
+Date: Tue, 17 Jul 2018 10:13:38 +0800
+Subject: [PATCH] conditionally do not fetch code by easy_install
+
+If var-NO_FETCH_BUILD is set, do not allow to fetch code from
+internet by easy_install.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia
+---
+ setuptools/command/easy_install.py | 5 +
+ 1
[OE-core] [morty][PATCH] Check libcc1 directory before disabling hardcoding of RPATHs
Check if libcc1 directory exits before disabling hardcode_into_libs
configuration because of broken libtool in gcc recipes.
Signed-off-by: Daniel Gomez
---
meta/recipes-devtools/gcc/gcc_5.4.bb | 3 ++-
meta/recipes-devtools/gcc/gcc_6.4.bb | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc_5.4.bb
b/meta/recipes-devtools/gcc/gcc_5.4.bb
index b0a523c..9da8ece 100644
--- a/meta/recipes-devtools/gcc/gcc_5.4.bb
+++ b/meta/recipes-devtools/gcc/gcc_5.4.bb
@@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
do_configure_prepend() {
# Easiest way to stop bad RPATHs getting into the library since we have
a
# broken libtool here
- sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
${S}/libcc1/configure
+ if [ -d "${S}/libcc1" ]; then
+ sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
${S}/libcc1/configure
}
BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/gcc/gcc_6.4.bb
b/meta/recipes-devtools/gcc/gcc_6.4.bb
index b0a523c..9da8ece 100644
--- a/meta/recipes-devtools/gcc/gcc_6.4.bb
+++ b/meta/recipes-devtools/gcc/gcc_6.4.bb
@@ -9,7 +9,8 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
do_configure_prepend() {
# Easiest way to stop bad RPATHs getting into the library since we have
a
# broken libtool here
- sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
${S}/libcc1/configure
+ if [ -d "${S}/libcc1" ]; then
+ sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/'
${S}/libcc1/configure
}
BBCLASSEXTEND = "nativesdk"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] distutils/setuptools-native, distutils3/setuptools3-native: do not try to fetch code during do_compile
python-daemon - https://patchwork.openembedded.org/patch/153034/
python-stevedore - https://patchwork.openembedded.org/patch/153032/
I think that's everything though my world python build is still going.
Thanks for pointing the failures out and let me know if there are others.
I'm guessing this will ripple through the python heavy layers; I found a
couple yesterday in meta-iot-cloud.
On Fri, Jul 27, 2018 at 7:41 AM, Derek Straka wrote:
> Yes. I was just waiting for my master build to wrap up.
>
> On Fri, Jul 27, 2018, 7:39 AM Martin Jansa wrote:
>
>> I like this change, some recipes in meta-oe seems to be broken now, is
>> someone already working on a fix?
>>
>> I'm seeing following 5 failures in my world builds:
>>
>> python-stevedore-1.28.0-r0 do_compile and python3-stevedore-1.28.0-r0
>> do_compile
>> pkg_resources.DistributionNotFound: The 'pbr>=2.0.0' distribution was
>> not found and is required by the application
>>
>> python-dateutil-2.7.3-r0 do_compile and python3-dateutil-2.7.3-r0
>> do_compile
>> pkg_resources.DistributionNotFound: The 'setuptools_scm' distribution
>> was not found and is required by the application
>>
>> python-daemon-2.1.2-r0 do_compile
>> pkg_resources.DistributionNotFound: The 'docutils' distribution was not
>> found and is required by the application
>>
>> I've found a fix for python-dateutils from Derek:
>> https://patchwork.openembedded.org/patch/153002/
>>
>> On Tue, Jul 17, 2018 at 3:27 PM Hongxu Jia
>> wrote:
>>
>>> If a python recipe is using setuptools and the setup_requires argument,
>>> where
>>> setuptools will use easy_install to fetch the module if it isn't
>>> present.
>>>
>>> The build failed on a machine where a proxy was required, but succeeded
>>> on a
>>> machine which had direct access to the internet
>>>
>>> Add var-NO_FETCH_BUILD, and set it in distutils_do_compile which does not
>>> allow to fetch code from internet during do_compile.
>>>
>>> Example result:
>>> ...
>>> ERROR: Do not try to fetch `pytest-runner1' for building. Please add its
>>> native recipe to DEPENDS.
>>> Traceback (most recent call last):
>>> File "setup.py", line 56, in
>>> ...
>>>
>>> The improvement is flexible for test_requirements argument (used at
>>> `setup.py test'), where use easy_install also.
>>>
>>> [YOCTO #12084]
>>> Signed-off-by: Hongxu Jia
>>> ---
>>> meta/classes/distutils.bbclass | 1 +
>>> meta/classes/distutils3.bbclass| 1 +
>>> ...ionally-do-not-fetch-code-by-easy_install.patch | 34
>>> ++
>>> meta/recipes-devtools/python/python-setuptools.inc | 2 ++
>>> 4 files changed, 38 insertions(+)
>>> create mode 100644 meta/recipes-devtools/python/
>>> files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
>>>
>>> diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.
>>> bbclass
>>> index 1930c35..c2f7403 100644
>>> --- a/meta/classes/distutils.bbclass
>>> +++ b/meta/classes/distutils.bbclass
>>> @@ -8,6 +8,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
>>> --install-data=${D}/${datadir}"
>>>
>>> distutils_do_compile() {
>>> + NO_FETCH_BUILD=1 \
>>> STAGING_INCDIR=${STAGING_INCDIR} \
>>> STAGING_LIBDIR=${STAGING_LIBDIR} \
>>> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
>>> setup.py build ${DISTUTILS_BUILD_ARGS} || \
>>> diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.
>>> bbclass
>>> index d4b92a3..f8aca5e 100644
>>> --- a/meta/classes/distutils3.bbclass
>>> +++ b/meta/classes/distutils3.bbclass
>>> @@ -15,6 +15,7 @@ distutils3_do_configure() {
>>> }
>>>
>>> distutils3_do_compile() {
>>> +NO_FETCH_BUILD=1 \
>>> STAGING_INCDIR=${STAGING_INCDIR} \
>>> STAGING_LIBDIR=${STAGING_LIBDIR} \
>>> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
>>> setup.py \
>>> diff --git a/meta/recipes-devtools/python/files/0001-
>>> conditionally-do-not-fetch-code-by-easy_install.patch
>>> b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-
>>> code-by-easy_install.patch
>>> new file mode 100644
>>> index 000..4b17921
>>> --- /dev/null
>>> +++ b/meta/recipes-devtools/python/files/0001-
>>> conditionally-do-not-fetch-code-by-easy_install.patch
>>> @@ -0,0 +1,34 @@
>>> +From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001
>>> +From: Hongxu Jia
>>> +Date: Tue, 17 Jul 2018 10:13:38 +0800
>>> +Subject: [PATCH] conditionally do not fetch code by easy_install
>>> +
>>> +If var-NO_FETCH_BUILD is set, do not allow to fetch code from
>>> +internet by easy_install.
>>> +
>>> +Upstream-Status: Inappropriate [oe specific]
>>> +
>>> +Signed-off-by: Hongxu Jia
>>> +---
>>> + setuptools/command/easy_install.py | 5 +
>>> + 1 file changed, 5 insertions(+)
>>> +
>>> +diff --git a/setuptools/command/easy_install.py
>>> b/setuptools/command/easy_install.py
>>> +index 85ee40f..7eb9d2a 100755
>>> +---
Re: [OE-core] [PATCH V2] distutils/setuptools-native, distutils3/setuptools3-native: do not try to fetch code during do_compile
Yes. I was just waiting for my master build to wrap up.
On Fri, Jul 27, 2018, 7:39 AM Martin Jansa wrote:
> I like this change, some recipes in meta-oe seems to be broken now, is
> someone already working on a fix?
>
> I'm seeing following 5 failures in my world builds:
>
> python-stevedore-1.28.0-r0 do_compile and python3-stevedore-1.28.0-r0
> do_compile
> pkg_resources.DistributionNotFound: The 'pbr>=2.0.0' distribution was not
> found and is required by the application
>
> python-dateutil-2.7.3-r0 do_compile and python3-dateutil-2.7.3-r0
> do_compile
> pkg_resources.DistributionNotFound: The 'setuptools_scm' distribution was
> not found and is required by the application
>
> python-daemon-2.1.2-r0 do_compile
> pkg_resources.DistributionNotFound: The 'docutils' distribution was not
> found and is required by the application
>
> I've found a fix for python-dateutils from Derek:
> https://patchwork.openembedded.org/patch/153002/
>
> On Tue, Jul 17, 2018 at 3:27 PM Hongxu Jia
> wrote:
>
>> If a python recipe is using setuptools and the setup_requires argument,
>> where
>> setuptools will use easy_install to fetch the module if it isn't
>> present.
>>
>> The build failed on a machine where a proxy was required, but succeeded
>> on a
>> machine which had direct access to the internet
>>
>> Add var-NO_FETCH_BUILD, and set it in distutils_do_compile which does not
>> allow to fetch code from internet during do_compile.
>>
>> Example result:
>> ...
>> ERROR: Do not try to fetch `pytest-runner1' for building. Please add its
>> native recipe to DEPENDS.
>> Traceback (most recent call last):
>> File "setup.py", line 56, in
>> ...
>>
>> The improvement is flexible for test_requirements argument (used at
>> `setup.py test'), where use easy_install also.
>>
>> [YOCTO #12084]
>> Signed-off-by: Hongxu Jia
>> ---
>> meta/classes/distutils.bbclass | 1 +
>> meta/classes/distutils3.bbclass| 1 +
>> ...ionally-do-not-fetch-code-by-easy_install.patch | 34
>> ++
>> meta/recipes-devtools/python/python-setuptools.inc | 2 ++
>> 4 files changed, 38 insertions(+)
>> create mode 100644
>> meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
>>
>> diff --git a/meta/classes/distutils.bbclass
>> b/meta/classes/distutils.bbclass
>> index 1930c35..c2f7403 100644
>> --- a/meta/classes/distutils.bbclass
>> +++ b/meta/classes/distutils.bbclass
>> @@ -8,6 +8,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
>> --install-data=${D}/${datadir}"
>>
>> distutils_do_compile() {
>> + NO_FETCH_BUILD=1 \
>> STAGING_INCDIR=${STAGING_INCDIR} \
>> STAGING_LIBDIR=${STAGING_LIBDIR} \
>> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
>> setup.py build ${DISTUTILS_BUILD_ARGS} || \
>> diff --git a/meta/classes/distutils3.bbclass
>> b/meta/classes/distutils3.bbclass
>> index d4b92a3..f8aca5e 100644
>> --- a/meta/classes/distutils3.bbclass
>> +++ b/meta/classes/distutils3.bbclass
>> @@ -15,6 +15,7 @@ distutils3_do_configure() {
>> }
>>
>> distutils3_do_compile() {
>> +NO_FETCH_BUILD=1 \
>> STAGING_INCDIR=${STAGING_INCDIR} \
>> STAGING_LIBDIR=${STAGING_LIBDIR} \
>> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
>> setup.py \
>> diff --git
>> a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
>> b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
>> new file mode 100644
>> index 000..4b17921
>> --- /dev/null
>> +++
>> b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
>> @@ -0,0 +1,34 @@
>> +From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001
>> +From: Hongxu Jia
>> +Date: Tue, 17 Jul 2018 10:13:38 +0800
>> +Subject: [PATCH] conditionally do not fetch code by easy_install
>> +
>> +If var-NO_FETCH_BUILD is set, do not allow to fetch code from
>> +internet by easy_install.
>> +
>> +Upstream-Status: Inappropriate [oe specific]
>> +
>> +Signed-off-by: Hongxu Jia
>> +---
>> + setuptools/command/easy_install.py | 5 +
>> + 1 file changed, 5 insertions(+)
>> +
>> +diff --git a/setuptools/command/easy_install.py
>> b/setuptools/command/easy_install.py
>> +index 85ee40f..7eb9d2a 100755
>> +--- a/setuptools/command/easy_install.py
>> b/setuptools/command/easy_install.py
>> +@@ -637,6 +637,11 @@ class easy_install(Command):
>> + os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
>> +
>> + def easy_install(self, spec, deps=False):
>> ++if os.environ.get('NO_FETCH_BUILD', None):
>> ++log.error("ERROR: Do not try to fetch `%s' for building. "
>> ++ "Please add its native recipe to DEPENDS." % spec)
>> ++return None
>> ++
>> + if not self.editable:
>> + self.install_site_py()
>> +
>> +--
>>
Re: [OE-core] [PATCH V2] distutils/setuptools-native, distutils3/setuptools3-native: do not try to fetch code during do_compile
I like this change, some recipes in meta-oe seems to be broken now, is
someone already working on a fix?
I'm seeing following 5 failures in my world builds:
python-stevedore-1.28.0-r0 do_compile and python3-stevedore-1.28.0-r0
do_compile
pkg_resources.DistributionNotFound: The 'pbr>=2.0.0' distribution was not
found and is required by the application
python-dateutil-2.7.3-r0 do_compile and python3-dateutil-2.7.3-r0 do_compile
pkg_resources.DistributionNotFound: The 'setuptools_scm' distribution was
not found and is required by the application
python-daemon-2.1.2-r0 do_compile
pkg_resources.DistributionNotFound: The 'docutils' distribution was not
found and is required by the application
I've found a fix for python-dateutils from Derek:
https://patchwork.openembedded.org/patch/153002/
On Tue, Jul 17, 2018 at 3:27 PM Hongxu Jia wrote:
> If a python recipe is using setuptools and the setup_requires argument,
> where
> setuptools will use easy_install to fetch the module if it isn't
> present.
>
> The build failed on a machine where a proxy was required, but succeeded on
> a
> machine which had direct access to the internet
>
> Add var-NO_FETCH_BUILD, and set it in distutils_do_compile which does not
> allow to fetch code from internet during do_compile.
>
> Example result:
> ...
> ERROR: Do not try to fetch `pytest-runner1' for building. Please add its
> native recipe to DEPENDS.
> Traceback (most recent call last):
> File "setup.py", line 56, in
> ...
>
> The improvement is flexible for test_requirements argument (used at
> `setup.py test'), where use easy_install also.
>
> [YOCTO #12084]
> Signed-off-by: Hongxu Jia
> ---
> meta/classes/distutils.bbclass | 1 +
> meta/classes/distutils3.bbclass| 1 +
> ...ionally-do-not-fetch-code-by-easy_install.patch | 34
> ++
> meta/recipes-devtools/python/python-setuptools.inc | 2 ++
> 4 files changed, 38 insertions(+)
> create mode 100644
> meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
>
> diff --git a/meta/classes/distutils.bbclass
> b/meta/classes/distutils.bbclass
> index 1930c35..c2f7403 100644
> --- a/meta/classes/distutils.bbclass
> +++ b/meta/classes/distutils.bbclass
> @@ -8,6 +8,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
> --install-data=${D}/${datadir}"
>
> distutils_do_compile() {
> + NO_FETCH_BUILD=1 \
> STAGING_INCDIR=${STAGING_INCDIR} \
> STAGING_LIBDIR=${STAGING_LIBDIR} \
> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
> setup.py build ${DISTUTILS_BUILD_ARGS} || \
> diff --git a/meta/classes/distutils3.bbclass
> b/meta/classes/distutils3.bbclass
> index d4b92a3..f8aca5e 100644
> --- a/meta/classes/distutils3.bbclass
> +++ b/meta/classes/distutils3.bbclass
> @@ -15,6 +15,7 @@ distutils3_do_configure() {
> }
>
> distutils3_do_compile() {
> +NO_FETCH_BUILD=1 \
> STAGING_INCDIR=${STAGING_INCDIR} \
> STAGING_LIBDIR=${STAGING_LIBDIR} \
> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}
> setup.py \
> diff --git
> a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
> b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
> new file mode 100644
> index 000..4b17921
> --- /dev/null
> +++
> b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch
> @@ -0,0 +1,34 @@
> +From 019422d19c6401fa8f45b1311ecd31bb087c809d Mon Sep 17 00:00:00 2001
> +From: Hongxu Jia
> +Date: Tue, 17 Jul 2018 10:13:38 +0800
> +Subject: [PATCH] conditionally do not fetch code by easy_install
> +
> +If var-NO_FETCH_BUILD is set, do not allow to fetch code from
> +internet by easy_install.
> +
> +Upstream-Status: Inappropriate [oe specific]
> +
> +Signed-off-by: Hongxu Jia
> +---
> + setuptools/command/easy_install.py | 5 +
> + 1 file changed, 5 insertions(+)
> +
> +diff --git a/setuptools/command/easy_install.py
> b/setuptools/command/easy_install.py
> +index 85ee40f..7eb9d2a 100755
> +--- a/setuptools/command/easy_install.py
> b/setuptools/command/easy_install.py
> +@@ -637,6 +637,11 @@ class easy_install(Command):
> + os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir))
> +
> + def easy_install(self, spec, deps=False):
> ++if os.environ.get('NO_FETCH_BUILD', None):
> ++log.error("ERROR: Do not try to fetch `%s' for building. "
> ++ "Please add its native recipe to DEPENDS." % spec)
> ++return None
> ++
> + if not self.editable:
> + self.install_site_py()
> +
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-devtools/python/python-setuptools.inc
> b/meta/recipes-devtools/python/python-setuptools.inc
> index 25be446..24b3ac4 100644
> --- a/meta/recipes-devtools/python/python-setuptools.inc
> +++
Re: [OE-core] [PATCH] util-linux.inc: add fallocate only for class-target
On 27 July 2018 at 00:58, Andre McCurdy wrote: > On Thu, Jul 26, 2018 at 4:34 PM, Burton, Ross wrote: >> On 26 July 2018 at 14:58, Ioan-Adrian Ratiu wrote: >>> Because the util-linux_2.32.bb recipe explicitely disables fallocate >>> for nativesdk triggering build warnings: >> >> Does anyone know why util-linux disables fallocate for nativesdk and >> native builds? > > Seems to date back to this commit: > > > http://git.openembedded.org/openembedded-core/commit/?id=17f3c548caf4adec37c3bbb139aa6b3900419794 > > +# fallocate is glibc 2.10, fallocate64 is glibc 2.11 > +# we need to disable it for older versions > +EXTRA_OECONF += "ac_cv_func_fallocate=no" > +EXTRA_OECONF_virtclass-native += "--disable-fallocate > --disable-use-tty-group" Well done, it was late and I got bored following the git-blame log. :) Sounds like historical reasons to me, does anyone object to dropping this? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] gnutls: rationalise libunistring arguments
On Mon, Jul 23, 2018 at 4:51 AM Ross Burton wrote:
>
> No need to pass --without-libunistring-prefix, and it looks a lot like we're
> trying to disable it.
>
This sneaked in and I did not notice it in the series, but its going
to cause regression
on build machines who installed libunistring on host. Its also because
gnuts is using
non standard AC macro called AC_LIB_HAVE_LINKFLAGS to detect this
library and it seems to be confusing cross builds.
This commit is essentially reverting
http://git.openembedded.org/openembedded-core/commit/?id=ee0b0da237c1661f43e27e26e0ab24b7d8ed174f
which was added to fix the above case. This should be reverted.
> Signed-off-by: Ross Burton
> ---
> meta/recipes-support/gnutls/gnutls.inc | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/meta/recipes-support/gnutls/gnutls.inc
> b/meta/recipes-support/gnutls/gnutls.inc
> index 98ec8d9667b..b62a137e595 100644
> --- a/meta/recipes-support/gnutls/gnutls.inc
> +++ b/meta/recipes-support/gnutls/gnutls.inc
> @@ -41,7 +41,6 @@ EXTRA_OECONF = " \
> --enable-local-libopts \
> --enable-openssl-compatibility \
> --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
> ---without-libunistring-prefix \
> "
>
> LDFLAGS_append_libc-musl = " -largp"
> --
> 2.11.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for curl: support multilib installation
== Series Details == Series: curl: support multilib installation Revision: 1 URL : https://patchwork.openembedded.org/series/13248/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 364449251f) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: support multilib installation
From: Changqing Li
curl-config is generated to displays information about
the curl and libcurl installation. So the content is different
for 32bit and 64bit package. eg: maybe for 32bit, use
i686-linux-gnu-gcc, and for 64bit, use x86-64-linux-gnu-gcc.
Use update-alternatives to add base_libdir as suffix to create
seperate curl-config, so user can check both info of 32/64 bit
curl.
Signed-off-by: Changqing Li
---
meta/recipes-support/curl/curl_7.61.0.bb | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/curl/curl_7.61.0.bb
b/meta/recipes-support/curl/curl_7.61.0.bb
index 03d627e..29e7d00 100644
--- a/meta/recipes-support/curl/curl_7.61.0.bb
+++ b/meta/recipes-support/curl/curl_7.61.0.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "31d0a9f48dc796a7db351898a1e5058a"
SRC_URI[sha256sum] =
"5f6f336921cf5b84de56afbd08dfb70adeef2303751ffb3e570c936c6d656c9c"
CVE_PRODUCT = "libcurl"
-inherit autotools pkgconfig binconfig multilib_header
+inherit autotools pkgconfig binconfig multilib_header update-alternatives
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls
proxy threaded-resolver verbose zlib"
PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib"
@@ -48,6 +48,17 @@ PACKAGECONFIG[threaded-resolver] =
"--enable-threaded-resolver,--disable-threade
PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
+ALTERNATIVE_${PN}-dev = "curl-config"
+ALTERNATIVE_LINK_NAME[curl-config] = "${bindir}/curl-config"
+ALTERNATIVE_TARGET[curl-config] = "${bindir}/curl-config-${MULTILIB_SUFFIX}"
+
+PACKAGE_PREPROCESS_FUNCS += "alternative_rename"
+
+alternative_rename() {
+mv ${PKGD}${bindir}/curl-config
${PKGD}${bindir}/curl-config-${MULTILIB_SUFFIX}
+}
+
EXTRA_OECONF = " \
--disable-ntlm-wb \
--enable-crypto-auth \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for buildtools-tarball: add python3-testtools and python3-subunit
On 07/27/2018 05:05 PM, Patchwork wrote: == Series Details == Series: buildtools-tarball: add python3-testtools and python3-subunit Revision: 1 URL : https://patchwork.openembedded.org/series/13245/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue SUMMARY is missing in newly added recipe [test_summary_presence] Suggested fixSpecify the variable SUMMARY in python3-extras I added SUMMARY for all of them, and pushed to repo. // Robert If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for buildtools-tarball: add python3-testtools and python3-subunit
== Series Details == Series: buildtools-tarball: add python3-testtools and python3-subunit Revision: 1 URL : https://patchwork.openembedded.org/series/13245/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue SUMMARY is missing in newly added recipe [test_summary_presence] Suggested fixSpecify the variable SUMMARY in python3-extras If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] python3-pbr: add it for python3-testtools
On 07/27/2018 04:57 PM, Khem Raj wrote:
please remove it from meta-python once its in core
Yes, I will, and also remove others from meta-openstack.
// Robert
On Fri, Jul 27, 2018 at 1:51 AM Robert Yang wrote:
- The python3-testtools RDEPENDS on it.
- It is from meta-python, I extended it to nativesdk.
Signed-off-by: Robert Yang
---
meta/recipes-devtools/python/python-pbr.inc | 14 ++
meta/recipes-devtools/python/python3-pbr_3.1.1.bb | 2 ++
2 files changed, 16 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-pbr.inc
create mode 100644 meta/recipes-devtools/python/python3-pbr_3.1.1.bb
diff --git a/meta/recipes-devtools/python/python-pbr.inc
b/meta/recipes-devtools/python/python-pbr.inc
new file mode 100644
index 000..74f67fb
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pbr.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Python Build Reasonableness: PBR is a library that injects some
useful and sensible default behaviors into your setuptools run"
+HOMEPAGE = "https://pypi.python.org/pypi/pbr;
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+SRC_URI[md5sum] = "4e82c2e07af544c56a5b71c801525b00"
+SRC_URI[sha256sum] =
"05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"
+
+inherit pypi
+
+RDEPENDS_${PN} += "${PYTHON_PN}-pip"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
b/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
new file mode 100644
index 000..97e7361
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-pbr.inc
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] python3-pbr: add it for python3-testtools
please remove it from meta-python once its in core
On Fri, Jul 27, 2018 at 1:51 AM Robert Yang wrote:
>
> - The python3-testtools RDEPENDS on it.
> - It is from meta-python, I extended it to nativesdk.
>
> Signed-off-by: Robert Yang
> ---
> meta/recipes-devtools/python/python-pbr.inc | 14 ++
> meta/recipes-devtools/python/python3-pbr_3.1.1.bb | 2 ++
> 2 files changed, 16 insertions(+)
> create mode 100644 meta/recipes-devtools/python/python-pbr.inc
> create mode 100644 meta/recipes-devtools/python/python3-pbr_3.1.1.bb
>
> diff --git a/meta/recipes-devtools/python/python-pbr.inc
> b/meta/recipes-devtools/python/python-pbr.inc
> new file mode 100644
> index 000..74f67fb
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python-pbr.inc
> @@ -0,0 +1,14 @@
> +DESCRIPTION = "Python Build Reasonableness: PBR is a library that injects
> some useful and sensible default behaviors into your setuptools run"
> +HOMEPAGE = "https://pypi.python.org/pypi/pbr;
> +SECTION = "devel/python"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
> +
> +SRC_URI[md5sum] = "4e82c2e07af544c56a5b71c801525b00"
> +SRC_URI[sha256sum] =
> "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"
> +
> +inherit pypi
> +
> +RDEPENDS_${PN} += "${PYTHON_PN}-pip"
> +
> +BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
> b/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
> new file mode 100644
> index 000..97e7361
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
> @@ -0,0 +1,2 @@
> +inherit setuptools3
> +require python-pbr.inc
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] binutils : enable x86_64-pep for producing EFI binaries on x86/x86-64
LGTM
On Thu, Jul 26, 2018 at 4:51 PM Christopher Clark
wrote:
>
> On x86 and x86_64 architectures, add the x86_64-pep emulation support
> to the linker to enable production of Portable Executables for EFI
> binaries.
>
> Enables building the x86-64 EFI variant of the Xen hypervisor.
>
> Signed-off-by: Christopher Clark
> ---
> Changes in v3:
>
> * Use overrides rather than a function to add the configure flags.
>
> I've used a construction that should allow other layers to override a
> single variable to provide different extra targets if needed.
>
> * Only make this change for x86 and x86-64.
>
> The linker flag for x86-64 EFI binaries is known: x86_64-pep.
> Make this available on both x86-64 and x86, so multiarch is covered.
>
> The linker flag for constructing 32-bit x86 EFI binaries is not known by me,
> and is not easily discoverable via inspecting the binutils source or
> queries of the internet. 32-bit x86 UEFI appears to be very uncommon.
>
> * No change for the ARM architectures in this patch.
>
> I have no data on what linker flags are required for EFI on ARM,
> and again I'm drawing a blank via source inspection and internet
> query. If additional lines for arm and aarch64 are added later,
> they will fit well with the structure added by this patch.
>
> The ARM64 build of the Xen hypervisor does not need additional toolchain
> support for construction an EFI image as its PE/COFF header is coded in
> assembly.
>
> * Using gmail 'From'/'Author' address as it is preferred for contact.
> S-o-b address as provided is required for attribution. Unchanged from v2.
>
> meta/recipes-devtools/binutils/binutils.inc | 7 ++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/binutils/binutils.inc
> b/meta/recipes-devtools/binutils/binutils.inc
> index 37813dd..9f06d94 100644
> --- a/meta/recipes-devtools/binutils/binutils.inc
> +++ b/meta/recipes-devtools/binutils/binutils.inc
> @@ -74,12 +74,17 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
> --enable-deterministic-archives \
> --enable-plugins \
> ${LDGOLD} \
> -${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
> '--enable-64-bit-bfd', '', d)}"
> +${@bb.utils.contains('DISTRO_FEATURES', 'multiarch',
> '--enable-64-bit-bfd', '', d)} \
> +${ENABLE_EXTRA_TARGETS}"
>
> LDGOLD_class-native = ""
> LDGOLD_class-crosssdk = ""
> LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold',
> '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default
> --enable-threads', d)}"
>
> +ARCH_EFI_EMULATION_x86-64 = "x86_64-pep"
> +ARCH_EFI_EMULATION_x86 = "x86_64-pep"
> +ENABLE_EXTRA_TARGETS ?= "--enable-targets=${ARCH_EFI_EMULATION}"
> +
> # This is necessary due to a bug in the binutils Makefiles
> # EXTRA_OEMAKE = "configure-build-libiberty all"
>
> --
> 2.7.4
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] buildtools-tarball: add python3-testtools and python3-subunit
They are required by oeqa. Signed-off-by: Robert Yang --- meta/recipes-core/meta/buildtools-tarball.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 377733f..7ab7907 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -10,6 +10,8 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-python3-modules \ nativesdk-python3-misc \ nativesdk-python3-git \ +nativesdk-python3-testtools \ +nativesdk-python3-subunit \ nativesdk-ncurses-terminfo-base \ nativesdk-chrpath \ nativesdk-tar \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] buildtools-tarball: add python3-testtools and python3-subunit
The following changes since commit 364449251ffe4ff2c11acaa258edcec244c38818: classes/package: fix variable name in comment (2018-07-26 16:55:21 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/bt http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/bt Robert Yang (5): python3-extras: add it for python3-testtools python3-pbr: add it for python3-testtools python3-testtools: add it for oeqa python3-subunit: add it for oeqa buildtools-tarball: add python3-testtools and python3-subunit meta/recipes-core/meta/buildtools-tarball.bb | 2 ++ meta/recipes-devtools/python/python-extras.inc | 12 ++ meta/recipes-devtools/python/python-pbr.inc| 14 +++ meta/recipes-devtools/python/python-subunit.inc| 14 +++ meta/recipes-devtools/python/python-testtools.inc | 27 ++ .../python/python3-extras_1.0.0.bb | 2 ++ meta/recipes-devtools/python/python3-pbr_3.1.1.bb | 2 ++ .../python/python3-subunit_1.1.0.bb| 2 ++ .../python/python3-testtools_2.2.0.bb | 2 ++ 9 files changed, 77 insertions(+) create mode 100644 meta/recipes-devtools/python/python-extras.inc create mode 100644 meta/recipes-devtools/python/python-pbr.inc create mode 100644 meta/recipes-devtools/python/python-subunit.inc create mode 100644 meta/recipes-devtools/python/python-testtools.inc create mode 100644 meta/recipes-devtools/python/python3-extras_1.0.0.bb create mode 100644 meta/recipes-devtools/python/python3-pbr_3.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-subunit_1.1.0.bb create mode 100644 meta/recipes-devtools/python/python3-testtools_2.2.0.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] python3-pbr: add it for python3-testtools
- The python3-testtools RDEPENDS on it.
- It is from meta-python, I extended it to nativesdk.
Signed-off-by: Robert Yang
---
meta/recipes-devtools/python/python-pbr.inc | 14 ++
meta/recipes-devtools/python/python3-pbr_3.1.1.bb | 2 ++
2 files changed, 16 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-pbr.inc
create mode 100644 meta/recipes-devtools/python/python3-pbr_3.1.1.bb
diff --git a/meta/recipes-devtools/python/python-pbr.inc
b/meta/recipes-devtools/python/python-pbr.inc
new file mode 100644
index 000..74f67fb
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pbr.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Python Build Reasonableness: PBR is a library that injects some
useful and sensible default behaviors into your setuptools run"
+HOMEPAGE = "https://pypi.python.org/pypi/pbr;
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+SRC_URI[md5sum] = "4e82c2e07af544c56a5b71c801525b00"
+SRC_URI[sha256sum] =
"05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"
+
+inherit pypi
+
+RDEPENDS_${PN} += "${PYTHON_PN}-pip"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
b/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
new file mode 100644
index 000..97e7361
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pbr_3.1.1.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-pbr.inc
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] python3-subunit: add it for oeqa
- It is required by oeqa, add it so that we can add nativesdk-python3-subunit to buildtools-tarball. - The original one is python-subunit_1.1.0.bb which is from meta-openstack layer, I divided it into python-subunit.inc and python3-subunit_1.1.0.bb and extended to nativesdk. Signed-off-by: Robert Yang --- meta/recipes-devtools/python/python-subunit.inc | 14 ++ meta/recipes-devtools/python/python3-subunit_1.1.0.bb | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 meta/recipes-devtools/python/python-subunit.inc create mode 100644 meta/recipes-devtools/python/python3-subunit_1.1.0.bb diff --git a/meta/recipes-devtools/python/python-subunit.inc b/meta/recipes-devtools/python/python-subunit.inc new file mode 100644 index 000..e2edc20 --- /dev/null +++ b/meta/recipes-devtools/python/python-subunit.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "Python implementation of subunit test streaming protocol" +HOMEPAGE = "https://pypi.python.org/pypi/python-subunit/; +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README;md5=e5b524e1b2c67c88fc64439ee4a850aa" + +PYPI_PACKAGE = "python-subunit" + +SRC_URI[md5sum] = "d2c09c93346077ced675c9f718e6a0f1" +SRC_URI[sha256sum] = "d9a7606e9610828d68c1d2f0f5abbb421e34e518b8f4882c8b2e08176281bf88" + +inherit pypi + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python3-subunit_1.1.0.bb b/meta/recipes-devtools/python/python3-subunit_1.1.0.bb new file mode 100644 index 000..2ece445 --- /dev/null +++ b/meta/recipes-devtools/python/python3-subunit_1.1.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-subunit.inc -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] python3-testtools: add it for oeqa
- It is required by oeqa, add it so that we can add nativesdk-python3-testtools
to buildtools-tarball.
- The original one is python-testtools_2.3.0.bb which is from meta-openstack
layer, I divided it into python-testtools.inc and python3-testtools_2.2.0.bb,
and extended to nativesdk.
Signed-off-by: Robert Yang
---
meta/recipes-devtools/python/python-testtools.inc | 27 ++
.../python/python3-testtools_2.2.0.bb | 2 ++
2 files changed, 29 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-testtools.inc
create mode 100644 meta/recipes-devtools/python/python3-testtools_2.2.0.bb
diff --git a/meta/recipes-devtools/python/python-testtools.inc
b/meta/recipes-devtools/python/python-testtools.inc
new file mode 100644
index 000..0f449f4
--- /dev/null
+++ b/meta/recipes-devtools/python/python-testtools.inc
@@ -0,0 +1,27 @@
+DESCRIPTION = "Extensions to the Python standard library unit testing
framework"
+HOMEPAGE = "https://pypi.python.org/pypi/testtools/;
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a"
+
+inherit pypi
+
+SRC_URI[md5sum] = "adef817b07ba24fd6d807fd41a4f1ef4"
+SRC_URI[sha256sum] =
"80f606607a6e4ce4d0e24e5b786562aa42c581906f3c070607a4265f3da65810"
+
+DEPENDS += " \
+${PYTHON_PN}-pbr \
+"
+
+# Satisfy setup.py 'setup_requires'
+DEPENDS += " \
+${PYTHON_PN}-pbr-native \
+"
+
+RDEPENDS_${PN} += "\
+${PYTHON_PN}-extras \
+${PYTHON_PN}-pbr \
+${PYTHON_PN}-six \
+"
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/python/python3-testtools_2.2.0.bb
b/meta/recipes-devtools/python/python3-testtools_2.2.0.bb
new file mode 100644
index 000..896ecee
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-testtools_2.2.0.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-testtools.inc
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] python3-extras: add it for python3-testtools
- The python3-testtools RDEPENDS on it. - The original one is python-extras_1.0.0.bb which is from meta-openstack layer, I divided it into python-extras.inc and python3-extras_1.0.0.bb, and extended to nativesdk. Signed-off-by: Robert Yang --- meta/recipes-devtools/python/python-extras.inc | 12 meta/recipes-devtools/python/python3-extras_1.0.0.bb | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 meta/recipes-devtools/python/python-extras.inc create mode 100644 meta/recipes-devtools/python/python3-extras_1.0.0.bb diff --git a/meta/recipes-devtools/python/python-extras.inc b/meta/recipes-devtools/python/python-extras.inc new file mode 100644 index 000..8660997 --- /dev/null +++ b/meta/recipes-devtools/python/python-extras.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Useful extra bits for Python - things that should be in the standard library" +HOMEPAGE = "https://pypi.python.org/pypi/extras/; +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d108f338b2f68fe48ac366c4650bd8b" + +inherit pypi + +SRC_URI[md5sum] = "3a63ad60cf8f0186c9e3a02f55ec5b14" +SRC_URI[sha256sum] = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python3-extras_1.0.0.bb b/meta/recipes-devtools/python/python3-extras_1.0.0.bb new file mode 100644 index 000..76f87f2 --- /dev/null +++ b/meta/recipes-devtools/python/python3-extras_1.0.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-extras.inc -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] testsdk.bbclass: check python module testools and subunit
On 07/27/2018 11:29 AM, Robert Yang wrote:
The testools or subunit is not part of python's standard library, so check them
before use.
Fixed when they are not installed on host:
$ bitbake core-image-minimal -ctestsdk
Exception: ImportError: No module named 'testtools'
Now it can run with a warning:
WARNING: core-image-minimal-1.0-r0 do_testsdk: Failed to import testools or
subunit, the testcases will run serially
Signed-off-by: Robert Yang
---
meta/classes/testsdk.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 5df17bf..4f86998 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -43,6 +43,12 @@ def testsdk_main(d):
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.host.manifest"))
processes = d.getVar("TESTIMAGE_NUMBER_THREADS") or d.getVar("BB_NUMBER_THREADS")
+if processes:
+try:
+import testools, subunit
+except ImportError:
+bb.warn("Failed to import testools or subunit, the testcases will run
serially")
Sorry, typos, they should be "testtools" (lacks of a t), I fixed them in
the repo, also fixed in the commit message.
// Robert
+processes = None
sdk_dir = d.expand("${WORKDIR}/testimage-sdk/")
bb.utils.remove(sdk_dir, True)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-8: Upgrade to 8.2 release
Signed-off-by: Khem Raj
---
...003-build-failures-with-with-cpu-xsc.patch | 61 ---
.../gcc/{gcc-8.1.inc => gcc-8.2.inc} | 11 ++--
...0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 0
.../0003-gcc-poison-system-directories.patch | 0
.../0004-gcc-poison-dir-extend.patch | 0
...-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 0
.../0006-64-bit-multilib-hack.patch | 0
.../0007-optional-libstdc.patch | 0
...gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 0
.../0009-COLLECT_GCC_OPTIONS.patch| 0
...ts.h-in-B-instead-of-S-and-t-oe-in-B.patch | 0
.../0011-fortran-cross-compile-hack.patch | 0
.../0012-cpp-honor-sysroot.patch | 0
.../0013-MIPS64-Default-to-N64-ABI.patch | 0
...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 0
...gcc-Fix-argument-list-too-long-error.patch | 0
.../0016-Disable-sdt.patch| 0
.../{gcc-8.1 => gcc-8.2}/0017-libtool.patch | 0
...s-fix-v4bx-to-linker-to-support-EABI.patch | 0
...-config-files-from-B-instead-of-usin.patch | 0
...ir-from-.la-which-usually-points-to-.patch | 0
.../0021-export-CPP.patch | 0
...ILIB_OSDIRNAMES-and-other-multilib-o.patch | 0
...e-target-gcc-headers-can-be-included.patch | 0
...ild-with-disable-dependency-tracking.patch | 0
...t-directory-during-relink-if-inst_pr.patch | 0
...IR-replacement-instead-of-hardcoding.patch | 0
...27-aarch64-Add-support-for-musl-ldso.patch | 0
...-fix-libcc1-s-install-path-and-rpath.patch | 0
...le-sysroot-support-for-nativesdk-gcc.patch | 0
...sroot-gcc-version-specific-dirs-with.patch | 0
...ous-_FOR_BUILD-and-related-variables.patch | 0
...032-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 0
...d-to-link-commandline-for-musl-targe.patch | 0
...bgcc-Add-knob-to-use-ldbl-128-on-ppc.patch | 0
...using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 0
...as-for-__cpu_indicator_init-instead-.patch | 0
.../0037-sync-gcc-stddef.h-with-musl.patch| 0
...-fault-in-precompiled-header-generat.patch | 0
.../0039-Fix-for-testsuite-failure.patch | 0
...Re-introduce-spe-commandline-options.patch | 0
...adian_8.1.bb => gcc-cross-canadian_8.2.bb} | 0
...nitial_8.1.bb => gcc-cross-initial_8.2.bb} | 0
.../{gcc-cross_8.1.bb => gcc-cross_8.2.bb}| 0
...ial_8.1.bb => gcc-crosssdk-initial_8.2.bb} | 0
...cc-crosssdk_8.1.bb => gcc-crosssdk_8.2.bb} | 0
...{gcc-runtime_8.1.bb => gcc-runtime_8.2.bb} | 0
...anitizers_8.1.bb => gcc-sanitizers_8.2.bb} | 0
.../{gcc-source_8.1.bb => gcc-source_8.2.bb} | 0
.../gcc/{gcc_8.1.bb => gcc_8.2.bb}| 0
...c-initial_8.1.bb => libgcc-initial_8.2.bb} | 0
.../gcc/{libgcc_8.1.bb => libgcc_8.2.bb} | 0
...{libgfortran_8.1.bb => libgfortran_8.2.bb} | 0
53 files changed, 5 insertions(+), 67 deletions(-)
delete mode 100644
meta/recipes-devtools/gcc/gcc-8.1/0041-arm-PR-target-86003-build-failures-with-with-cpu-xsc.patch
rename meta/recipes-devtools/gcc/{gcc-8.1.inc => gcc-8.2.inc} (93%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0003-gcc-poison-system-directories.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0004-gcc-poison-dir-extend.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0005-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0006-64-bit-multilib-hack.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0007-optional-libstdc.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0008-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0009-COLLECT_GCC_OPTIONS.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0010-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0011-fortran-cross-compile-hack.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0012-cpp-honor-sysroot.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0013-MIPS64-Default-to-N64-ABI.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0014-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0015-gcc-Fix-argument-list-too-long-error.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 => gcc-8.2}/0016-Disable-sdt.patch
(100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 => gcc-8.2}/0017-libtool.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0018-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
gcc-8.2}/0019-Use-the-multilib-config-files-from-B-instead-of-usin.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-8.1 =>
[OE-core] [PATCH 2/3] coreutils: upgrade 8.29 -> 8.30
License-Update: Checksum for src/ls.c is changed but the license remains
the same. The change is only about year change.
Remove 0001-Unset-need_charset_alias-when-building-for-musl.patch as the
target this patches modifies no long exists.
Signed-off-by: Chen Qi
---
...need_charset_alias-when-building-for-musl.patch | 33 --
.../{coreutils_8.29.bb => coreutils_8.30.bb} | 7 ++---
2 files changed, 3 insertions(+), 37 deletions(-)
delete mode 100644
meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename meta/recipes-core/coreutils/{coreutils_8.29.bb => coreutils_8.30.bb}
(94%)
diff --git
a/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
b/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ba1a4ba..000
---
a/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
---
-2.1.4
-
diff --git a/meta/recipes-core/coreutils/coreutils_8.29.bb
b/meta/recipes-core/coreutils/coreutils_8.30.bb
similarity index 94%
rename from meta/recipes-core/coreutils/coreutils_8.29.bb
rename to meta/recipes-core/coreutils/coreutils_8.30.bb
index 4704f32..053891f 100644
--- a/meta/recipes-core/coreutils/coreutils_8.29.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.30.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/;
BUGTRACKER = "http://debbugs.gnu.org/coreutils;
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-
file://src/ls.c;beginline=1;endline=15;md5=1c3f9411e1842a062ce5ce9210beee0e"
+
file://src/ls.c;beginline=1;endline=15;md5=dbe356a88b09c29232b083d1ff8ac82a"
DEPENDS = "gmp libcap"
DEPENDS_class-native = ""
@@ -15,14 +15,13 @@ inherit autotools gettext texinfo
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://remove-usr-local-lib-from-m4.patch \
file://fix-selinux-flask.patch \
- file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://0001-uname-report-processor-and-hardware-correctly.patch \
file://disable-ls-output-quoting.patch \
file://0001-local.mk-fix-cross-compiling-problem.patch \
"
-SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303"
-SRC_URI[sha256sum] =
"92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e"
+SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816"
+SRC_URI[sha256sum] =
"e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057"
EXTRA_OECONF_class-native = "--without-gmp"
EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname
--libexecdir=${libdir}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] shadow: upgrade 4.2.1 -> 4.6
The following patches are removed because problems have been fixed in this
version.
0001-shadow-CVE-2017-12424
fix-installation-failure-with-subids-disabled.patch
usermod-fix-compilation-failure-with-subids-disabled.patch
CVE-2017-2616.patch
check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
0001-Do-not-read-login.defs-before-doing-chroot.patch
The following patches are rebased.
0001-Disable-use-of-syslog-for-sysroot.patch
0001-useradd-copy-extended-attributes-of-home.patch
0001-useradd.c-create-parent-directories-when-necessary.patch
allow-for-setting-password-in-clear-text.patch
Signed-off-by: Chen Qi
---
.../0001-Disable-use-of-syslog-for-sysroot.patch | 21 +--
...o-not-read-login.defs-before-doing-chroot.patch | 46 --
.../shadow/files/0001-shadow-CVE-2017-12424| 46 --
...-useradd-copy-extended-attributes-of-home.patch | 28 ++--
...-create-parent-directories-when-necessary.patch | 83 +-
.../shadow/files/CVE-2017-2616.patch | 64
.../allow-for-setting-password-in-clear-text.patch | 181 -
..._of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch | 41 -
...installation-failure-with-subids-disabled.patch | 28
...-compilation-failure-with-subids-disabled.patch | 33
...-securetty_4.2.1.bb => shadow-securetty_4.6.bb} | 0
...adow-sysroot_4.2.1.bb => shadow-sysroot_4.6.bb} | 0
meta/recipes-extended/shadow/shadow.inc| 13 +-
.../shadow/{shadow_4.2.1.bb => shadow_4.6.bb} | 0
14 files changed, 209 insertions(+), 375 deletions(-)
delete mode 100644
meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
delete mode 100644
meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424
delete mode 100644 meta/recipes-extended/shadow/files/CVE-2017-2616.patch
delete mode 100644
meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
delete mode 100644
meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
delete mode 100644
meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
rename meta/recipes-extended/shadow/{shadow-securetty_4.2.1.bb =>
shadow-securetty_4.6.bb} (100%)
rename meta/recipes-extended/shadow/{shadow-sysroot_4.2.1.bb =>
shadow-sysroot_4.6.bb} (100%)
rename meta/recipes-extended/shadow/{shadow_4.2.1.bb => shadow_4.6.bb} (100%)
diff --git
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
index a6f604b..aac2d42 100644
---
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
+++
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
@@ -11,6 +11,7 @@ Upstream-Status: Inappropriate [disable feature]
Signed-off-by: Scott Garman
Signed-off-by: Peter Kjellerstedt
+Signed-off-by: Chen Qi
---
src/groupadd.c | 3 +++
src/groupdel.c | 3 +++
@@ -22,7 +23,7 @@ Signed-off-by: Peter Kjellerstedt
7 files changed, 21 insertions(+)
diff --git a/src/groupadd.c b/src/groupadd.c
-index 39b4ec0..f716f57 100644
+index 63e1c48..a596c49 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -34,6 +34,9 @@
@@ -36,7 +37,7 @@ index 39b4ec0..f716f57 100644
#include
#include
diff --git a/src/groupdel.c b/src/groupdel.c
-index da99347..46a679c 100644
+index 70bed01..ababd81 100644
--- a/src/groupdel.c
+++ b/src/groupdel.c
@@ -34,6 +34,9 @@
@@ -50,7 +51,7 @@ index da99347..46a679c 100644
#include
#include
diff --git a/src/groupmems.c b/src/groupmems.c
-index e4f107f..95cb073 100644
+index fc91c8b..2842514 100644
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -32,6 +32,9 @@
@@ -64,7 +65,7 @@ index e4f107f..95cb073 100644
#include
#include
diff --git a/src/groupmod.c b/src/groupmod.c
-index d9d3807..6229737 100644
+index 72daf2c..8965f9d 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -34,6 +34,9 @@
@@ -78,7 +79,7 @@ index d9d3807..6229737 100644
#include
#include
diff --git a/src/useradd.c b/src/useradd.c
-index e1ebf50..25679d8 100644
+index 3aaf45c..1ab9174 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -34,6 +34,9 @@
@@ -92,7 +93,7 @@ index e1ebf50..25679d8 100644
#include
#include
diff --git a/src/userdel.c b/src/userdel.c
-index 19b12bc..a083929 100644
+index c8de1d3..24d3ea9 100644
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -34,6 +34,9 @@
@@ -102,11 +103,11 @@ index 19b12bc..a083929 100644
+/* Disable use of syslog since we're running this command against a sysroot */
+#undef USE_SYSLOG
+
+ #include
#include
#include
- #include
diff --git a/src/usermod.c b/src/usermod.c
-index 685b50a..28e5cfc 100644
+index ccfbb99..24fb60d 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -34,6 +34,9 @@
@@ -116,9 +117,9 @@ index 685b50a..28e5cfc 100644
+/* Disable use of syslog
[OE-core] [PATCH 1/3] cups: upgrade 2.2.6 -> 2.2.8
Signed-off-by: Chen Qi
---
meta/recipes-extended/cups/{cups_2.2.6.bb => cups_2.2.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/cups/{cups_2.2.6.bb => cups_2.2.8.bb} (40%)
diff --git a/meta/recipes-extended/cups/cups_2.2.6.bb
b/meta/recipes-extended/cups/cups_2.2.8.bb
similarity index 40%
rename from meta/recipes-extended/cups/cups_2.2.6.bb
rename to meta/recipes-extended/cups/cups_2.2.8.bb
index 3aa934b..de1bd84 100644
--- a/meta/recipes-extended/cups/cups_2.2.6.bb
+++ b/meta/recipes-extended/cups/cups_2.2.8.bb
@@ -2,5 +2,5 @@ require cups.inc
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
-SRC_URI[md5sum] = "e91c26d8d97b5a1630a962f530f02192"
-SRC_URI[sha256sum] =
"40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b"
+SRC_URI[md5sum] = "33150d08993a04c8e22176e93805a051"
+SRC_URI[sha256sum] =
"3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Package Upgrade: cups, coreutils, shadow
The following changes since commit 1b56227d77d3113c9c17ec35cb7849a768078c4e:
classes/package: fix variable name in comment (2018-07-26 17:14:42 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/PU
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU
Chen Qi (3):
cups: upgrade 2.2.6 -> 2.2.8
coreutils: upgrade 8.29 -> 8.30
shadow: upgrade 4.2.1 -> 4.6
...need_charset_alias-when-building-for-musl.patch | 33
.../{coreutils_8.29.bb => coreutils_8.30.bb} | 7 +-
.../cups/{cups_2.2.6.bb => cups_2.2.8.bb} | 4 +-
.../0001-Disable-use-of-syslog-for-sysroot.patch | 21 +--
...o-not-read-login.defs-before-doing-chroot.patch | 46 --
.../shadow/files/0001-shadow-CVE-2017-12424| 46 --
...-useradd-copy-extended-attributes-of-home.patch | 28 ++--
...-create-parent-directories-when-necessary.patch | 83 +-
.../shadow/files/CVE-2017-2616.patch | 64
.../allow-for-setting-password-in-clear-text.patch | 181 -
..._of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch | 41 -
...installation-failure-with-subids-disabled.patch | 28
...-compilation-failure-with-subids-disabled.patch | 33
...-securetty_4.2.1.bb => shadow-securetty_4.6.bb} | 0
...adow-sysroot_4.2.1.bb => shadow-sysroot_4.6.bb} | 0
meta/recipes-extended/shadow/shadow.inc| 13 +-
.../shadow/{shadow_4.2.1.bb => shadow_4.6.bb} | 0
17 files changed, 214 insertions(+), 414 deletions(-)
delete mode 100644
meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename meta/recipes-core/coreutils/{coreutils_8.29.bb => coreutils_8.30.bb}
(94%)
rename meta/recipes-extended/cups/{cups_2.2.6.bb => cups_2.2.8.bb} (40%)
delete mode 100644
meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
delete mode 100644
meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424
delete mode 100644 meta/recipes-extended/shadow/files/CVE-2017-2616.patch
delete mode 100644
meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
delete mode 100644
meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
delete mode 100644
meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
rename meta/recipes-extended/shadow/{shadow-securetty_4.2.1.bb =>
shadow-securetty_4.6.bb} (100%)
rename meta/recipes-extended/shadow/{shadow-sysroot_4.2.1.bb =>
shadow-sysroot_4.6.bb} (100%)
rename meta/recipes-extended/shadow/{shadow_4.2.1.bb => shadow_4.6.bb} (100%)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] defaultsetup.conf: Enable security flags+pie by default
This has been an opt-in for so long, some distributions e.g. poky-lsb uses it by default however, since most of linux distros have started to default to these settings for security enhancements, time has come for OE to make it default too remove documentation from advanced local.conf sample Signed-off-by: Khem Raj --- v2: - Remove references to explicitly enabling security flags meta/conf/distro/defaultsetup.conf | 1 + meta/conf/local.conf.sample.extended | 11 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index ca2f9178d2..352e279596 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -1,6 +1,7 @@ include conf/distro/include/default-providers.inc include conf/distro/include/default-versions.inc include conf/distro/include/default-distrovars.inc +require conf/distro/include/security_flags.inc include conf/distro/include/world-broken.inc TCMODE ?= "default" diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index e698acb84b..7f107831ee 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -270,17 +270,6 @@ #COPYLEFT_RECIPE_TYPES = 'target' # -# -# GCC/LD FLAGS to enable more secure code generation -# -# By including the security_flags include file you enable flags -# to the compiler and linker that cause them to generate more secure -# code, this is enabled by default in the poky-lsb distro. -# This does affect compile speed slightly. -# -# Use the following line to enable the security compiler and linker flags to your build -#require conf/distro/include/security_flags.inc - # Image level user/group configuration. # Inherit extrausers to make the setting of EXTRA_USERS_PARAMS effective. #INHERIT += "extrausers" -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [rocko][PATCH] lsof: Update SRC_URI
lsof 4.89 archive has been moved to OLD directory and turned into tar.gz,
so update SRC_URI and checksums.
Signed-off-by: Ovidiu Panait
---
meta/recipes-extended/lsof/lsof_4.89.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb
b/meta/recipes-extended/lsof/lsof_4.89.bb
index 14546db23c..b58b8281f9 100644
--- a/meta/recipes-extended/lsof/lsof_4.89.bb
+++ b/meta/recipes-extended/lsof/lsof_4.89.bb
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM =
"file://00README;beginline=645;endline=679;md5=964df275d26429
# https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be
# the most commonly used alternative.
-SRC_URI =
"http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2
\
+SRC_URI =
"http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.gz
\
file://lsof-remove-host-information.patch \
"
-SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386"
-SRC_URI[sha256sum] =
"81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718"
+SRC_URI[md5sum] = "8afbaff3ee308edc130bdc5df0801c8f"
+SRC_URI[sha256sum] =
"5d08da7ebe049c9d9a6472d6afb81aa5af54c4733a3f8822cbc22b57867633c9"
LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
