[PATCH 1/4] glibc: do the multilib_header magic also for bits/long-double.h

[PATCH 1/4] glibc: do the multilib_header magic also for bits/long-double.h

[Alexander Kanavin]

Otherwise it will cause conflicts in mutlilib setting, as it
varies from one machine to another.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-core/glibc/glibc-package.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index a674c237993..5316bb1fdbf 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -82,7 +82,7 @@ do_install_append () {
 		rmdir --ignore-fail-on-non-empty ${D}${libexecdir}
 	fi
 
-	oe_multilib_header bits/syscall.h
+	oe_multilib_header bits/syscall.h bits/long-double.h
 
 	if [ -f ${D}${bindir}/mtrace ]; then
 		sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
-- 
2.11.0

[PATCH 2/4] bash: package bashbug separately

[Alexander Kanavin]

It's a machine-specific script, which is causing conflicts
when multiple versions of bash are installed in multilib setting,
and it also does not really make sense for embedded systems anyway.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-extended/bash/bash.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index a05b987b87b..3e9c6625693 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -65,3 +65,7 @@ pkg_postinst_${PN} () {
 pkg_postrm_${PN} () {
 	printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
 }
+
+PACKAGES += "${PN}-bashbug"
+FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash"
+FILES_${PN}-bashbug = "${bindir}/bashbug"
-- 
2.11.0

[PATCH 3/4] db: do the multilib_header processing for db.h

[Alexander Kanavin]

As it varies from one machine to another.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-support/db/db_5.3.28.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb
index 4f5aae60132..b7232fc8942 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe7247804317
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955"
 
-inherit autotools
+inherit autotools multilib_header
 
 # Put virtual/db in any appropriate provider of a
 # relational database, use it as a dependency in
@@ -96,6 +96,8 @@ do_install_append() {
 	ln -s db51/db.h ${D}/${includedir}/db.h
 	ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h
 
+        oe_multilib_header db51/db.h
+
 	# The docs end up in /usr/docs - not right.
 	if test -d "${D}/${prefix}/docs"
 	then
-- 
2.11.0

[PATCH 4/4] gpgme: fix python module build and installation

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...-Avoid-host-contamination-from-gpg-config.patch | 28 ++++++++++++++++++++++
 .../0001-Correctly-install-python-modules.patch    | 26 ++++++++++++++++++++
 meta/recipes-support/gpgme/gpgme_1.8.0.bb          |  2 ++
 3 files changed, 56 insertions(+)
 create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch
 create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch

diff --git a/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch
new file mode 100644
index 00000000000..b0a9645997c
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch
@@ -0,0 +1,28 @@
+From 96cfc76def123141d0cecaab857da3880396d5ef Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 9 Mar 2017 22:11:00 +0200
+Subject: [PATCH] Avoid host contamination from gpg-config
+
+gpg-config gives us -L/usr/lib as the first item for linking.
+
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ lang/python/setup.py.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index 213fe33..22629e2 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
+@@ -86,7 +86,7 @@ subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpg_error_h],
+                       stdout=open("errors.i", "w"))
+ 
+ define_macros = []
+-libs = getconfig('libs')
++libs = getconfig('libs')[1:]
+ 
+ # Define extra_macros for both the SWIG and C code
+ for k, v in extra_macros.items():
+-- 
+2.11.0
+
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
new file mode 100644
index 00000000000..42655fbbe68
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
@@ -0,0 +1,26 @@
+From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 9 Mar 2017 21:34:55 +0200
+Subject: [PATCH] Correctly install python modules
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ lang/python/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
+index e32fd12..5ecf6fb 100644
+--- a/lang/python/Makefile.am
++++ b/lang/python/Makefile.am
+@@ -102,6 +102,7 @@ install-exec-local:
+ 	for PYTHON in $(PYTHONS); do \
+ 	  $$PYTHON setup.py install \
+ 	  --prefix $(DESTDIR)$(prefix) \
++          --install-lib=$(DESTDIR)${pythondir} \
+ 	  --record files.txt \
+ 	  --verbose ; \
+ 	  cat files.txt >> install_files.txt ; \
+-- 
+2.11.0
+
diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.8.0.bb
index 86922f6fd98..d3e7880a47b 100644
--- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.8.0.bb
@@ -13,6 +13,8 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
            file://pkgconfig.patch \
            file://python-lang-config.patch \
+           file://0001-Correctly-install-python-modules.patch \
+           file://0001-Avoid-host-contamination-from-gpg-config.patch \
           "
 
 SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b"
-- 
2.11.0

Re: [PATCH 4/4] gpgme: fix python module build and installation

[Burton, Ross]

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

On 9 March 2017 at 20:23, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> +++ b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-
> contamination-from-gpg-config.patch
> @@ -0,0 +1,28 @@
> +From 96cfc76def123141d0cecaab857da3880396d5ef Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Thu, 9 Mar 2017 22:11:00 +0200
> +Subject: [PATCH] Avoid host contamination from gpg-config
> +
> +gpg-config gives us -L/usr/lib as the first item for linking.
> +
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>

No upstream-status.

Also, does the PATH mangling in master-next solve this?

Ross

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

Re: [PATCH 4/4] gpgme: fix python module build and installation

[Alexander Kanavin]

On 03/10/2017 12:51 PM, Burton, Ross wrote:
>
> No upstream-status.

Will fix/resend.

> Also, does the PATH mangling in master-next solve this?

I think not - python module build system calls gpgme-config to find out 
linking flags, and it gives -L${libdir} which is of course -L/usr/lib, 
so host contamination happens.

Alex

Re: [PATCH 4/4] gpgme: fix python module build and installation

[Richard Purdie]

On Thu, 2017-03-09 at 22:23 +0200, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  ...-Avoid-host-contamination-from-gpg-config.patch | 28
> ++++++++++++++++++++++
>  .../0001-Correctly-install-python-modules.patch    | 26
> ++++++++++++++++++++
>  meta/recipes-support/gpgme/gpgme_1.8.0.bb          |  2 ++
>  3 files changed, 56 insertions(+)
>  create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Avoid-host-
> contamination-from-gpg-config.patch
>  create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Correctly-
> install-python-modules.patch
> 
> diff --git a/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-
> contamination-from-gpg-config.patch b/meta/recipes-
> support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-
> config.patch
> new file mode 100644
> index 00000000000..b0a9645997c
> --- /dev/null
> +++ b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-
> from-gpg-config.patch
> @@ -0,0 +1,28 @@
> +From 96cfc76def123141d0cecaab857da3880396d5ef Mon Sep 17 00:00:00
> 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Thu, 9 Mar 2017 22:11:00 +0200
> +Subject: [PATCH] Avoid host contamination from gpg-config
> +
> +gpg-config gives us -L/usr/lib as the first item for linking.
> +
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + lang/python/setup.py.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +

I'm not sure which patch is doing it but you probably need to look at:

https://autobuilder.yocto.io/builders/nightly-world-lsb/builds/187

Cheers,

Richard

Re: [PATCH 4/4] gpgme: fix python module build and installation

[Richard Purdie]

On Sat, 2017-03-11 at 13:47 +0000, Richard Purdie wrote:
> On Thu, 2017-03-09 at 22:23 +0200, Alexander Kanavin wrote:
> > 
> > Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com
> > >
> > ---
> >  ...-Avoid-host-contamination-from-gpg-config.patch | 28
> > ++++++++++++++++++++++
> >  .../0001-Correctly-install-python-modules.patch    | 26
> > ++++++++++++++++++++
> >  meta/recipes-support/gpgme/gpgme_1.8.0.bb          |  2 ++
> >  3 files changed, 56 insertions(+)
> >  create mode 100644 meta/recipes-support/gpgme/gpgme/0001-Avoid-
> > host-
> > contamination-from-gpg-config.patch
> >  create mode 100644 meta/recipes-support/gpgme/gpgme/0001-
> > Correctly-
> > install-python-modules.patch
> > 
> > diff --git a/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-
> > contamination-from-gpg-config.patch b/meta/recipes-
> > support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-
> > config.patch
> > new file mode 100644
> > index 00000000000..b0a9645997c
> > --- /dev/null
> > +++ b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-
> > contamination-
> > from-gpg-config.patch
> > @@ -0,0 +1,28 @@
> > +From 96cfc76def123141d0cecaab857da3880396d5ef Mon Sep 17 00:00:00
> > 2001
> > +From: Alexander Kanavin <alex.kanavin@gmail.com>
> > +Date: Thu, 9 Mar 2017 22:11:00 +0200
> > +Subject: [PATCH] Avoid host contamination from gpg-config
> > +
> > +gpg-config gives us -L/usr/lib as the first item for linking.
> > +
> > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > +---
> > + lang/python/setup.py.in | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> I'm not sure which patch is doing it but you probably need to look
> at:
> 
> https://autobuilder.yocto.io/builders/nightly-world-lsb/builds/187

Which I now realise is from the missing security flag changes so I can
resolve this.

Cheers,

Richard