[OE-core] [PATCH v2] qemu-system-native: disable options not included in extended tarball
From: Jeremy Puhlman
* Add PACKAGECONFIG option for xkbcommon
qemu-keymap.c:16:10: fatal error: xkbcommon/xkbcommon.h: No such file or
directory
* Add PACKAGECONFIG option and patch for libudev
commands-posix.c:53:10: fatal error: libudev.h: No such file or directory
* Add PACKAGECONFIG option for libxml2
util/osdep.c:136: undefined reference to `fcntl64'
- Without specifying libxml2, configure searches the system and pulls in the
system
libxml2 if it is present. In the process it adds -L/usr/lib64 which causes the
system libc to be linked instead of the one from the extended tarball.
None of the above libraries appear to be included in the depends for any of the
qemu
builds, so if they are getting linked in, its probably not intentionally.
Signed-off-by: Jeremy Puhlman
---
meta/recipes-devtools/qemu/qemu.inc| 4 +++
.../qemu/qemu/0001-Add-enable-disable-udev.patch | 29 ++
2 files changed, 33 insertions(+)
create mode 100644
meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 3ce14d9fa0..7cf436783d 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -33,6 +33,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-7039-1.patch \
file://CVE-2020-7039-2.patch \
file://CVE-2020-7039-3.patch \
+ file://0001-Add-enable-disable-udev.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar"
@@ -172,6 +173,9 @@ PACKAGECONFIG[spice] =
"--enable-spice,--disable-spice,spice"
PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir"
PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy"
PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs"
+PACKAGECONFIG[xkbcommon] =
"--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
+PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev"
+#PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2"
INSANE_SKIP_${PN} = "arch"
diff --git a/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
b/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
new file mode 100644
index 00..c2c5849d65
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
@@ -0,0 +1,29 @@
+From a471cf4e4c73350e090eb2cd87ec959d138012e5 Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Thu, 19 Mar 2020 11:54:26 -0700
+Subject: [PATCH] Add enable/disable libudev
+
+Upstream-Status: Pending
+Signed-off-by: Jeremy Puhlman
+---
+ configure | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index cac271c..bd116eb 100755
+--- a/configure
b/configure
+@@ -1539,6 +1539,10 @@ for opt do
+ ;;
+ --disable-plugins) plugins="no"
+ ;;
++ --enable-libudev) libudev="yes"
++ ;;
++ --disable-libudev) libudev="no"
++ ;;
+ *)
+ echo "ERROR: unknown option $opt"
+ echo "Try '$0 --help' for more information"
+--
+1.8.3.1
+
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemu-system-native: disable options not included in extended tarball
From: Jeremy Puhlman
* Add PACKAGECONFIG option for xkbcommon
qemu-keymap.c:16:10: fatal error: xkbcommon/xkbcommon.h: No such file or
directory
* Add PACKAGECONFIG option and patch for libudev
commands-posix.c:53:10: fatal error: libudev.h: No such file or directory
* Add PACKAGECONFIG option for libxml2
util/osdep.c:136: undefined reference to `fcntl64'
- Without specifying libxml2, configure searches the system and pulls in the
system
libxml2 if it is present. In the process it adds -L/usr/lib64 which causes the
system libc to be linked instead of the one from the extended tarball.
* Specifically remove xkbcommon and libudev from qemu-system-native
PACKAGECONFIG
None of the above libraries appear to be included in the depends for any of the
qemu
builds, so if they are getting linked in, its probably not intentionally.
Signed-off-by: Jeremy Puhlman
---
.../qemu/qemu-system-native_4.2.0.bb | 3 +++
meta/recipes-devtools/qemu/qemu.inc| 4 +++
.../qemu/qemu/0001-Add-enable-disable-udev.patch | 29 ++
3 files changed, 36 insertions(+)
create mode 100644
meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
index d83ee59375..f3ceaa1003 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb
@@ -10,6 +10,9 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native
qemu-native bison-native"
EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
PACKAGECONFIG ??= "fdt alsa kvm"
+# Do not exist in buildtools-extended-tarball"
+PACKAGECONFIG_remove = "xkbcommon"
+PACKAGECONFIG_remove = "libudev"
# Handle distros such as CentOS 5 32-bit that do not have kvm support
PACKAGECONFIG_remove = "${@'kvm' if not
os.path.exists('/usr/include/linux/kvm.h') else ''}"
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 3ce14d9fa0..7cf436783d 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -33,6 +33,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-7039-1.patch \
file://CVE-2020-7039-2.patch \
file://CVE-2020-7039-3.patch \
+ file://0001-Add-enable-disable-udev.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar"
@@ -172,6 +173,9 @@ PACKAGECONFIG[spice] =
"--enable-spice,--disable-spice,spice"
PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir"
PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy"
PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs"
+PACKAGECONFIG[xkbcommon] =
"--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
+PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev"
+#PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2"
INSANE_SKIP_${PN} = "arch"
diff --git a/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
b/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
new file mode 100644
index 00..c2c5849d65
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-Add-enable-disable-udev.patch
@@ -0,0 +1,29 @@
+From a471cf4e4c73350e090eb2cd87ec959d138012e5 Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Thu, 19 Mar 2020 11:54:26 -0700
+Subject: [PATCH] Add enable/disable libudev
+
+Upstream-Status: Pending
+Signed-off-by: Jeremy Puhlman
+---
+ configure | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index cac271c..bd116eb 100755
+--- a/configure
b/configure
+@@ -1539,6 +1539,10 @@ for opt do
+ ;;
+ --disable-plugins) plugins="no"
+ ;;
++ --enable-libudev) libudev="yes"
++ ;;
++ --disable-libudev) libudev="no"
++ ;;
+ *)
+ echo "ERROR: unknown option $opt"
+ echo "Try '$0 --help' for more information"
+--
+1.8.3.1
+
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] toolchain-shar-extract: check for available python
From: Jeremy Puhlman
centos7 doesn't have python3 intalled by default, so running
the script errors in novel ways if it is not installed.
Signed-off-by: Jeremy A. Puhlman
---
meta/files/toolchain-shar-extract.sh | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/files/toolchain-shar-extract.sh
b/meta/files/toolchain-shar-extract.sh
index 2e0fe94963..04527f891f 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -1,8 +1,13 @@
#!/bin/sh
export LC_ALL=en_US.UTF-8
+#Make sure at least one python is installed
+INIT_PYTHON=$(which python3 2>/dev/null )
+[ -z "$INIT_PYTHON" ] && INIT_PYTHON=$(which python2 2>/dev/null)
+[ -z "$INIT_PYTHON" ] && echo "Error: The SDK needs a python installed" &&
exit 1
+
# Remove invalid PATH elements first (maybe from a previously setup toolchain
now deleted
-PATH=`python3 -c 'import os; print(":".join(e for e in
os.environ["PATH"].split(":") if os.path.exists(e)))'`
+PATH=`$INIT_PYTHON -c 'import os; print(":".join(e for e in
os.environ["PATH"].split(":") if os.path.exists(e)))'`
tweakpath () {
case ":${PATH}:" in
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: update ptest multilib fix
From: Jeremy Puhlman
The updates to the tests are done in do_install instead of do_install_ptest,
so the changes need to consider ptest not being turned on.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/glib-2.0/glib.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index edecc51fdb..7ebed0e5fd 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,9 +128,11 @@ do_install_append_class-target () {
rm
${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+ if [ -f ${D}${datadir}/installed-tests/glib/static-link.test ]; then
if test "x${MLPREFIX}" != "x"; then
mv ${D}${datadir}/installed-tests/glib/static-link.test
${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
fi
+ fi
}
# As we do not build python3 for windows, makes no sense to ship the script
that's using it
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] 回复: 回复: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict
Patch sent to the list.
On 3/16/2020 10:21 PM, Chen, Qi wrote:
Yes. ptest turned off.
Regards,
Chen Qi
*发件人:* Jeremy A. Puhlman
*发送时间:* 2020年3月17日 12:58
*收件人:* Chen, Qi ;
openembedded-core@lists.openembedded.org
*主题:* Re: 回复: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib
conflict
Do you have ptests turned off?
Looks like all the test checking is done in do_install rather then
do_install_ptest. I think I need to add a check for the existance like
the change above the added one.
On 3/16/2020 9:31 PM, Chen, Qi wrote:
MULTILIBS ?= "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf"
I think you can use these two lines to reproduce the problem with
multilib enabled.
Regards,
Chen Qi
--------
*发件人:* Jeremy A. Puhlman
<mailto:jpuhl...@mvista.com>
*发送时间:* 2020年3月17日 12:02
*收件人:* Chen, Qi
<mailto:qi.c...@windriver.com>;
openembedded-core@lists.openembedded.org
<mailto:openembedded-core@lists.openembedded.org>
<mailto:openembedded-core@lists.openembedded.org>
*主题:* Re: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib
conflict
Just standard x86/i585. What are you using for your mulitlib.
ilp32/aarch32/arm7?
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
X86ARCH32 = "i586"
DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
TARGET_ARCH_virtclass-multilib-lib32 = "i586"
TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"
What does your -e look like for the recipe that fails?
On 3/16/2020 8:30 PM, Chen, Qi wrote:
This patch is causing regression in case of qemuarm64 multilib for
me. The static-link.test file is not there, resulting the `mv'
command failure. I've sent out a patch to fix this problem, but I
don't know what's your environment. So please help review.
Regards,
Chen Qi
*发件人:* openembedded-core-boun...@lists.openembedded.org
<mailto:openembedded-core-boun...@lists.openembedded.org>
<mailto:openembedded-core-boun...@lists.openembedded.org> 代表 Jeremy
A. Puhlman <mailto:jpuhl...@mvista.com>
*发送时间:* 2020年3月12日 6:22
*收件人:* openembedded-core@lists.openembedded.org
<mailto:openembedded-core@lists.openembedded.org>
<mailto:openembedded-core@lists.openembedded.org>
*主题:* [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
From: Jeremy Puhlman <mailto:jpuhl...@mvista.com>
Signed-off-by: Jeremy A. Puhlman
<mailto:jpuhl...@mvista.com>
---
meta/recipes-core/glib-2.0/glib.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
rm
${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+ if test "x${MLPREFIX}" != "x"; then
+ mv
${D}${datadir}/installed-tests/glib/static-link.test
${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+ fi
}
# As we do not build python3 for windows, makes no sense to ship
the script that's using it
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
Virus-free. www.avg.com
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
--
Jeremy A. Puhlman
jpuhl...@mvista.com <mailto:jpuhl...@mvista.com>
--
Jeremy A. Puhlman
jpuhl...@mvista.com <mailto:jpuhl...@mvista.com>
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] 回复: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict
Do you have ptests turned off?
Looks like all the test checking is done in do_install rather then
do_install_ptest. I think I need to add a check for the existance like
the change above the added one.
On 3/16/2020 9:31 PM, Chen, Qi wrote:
MULTILIBS ?= "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf"
I think you can use these two lines to reproduce the problem with
multilib enabled.
Regards,
Chen Qi
--------
*发件人:* Jeremy A. Puhlman
*发送时间:* 2020年3月17日 12:02
*收件人:* Chen, Qi ;
openembedded-core@lists.openembedded.org
*主题:* Re: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib
conflict
Just standard x86/i585. What are you using for your mulitlib.
ilp32/aarch32/arm7?
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
X86ARCH32 = "i586"
DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
TARGET_ARCH_virtclass-multilib-lib32 = "i586"
TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"
What does your -e look like for the recipe that fails?
On 3/16/2020 8:30 PM, Chen, Qi wrote:
This patch is causing regression in case of qemuarm64 multilib for
me. The static-link.test file is not there, resulting the `mv'
command failure. I've sent out a patch to fix this problem, but I
don't know what's your environment. So please help review.
Regards,
Chen Qi
*发件人:* openembedded-core-boun...@lists.openembedded.org
<mailto:openembedded-core-boun...@lists.openembedded.org>
<mailto:openembedded-core-boun...@lists.openembedded.org> 代表 Jeremy
A. Puhlman <mailto:jpuhl...@mvista.com>
*发送时间:* 2020年3月12日 6:22
*收件人:* openembedded-core@lists.openembedded.org
<mailto:openembedded-core@lists.openembedded.org>
<mailto:openembedded-core@lists.openembedded.org>
*主题:* [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
From: Jeremy Puhlman <mailto:jpuhl...@mvista.com>
Signed-off-by: Jeremy A. Puhlman
<mailto:jpuhl...@mvista.com>
---
meta/recipes-core/glib-2.0/glib.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
rm
${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+ if test "x${MLPREFIX}" != "x"; then
+ mv
${D}${datadir}/installed-tests/glib/static-link.test
${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+ fi
}
# As we do not build python3 for windows, makes no sense to ship the
script that's using it
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
Virus-free. www.avg.com
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
--
Jeremy A. Puhlman
jpuhl...@mvista.com <mailto:jpuhl...@mvista.com>
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict
Just standard x86/i585. What are you using for your mulitlib.
ilp32/aarch32/arm7?
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
X86ARCH32 = "i586"
DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
TARGET_ARCH_virtclass-multilib-lib32 = "i586"
TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"
What does your -e look like for the recipe that fails?
On 3/16/2020 8:30 PM, Chen, Qi wrote:
This patch is causing regression in case of qemuarm64 multilib for me.
The static-link.test file is not there, resulting the `mv' command
failure. I've sent out a patch to fix this problem, but I don't know
what's your environment. So please help review.
Regards,
Chen Qi
------------
*发件人:* openembedded-core-boun...@lists.openembedded.org
代表 Jeremy A.
Puhlman
*发送时间:* 2020年3月12日 6:22
*收件人:* openembedded-core@lists.openembedded.org
*主题:* [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
From: Jeremy Puhlman
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/glib-2.0/glib.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
rm
${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+ if test "x${MLPREFIX}" != "x"; then
+ mv
${D}${datadir}/installed-tests/glib/static-link.test
${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+ fi
}
# As we do not build python3 for windows, makes no sense to ship the
script that's using it
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
Virus-free. www.avg.com
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
<#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: make multilib installable.
From: Jeremy Puhlman
Many of ltp's tests are of syscalls and libc content. Enable installing
mulitpule abi's.
Use prefix consistently rather then hardcoded /opt/ltp everywhere.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-extended/ltp/ltp_20200120.bb | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 3e6cbc63f3..deac3917d7 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -45,8 +45,8 @@ inherit autotools-brokensep
TARGET_CC_ARCH += "${LDFLAGS}"
-export prefix = "/opt/ltp"
-export exec_prefix = "/opt/ltp"
+export prefix = "/opt/${PN}"
+export exec_prefix = "/opt/${PN}"
PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl,"
EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4"
@@ -55,7 +55,7 @@ EXTRA_OECONF = " --with-power-management-testsuite
--with-realtime-testsuite --w
EXTRA_OECONF += " --without-tirpc "
do_install(){
-install -d ${D}/opt/ltp/
+install -d ${D}${prefix}/
oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install
# fixup not deploy STPfailure_report.pl to avoid confusing about it fails
to run
@@ -64,10 +64,10 @@ do_install(){
# runs on the OSDL's Scaleable Test Platform (STP) and it mainly accesses
# http://khack.osdl.org to retrieve ltp test results run on
# OSDL's Scaleable Test Platform, but now http://khack.osdl.org
unaccessible
-rm -rf ${D}/opt/ltp/bin/STPfailure_report.pl
+rm -rf ${D}${prefix}/bin/STPfailure_report.pl
-# Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
-cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
+# Copy POSIX test suite into ${D}${prefix}/testcases by manual
+cp -r testcases/open_posix_testsuite ${D}${prefix}/testcases
# Makefile were configured in the build system
find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \
@@ -101,10 +101,10 @@ RDEPENDS_${PN} = "\
tar \
"
-FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/*
/opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/*
/opt/ltp/testcases/open_posix_testsuite/*
/opt/ltp/testcases/open_posix_testsuite/conformance/*
/opt/ltp/testcases/open_posix_testsuite/Documentation/*
/opt/ltp/testcases/open_posix_testsuite/functional/*
/opt/ltp/testcases/open_posix_testsuite/include/*
/opt/ltp/testcases/open_posix_testsuite/scripts/*
/opt/ltp/testcases/open_posix_testsuite/stress/*
/opt/ltp/testcases/open_posix_testsuite/tools/*
/opt/ltp/testcases/data/nm01/lib.a /opt/ltp/lib/libmem.a"
+FILES_${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/*
${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/*
${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/*
${prefix}/testcases/open_posix_testsuite/conformance/*
${prefix}/testcases/open_posix_testsuite/Documentation/*
${prefix}/testcases/open_posix_testsuite/functional/*
${prefix}/testcases/open_posix_testsuite/include/*
${prefix}/testcases/open_posix_testsuite/scripts/*
${prefix}/testcases/open_posix_testsuite/stress/*
${prefix}/testcases/open_posix_testsuite/tools/*
${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a"
# Avoid stripping some generated binaries otherwise some of the ltp tests such
as ldd01 & nm01 fail
-INHIBIT_PACKAGE_STRIP_FILES = "/opt/ltp/testcases/bin/nm01
/opt/ltp/testcases/bin/ldd01"
+INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01
${prefix}/testcases/bin/ldd01"
INSANE_SKIP_${PN} += "already-stripped staticdev"
# Avoid file dependency scans, as LTP checks for things that may or may not
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] babletrace2: make manpages multilib identical
Maybe. They may want it to be altered depending on their preference for how to express the system libdir. I have pushed similar to other projects and gotten a mixed bag of responses. I haven't tried to push it yet, but its in my queue. On 3/12/2020 7:25 AM, Jonathan Rajotte-Julien wrote: Hi Is this something upstream (lttng-dev mailing list) should be interested in? Cheers On Wed, Mar 11, 2020 at 03:22:48PM -0700, Jeremy A. Puhlman wrote: From: Jeremy Puhlman Signed-off-by: Jeremy A. Puhlman --- .../0001-Make-manpages-multilib-identical.patch| 28 ++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch new file mode 100644 index 00..2401b176e6 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch @@ -0,0 +1,28 @@ +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Mon, 9 Mar 2020 21:10:35 + +Subject: [PATCH] Make manpages multilib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + doc/man/asciidoc-attrs.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +index ad1183f1..e11c7031 100644 +--- a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +@@ -1,7 +1,7 @@ + [attributes] + # default values +-system_plugin_path="@LIBDIR@/babeltrace2/plugins" +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers" ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins" ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers" + babeltrace_version="@PACKAGE_VERSION@" + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" + defrdport=5344 +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 16953d6807..61bc7f5e6b 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + file://0001-Make-manpages-multilib-identical.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] boost: fix reproducibilty issues
From: Jeremy Puhlman
fix cmake file references of image dir path
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-support/boost/boost.inc | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-support/boost/boost.inc
b/meta/recipes-support/boost/boost.inc
index e15dce4e1d..8eb9494381 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -202,6 +202,11 @@ do_install() {
fi
done
+# Cmake files reference full paths to image
+find ${D}${libdir}/cmake -type f | \
+ grep 'cmake$' | \
+ xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i
+
}
BBCLASSEXTEND = "native nativesdk"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] dnf: fix reproducibilty issue
From: Jeremy Puhlman Script points to native python3 Signed-off-by: Jeremy A. Puhlman --- ...001-set-python-path-for-completion_helper.patch | 24 ++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch new file mode 100644 index 00..448f6408bc --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -0,0 +1,24 @@ +From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 22:10:02 + +Subject: [PATCH] set python path for completion_helper + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + dnf/cli/completion_helper.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +index 351226759..2835cd3b6 100644 +--- a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/usr/bin/env python3 + # + # This file is part of dnf. + # +-- +2.23.0 + diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index 5244e10cfc..a046ffc05d 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://Fix-SyntaxWarning.patch \ + file://0001-set-python-path-for-completion_helper.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] qemu: Fix reproducibilty issues
From: Jeremy Puhlman
tests/qemu-iotests/common.env is generated from configure which
we pass ${HOSTTOOLS_DIR}/python3 as our python to use, which gets
copied into the ptests. Correct python3 path.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-devtools/qemu/qemu.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index f3342eaf28..e6dbc6d05a 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -56,6 +56,8 @@ do_install_ptest() {
# Don't check the file genreated by configure
sed -i -e '/wildcard config-host.mak/d' \
-e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
+sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
+${D}/${PTEST_PATH}/tests/qemu-iotests/common.env
}
# QEMU_TARGETS is overridable variable
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] gtk-doc: Fix reproducibity issues
From: Jeremy Puhlman
path to pkg-config and python3 encoded in scripts
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12
1 file changed, 12 insertions(+)
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index 50d4d99722..b508e62741 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
@@ -36,6 +36,17 @@ do_configure_prepend() {
sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac
}
+do_install_append () {
+# configure values for python3 and pkg-config encoded in scripts
+for fn in ${bindir}/gtkdoc-depscan \
+${bindir}/gtkdoc-mkhtml2 \
+${datadir}/gtk-doc/python/gtkdoc/config.py; do
+sed -e
's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \
+-e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
+-i ${D}$fn
+done
+}
+
FILES_${PN} += "${datadir}/sgml"
FILES_${PN}-dev += "${libdir}/cmake"
FILES_${PN}-doc = ""
@@ -48,3 +59,4 @@ gtkdoc_makefiles_sysroot_preprocess() {
-e "s|GTKDOC_RUN =.*|GTKDOC_RUN =
\$(top_builddir)/gtkdoc-qemuwrapper|" \
${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make
}
+
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] strace: Fix reproducibility issues
From: Jeremy Puhlman
gen_tests script encodes its full path to itself in each script
Signed-off-by: Jeremy A. Puhlman
---
.../0001-strace-fix-reproducibilty-issues.patch| 39 ++
meta/recipes-devtools/strace/strace_5.5.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
diff --git
a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
new file mode 100644
index 00..c4c176e6bc
--- /dev/null
+++
b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
@@ -0,0 +1,39 @@
+From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Wed, 11 Mar 2020 19:56:55 +
+Subject: [PATCH] strace: fix reproducibilty issues
+
+The full path to the gen_tests.sh script is encoded in the tests
+
+Upstream-Status: Pending
+
+Signed-off-by: Jeremy Puhlman
+---
+ tests/gen_tests.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh
+index 5e1e7c9..1e65eac 100755
+--- a/tests/gen_tests.sh
b/tests/gen_tests.sh
+@@ -46,7 +46,7 @@ while read -r name arg0 args; do {
+
+ hdr="\
+ #!/bin/sh -efu
+-# Generated by $0 from $input ($name $arg0 $args); do not edit."
++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit."
+
+ case "$arg0" in
+ +*)
+@@ -80,7 +80,7 @@ while read -r name arg0 args; do {
+
+ if [ -n "$names" ]; then
+ {
+- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input"
++ printf '# Generated by %s from %s; do not edit.\n' "$(basename
$0)" "$input"
+ printf 'GEN_TESTS ='
+ printf ' %s.gen.test' $names
+ echo
+--
+2.24.1
+
diff --git a/meta/recipes-devtools/strace/strace_5.5.bb
b/meta/recipes-devtools/strace/strace_5.5.bb
index 6e7d63949d..ae552da028 100644
--- a/meta/recipes-devtools/strace/strace_5.5.bb
+++ b/meta/recipes-devtools/strace/strace_5.5.bb
@@ -13,6 +13,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
file://ptest-spacesave.patch \
file://uintptr_t.patch \
+ file://0001-strace-fix-reproducibilty-issues.patch \
"
SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
SRC_URI[sha256sum] =
"9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] ltp: fix reproducibilty issues
From: Jeremy Puhlman
Man pages are copied in to the target filesystem from the configured
build, which leaks paths in to the work directory
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 5be9489a75..3e6cbc63f3 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -68,6 +68,12 @@ do_install(){
# Copy POSIX test suite into ${D}/opt/ltp/testcases by manual
cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases
+
+# Makefile were configured in the build system
+find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \
+ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
+ -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
+ -e 's@[^ ]*--sysroot=[^ "]*@@g'
}
RDEPENDS_${PN} = "\
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
From: Jeremy Puhlman
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/glib-2.0/glib.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
rm
${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+if test "x${MLPREFIX}" != "x"; then
+mv ${D}${datadir}/installed-tests/glib/static-link.test
${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+fi
}
# As we do not build python3 for windows, makes no sense to ship the script
that's using it
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] babletrace2: make manpages multilib identical
From: Jeremy Puhlman Signed-off-by: Jeremy A. Puhlman --- .../0001-Make-manpages-multilib-identical.patch| 28 ++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch new file mode 100644 index 00..2401b176e6 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch @@ -0,0 +1,28 @@ +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Mon, 9 Mar 2020 21:10:35 + +Subject: [PATCH] Make manpages multilib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + doc/man/asciidoc-attrs.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +index ad1183f1..e11c7031 100644 +--- a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +@@ -1,7 +1,7 @@ + [attributes] + # default values +-system_plugin_path="@LIBDIR@/babeltrace2/plugins" +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers" ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins" ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers" + babeltrace_version="@PACKAGE_VERSION@" + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" + defrdport=5344 +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 16953d6807..61bc7f5e6b 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + file://0001-Make-manpages-multilib-identical.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for groff: Make manpages binary identical
On 3/7/2020 7:59 AM, Richard Purdie wrote: On Sat, 2020-03-07 at 14:32 +, Patchwork wrote: == Series Details == Series: groff: Make manpages binary identical Revision: 1 URL : https://patchwork.openembedded.org/series/23145/ 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 Upstream-Status is in incorrect format [test_upstream_status_presence_format] Suggested fixFix Upstream-Status format in 0001-Make-manpages- mulitlib-identical.patch Current Upstream-status: Pending Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] I fixed status -> Status and queued in -next. Ah sorry about that. I was blind to the case difference. Thank you. Cheers, Richard -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] groff: Make manpages binary identical
From: Jeremy Puhlman
Signed-off-by: Jeremy A. Puhlman
---
.../0001-Make-manpages-mulitlib-identical.patch| 27 ++
meta/recipes-extended/groff/groff_1.22.4.bb| 1 +
2 files changed, 28 insertions(+)
create mode 100644
meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
diff --git
a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
new file mode 100644
index 00..329a97cb2e
--- /dev/null
+++
b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
@@ -0,0 +1,27 @@
+From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Sat, 7 Mar 2020 00:59:13 +
+Subject: [PATCH] Make manpages mulitlib identical
+
+Upstream-status: Pending
+Signed-off-by: Jeremy Puhlman
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d18c49b..6175fe9 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -917,7 +917,7 @@ SUFFIXES += .man
+-e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \
+-e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f
$(makevarescape)`|g" \
+-e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f
$(makevarescape)`|g" \
+- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f
$(makevarescape)`|g" \
++ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e
's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \
+-e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
+-e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
+-e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
+--
+2.23.0
+
diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb
b/meta/recipes-extended/groff/groff_1.22.4.bb
index 082597f693..e398478349 100644
--- a/meta/recipes-extended/groff/groff_1.22.4.bb
+++ b/meta/recipes-extended/groff/groff_1.22.4.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
file://groff-not-search-fonts-on-build-host.patch \
file://0001-support-musl.patch \
file://0001-Include-config.h.patch \
+file://0001-Make-manpages-mulitlib-identical.patch \
"
SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] xserver-xorg: make manpage mutlilib identical
From: Jeremy Puhlman
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 14ba6bfee6..b4f0760176 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -152,6 +152,7 @@ PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
do_install_append () {
# Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/
+sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,'
${D}${mandir}/man5/xorg.conf.5
}
# Add runtime provides for the ABI versions of the video and input subsystems,
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] xinit: make manpages multilib identical
From: Jeremy Puhlman Signed-off-by: Jeremy A. Puhlman --- .../0001-Make-manpage-multilib-identical.patch | 28 ++ meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch diff --git a/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch new file mode 100644 index 00..649905574c --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch @@ -0,0 +1,28 @@ +From d642e60d8963f1b90569cd0ab5c29ac2c9bfe939 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Fri, 6 Mar 2020 22:28:14 + +Subject: [PATCH] Make manpage multilib identical + +Upstream-Status: Submitted + +Signed-off-by: Jeremy Puhlman +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 9c6569f..608e933 100644 +--- a/man/Makefile.am b/man/Makefile.am +@@ -12,7 +12,7 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ + -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \ + -e 's|__xinitdir__|$(XINITDIR)|g' \ + -e 's|__bindir__|$(bindir)|g' \ +- -e 's|__libdir__|$(libdir)|g' \ ++ -e 's|__libdir__|$(prefix)/lib*|g' \ + -e 's|__configdir__|$(XINITDIR)|g' + + +-- +2.23.0 + diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index 5626ebbd52..c9e28d9bba 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" +SRC_URI += "file://0001-Make-manpage-multilib-identical.patch" + SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37" SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9" -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] groff: Make manpages binary identical
From: Jeremy Puhlman
Signed-off-by: Jeremy A. Puhlman
---
.../0001-Make-manpages-mulitlib-identical.patch| 27 ++
meta/recipes-extended/groff/groff_1.22.4.bb| 1 +
2 files changed, 28 insertions(+)
create mode 100644
meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
diff --git
a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
new file mode 100644
index 00..2f6b091bff
--- /dev/null
+++
b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
@@ -0,0 +1,27 @@
+From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Sat, 7 Mar 2020 00:59:13 +
+Subject: [PATCH] Make manpages mulitlib identical
+
+Upstream-status: pending
+Signed-off-by: Jeremy Puhlman
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d18c49b..6175fe9 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -917,7 +917,7 @@ SUFFIXES += .man
+-e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \
+-e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f
$(makevarescape)`|g" \
+-e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f
$(makevarescape)`|g" \
+- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f
$(makevarescape)`|g" \
++ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e
's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \
+-e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
+-e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
+-e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
+--
+2.23.0
+
diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb
b/meta/recipes-extended/groff/groff_1.22.4.bb
index 082597f693..e398478349 100644
--- a/meta/recipes-extended/groff/groff_1.22.4.bb
+++ b/meta/recipes-extended/groff/groff_1.22.4.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
file://groff-not-search-fonts-on-build-host.patch \
file://0001-support-musl.patch \
file://0001-Include-config.h.patch \
+file://0001-Make-manpages-mulitlib-identical.patch \
"
SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Multilib conflicts in man pages.
On 3/6/2020 2:00 PM, Richard Purdie wrote:
On Tue, 2020-03-03 at 15:22 -0800, Jeremy Puhlman wrote:
Is there a preferred method in oe-core for dealing with man pages
that conflict due to differences in multilib pathing.
For example an application lives in /usr/lib/foo/bar for one abi but
/usr/lib64/foo/bar in another, and
that kind of information is encoded in to the man pages.
Some things i have seen done in the past, is move the man pages
under
/user/share/man/${PN} or
use something like mutlilib script to deal with it.
I am just curious if there is a canned, preferred way the project
handles those or wants to handle them?
xinit, xserver-org, and groff each exhibit these issues.
Could we just put a placeholder into the man page so they'd be
identical? Multiple copies seems like overkill for something as
trivial...
A placeholder like:
/usr//sys.startxrc
from
/usr/lib64/sys.startxrc
Cheers,
Richard
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Multilib conflicts in man pages.
On 3/6/2020 2:00 PM, Richard Purdie wrote:
On Tue, 2020-03-03 at 15:22 -0800, Jeremy Puhlman wrote:
Is there a preferred method in oe-core for dealing with man pages
that conflict due to differences in multilib pathing.
For example an application lives in /usr/lib/foo/bar for one abi but
/usr/lib64/foo/bar in another, and
that kind of information is encoded in to the man pages.
Some things i have seen done in the past, is move the man pages
under
/user/share/man/${PN} or
use something like mutlilib script to deal with it.
I am just curious if there is a canned, preferred way the project
handles those or wants to handle them?
xinit, xserver-org, and groff each exhibit these issues.
Could we just put a placeholder into the man page so they'd be
identical? Multiple copies seems like overkill for something as
trivial...
Yeah, that works as well. Just need to brush up on my man-page-fu.
Cheers,
Richard
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Multilib conflicts in man pages.
Anyone have a thought?
On 3/3/2020 3:22 PM, Jeremy Puhlman wrote:
Is there a preferred method in oe-core for dealing with man pages that
conflict due to differences
in multilib pathing.
For example an application lives in /usr/lib/foo/bar for one abi but
/usr/lib64/foo/bar in another, and
that kind of information is encoded in to the man pages.
Some things i have seen done in the past, is move the man pages under
/user/share/man/${PN} or
use something like mutlilib script to deal with it.
I am just curious if there is a canned, preferred way the project
handles those or wants to handle them?
xinit, xserver-org, and groff each exhibit these issues.
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gdbm-native: disable readline for the native package.
Turns off readline for both. Also corrected a typo with enable-libgdbm-compat Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3c9b..5cb7c558b8 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest # Needed for dbm python module -EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gdbm-native: disable readline for the native package.
Turns off readline for both. Also corrected a typo with enable-libgdbm-compat Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3c9b..5cb7c558b8 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest # Needed for dbm python module -EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdbm-native: disable readline for the native package.
On 3/4/2020 4:16 PM, Andre McCurdy wrote: On Wed, Mar 4, 2020 at 4:05 PM Jeremy A. Puhlman wrote: From: Jeremy Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 5326184181..52e35c8c2e 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -20,6 +20,8 @@ DEPENDS_class-native += "readline" # Needed for dbm python module EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF_class-native = "--without-readline" Assuming the target version is being built without readline support (presumably that's true as the recipe doesn't indicate any dependency on readline, but you should double check) then this configure option should be passed in all cases, not just for native. There is not explicit dependency which is why we are here in the first place for native. # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdbm: add depend on readline for consistent builds
On 3/4/2020 4:03 PM, Andre McCurdy wrote: On Wed, Mar 4, 2020 at 3:48 PM Jeremy A. Puhlman wrote: On 3/4/2020 3:43 PM, Andre McCurdy wrote: On Wed, Mar 4, 2020 at 3:22 PM Khem Raj wrote: On Wed, Mar 4, 2020 at 2:25 PM Jeremy A. Puhlman wrote: From: Jeremy Puhlman Whether readline is installed on the build host or not influences the way gdbm builds. Depend on readline for a consistent build. It sounds like configuring with --without-readline would be a better solution? Its an either/or. I suggested both in the bug(13714) basically either works. If both approaches work then an explicit configure option is preferred. Alternate patch sent. This fails to build on a system with readline, and using the buildtools-extended installer. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3c9b..5326184181 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest +DEPENDS_class-native += "readline" Don't use += with an over-ride. It doesn't do what you might expect. Okay. -- Jeremy A. Puhlman jpuhl...@mvista.com -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gdbm-native: disable readline for the native package.
From: Jeremy Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 5326184181..52e35c8c2e 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -20,6 +20,8 @@ DEPENDS_class-native += "readline" # Needed for dbm python module EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF_class-native = "--without-readline" + # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gdbm: add depend on readline for consistent builds
From: Jeremy Puhlman Whether readline is installed on the build host or not influences the way gdbm builds. Depend on readline for a consistent build. This fails to build on a system with readline, and using the buildtools-extended installer. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3c9b..5326184181 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest +DEPENDS_class-native += "readline" + # Needed for dbm python module EXTRA_OECONF = "-enable-libgdbm-compat" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdbm: add depend on readline for consistent builds
On 3/4/2020 3:43 PM, Andre McCurdy wrote: On Wed, Mar 4, 2020 at 3:22 PM Khem Raj wrote: On Wed, Mar 4, 2020 at 2:25 PM Jeremy A. Puhlman wrote: From: Jeremy Puhlman Whether readline is installed on the build host or not influences the way gdbm builds. Depend on readline for a consistent build. It sounds like configuring with --without-readline would be a better solution? Its an either/or. I suggested both in the bug(13714) basically either works. This fails to build on a system with readline, and using the buildtools-extended installer. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3c9b..5326184181 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest +DEPENDS_class-native += "readline" Don't use += with an over-ride. It doesn't do what you might expect. Okay. -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gdbm: add depend on readline for consistent builds
From: Jeremy Puhlman Whether readline is installed on the build host or not influences the way gdbm builds. Depend on readline for a consistent build. This fails to build on a system with readline, and using the buildtools-extended installer. Signed-off-by: Jeremy A. Puhlman --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3c9b..5326184181 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest +DEPENDS_class-native += "readline" + # Needed for dbm python module EXTRA_OECONF = "-enable-libgdbm-compat" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] buildtools-extended-tarball: add nativesdk-libxcrypt-dev
From: Jeremy Puhlman
virtual/crypt-native is assume provided in bitbake.conf, so
buildtools-extended-tarball shoud provide crypt since it doesn't
use the host's headers/libraries.
[YOCTO #13714]
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb
b/meta/recipes-core/meta/buildtools-extended-tarball.bb
index d756036373..4a79b09fda 100644
--- a/meta/recipes-core/meta/buildtools-extended-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb
@@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK += "\
nativesdk-libstdc++-dev \
nativesdk-libtool \
nativesdk-pkgconfig \
+nativesdk-libxcrypt-dev \
"
TOOLCHAIN_OUTPUTNAME =
"${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-native: Should not search the system for headers/libraries.
From: Jeremy Puhlman
The specific issue here is rpc/rpc.h, but its likely more general.
/usr/include is searched for rpc/rpc.h and if it exists on the
system, it changes behavior. If you are using the extended buildtools
tarball on a machine that has /usr/include/rpc/rpc.h, it will decide
that is good enough and not continue to search. nis fails to build
because /usr/include and /usr/lib are not part of the include/link
paths for the buildtools tarball compiler(nor should they be).
This makes it so python3-native will not build if you are using the
extended buildtools tarball, but from a larger issue perspective it
is building in likely different ways depending on what machine it
is building on.
libtirpc is already a depend so we shouldn't need the hosts rpc/rcp.h.
Signed-off-by: Jeremy A. Puhlman
---
...Don-t-search-system-for-headers-libraries.patch | 29 ++
meta/recipes-devtools/python/python3_3.8.1.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644
meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
diff --git
a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
new file mode 100644
index 00..acf8e1e9b5
--- /dev/null
+++
b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
@@ -0,0 +1,29 @@
+From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Wed, 4 Mar 2020 00:06:42 +
+Subject: [PATCH] Don't search system for headers/libraries
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Jeremy Puhlman
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9da1b3a..59782c0 100644
+--- a/setup.py
b/setup.py
+@@ -674,8 +674,8 @@ class PyBuildExt(build_ext):
+ add_dir_to_list(self.compiler.include_dirs,
+ sysconfig.get_config_var("INCLUDEDIR"))
+
+-system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
+-system_include_dirs = ['/usr/include']
++system_lib_dirs = []
++system_include_dirs = []
+ # lib_dirs and inc_dirs are used to search for files;
+ # if a file is found in one of those directories, it can
+ # be assumed that no additional -I,-L directives are needed.
+--
+2.24.1
+
diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb
b/meta/recipes-devtools/python/python3_3.8.1.bb
index 77968528c7..5e3c29cb4c 100644
--- a/meta/recipes-devtools/python/python3_3.8.1.bb
+++ b/meta/recipes-devtools/python/python3_3.8.1.bb
@@ -37,6 +37,7 @@ SRC_URI =
"http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
SRC_URI_append_class-native = " \
file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
file://12-distutils-prefix-is-inside-staging-area.patch \
+ file://0001-Don-t-search-system-for-headers-libraries.patch \
"
SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mesa: add fix for arm6
This was in my queue from a previous yotco version. I haven't gotten my arm bsp up and running yet. I will double check. On 2/29/2020 7:37 AM, Adrian Bunk wrote: On Fri, Feb 28, 2020 at 02:51:51PM -0800, Jeremy A. Puhlman wrote: From: Jeremy Puhlman We have had similar problems with missing atomics on arm6 that arm5 has. How are you able to reproduce this problem? I was wondering why the upstream fixes that happened in the meantime didn't fix it for armv5, but a qemuarmv5 build of mesa on master worked even after commenting out this line. ... --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false" FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" +CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS" ... cu Adrian BTW: armv6, not arm6 - arm6 is armv3 -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xorgproto: move pc files to libdir
From: Jeremy Puhlman
We fixed this two years go:
http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151922.html
However xorgproto moved to meson and uses pkgconfig module to generate the .pc
which does not provide a method of omitting the libdir, which now means any
pc generated from meson using the module will always be mulitlib incompatible.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
index fb3f3aed3d..c0785ccd64 100644
--- a/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
+++ b/meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb
@@ -19,6 +19,8 @@ inherit meson
PACKAGECONFIG ??= ""
PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false"
+# Datadir only used to install pc files, $datadir/pkgconfig
+datadir="${libdir}"
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] binutils: fix multilib header difference
From: Jeremy Puhlman
bfd_stdint.h encodes the name of the compiler in the header
which is different between mutlilibs. Remvoe target prefix to
make the headers match.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-devtools/binutils/binutils.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/binutils/binutils.inc
b/meta/recipes-devtools/binutils/binutils.inc
index 6ed40a1486..b0937e62fc 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -163,6 +163,8 @@ do_install () {
done
oe_multilib_header bfd.h
+# bfd_stdint.h encodes the compiler name in the header
+sed -i ${D}${includedir}/bfd_stdint.h -e "s,${TARGET_PREFIX},,"
}
inherit update-alternatives
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] apr-util: add multilib script for apu-1-config
From: Jeremy Puhlman
apu-1-config encodes library path in to script
27c27
< libdir="/usr/lib64"
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-support/apr/apr-util_1.6.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb
b/meta/recipes-support/apr/apr-util_1.6.1.bb
index 1f9fea25d8..3896c924f0 100644
--- a/meta/recipes-support/apr/apr-util_1.6.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.6.1.bb
@@ -28,7 +28,9 @@ EXTRA_OECONF =
"--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--with-expat=${STAGING_DIR_HOST}${prefix}"
-inherit autotools lib_package binconfig
+inherit autotools lib_package binconfig multilib_script
+
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config"
OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] apr: add mulitlib scripts apr-1-config, apr_rules.mk
From: Jeremy Puhlman
apr_rules.mk encodes build options in to file
35c35
< CC=x86_64-montavista-linux-gcc -m64 -march=nehalem -mtune=generic
-mfpmath=sse -msse4.2 --sysroot=
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-support/apr/apr_1.7.0.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/apr/apr_1.7.0.bb
b/meta/recipes-support/apr/apr_1.7.0.bb
index eca9cdea48..8a9b780593 100644
--- a/meta/recipes-support/apr/apr_1.7.0.bb
+++ b/meta/recipes-support/apr/apr_1.7.0.bb
@@ -23,7 +23,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7"
SRC_URI[sha256sum] =
"e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea"
-inherit autotools-brokensep lib_package binconfig multilib_header ptest
+inherit autotools-brokensep lib_package binconfig multilib_header ptest
multilib_script
OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
@@ -51,6 +51,9 @@ do_configure_prepend() {
./buildconf 2
}
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \
+${PN}-dev:${datadir}/build-1/apr_rules.mk"
+
FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
RDEPENDS_${PN}-dev += "bash"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] cups: make cups-config a multilib script
From: Jeremy Puhlman
cups-config encodes the library dir in the script.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-extended/cups/cups.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/cups/cups.inc
b/meta/recipes-extended/cups/cups.inc
index 34982819b9..c5a60bde12 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so"
CLEANBROKEN = "1"
-inherit autotools-brokensep binconfig useradd systemd pkgconfig
+inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system lpadmin"
@@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \
"
CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config"
+
SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess"
cups_sysroot_preprocess () {
sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e
's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e
's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:'
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: add fix for arm6
From: Jeremy Puhlman
We have had similar problems with missing atomics on arm6 that arm5
has.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-graphics/mesa/mesa.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 87f167c507..54d7ea8961 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -161,6 +161,7 @@ EXTRA_OEMESON_append = " -Dasm=false"
FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
+CFLAGS_append_armv6 = " -DMISSING_64BIT_ATOMICS"
# Remove the mesa dependency on mesa-dev, as mesa is empty
RDEPENDS_${PN}-dev = ""
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxcrypt: add native to BBCLASSEXTEND
buildtools-extended does not provide libcrypt, and some native
applications require it, like clang. While it would likely make sense to
include nativesdk-libxcrypt in the buildtools it would also likely make
sense to remove the dependancy on the host libcrypt for those
applications that need it.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc
b/meta/recipes-core/libxcrypt/libxcrypt.inc
index 416205cd5c..e59a096573 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -32,4 +32,4 @@ CFLAGS += "-fcommon"
API = "--disable-obsolete-api"
EXTRA_OECONF += "${API}"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] lsb-release: fix likely reproducabilty timestamp
Remove timestamp from gzipped manpage.
Signed-off-by: Jeremy A. Puhlman
---
.../0001-Remove-timestamp-from-manpage.patch | 27 +++
meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644
meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
diff --git
a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
new file mode 100644
index 00..af095fd322
--- /dev/null
+++
b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
@@ -0,0 +1,27 @@
+From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Sat, 22 Feb 2020 19:01:28 +
+Subject: [PATCH] Remove timestamp from manpage
+
+Upstream-Status: Submitted [lsb-disc...@lists.linux-foundation.org]
+Signed-off-by: Jeremy A. Puhlman
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 04fdecd..5be8081 100644
+--- a/Makefile
b/Makefile
+@@ -17,7 +17,7 @@ man: lsb_release.1.gz
+
+ lsb_release.1.gz: lsb_release
+ @./help2man -N --include ./lsb_release.examples
--alt_version_key=program_version ./lsb_release >lsb_release.1
+- @gzip -9f lsb_release.1
++ @gzip -9fn lsb_release.1
+
+ install: all
+ install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz
+--
+2.13.3
+
diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb
b/meta/recipes-extended/lsb/lsb-release_1.4.bb
index 52e30267f5..a06cbcf845 100644
--- a/meta/recipes-extended/lsb/lsb-release_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM =
"file://README;md5=12da544b1a3a5a1795a21160b49471cf"
SRC_URI =
"${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \
file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \
+ file://0001-Remove-timestamp-from-manpage.patch \
"
SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] rt-tests: make manpages reproducible
From: Jeremy Puhlman add -n to gzip call Signed-off-by: Jeremy A. Puhlman --- ...gzip-with-n-for-build-reproducibilty.patch | 62 +++ meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch new file mode 100644 index 00..3bafbbe08f --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch @@ -0,0 +1,62 @@ +From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Tue, 25 Feb 2020 22:58:59 + +Subject: [PATCH] gzip with -n for build reproducibilty + +The date can get encoded in the header of the gz file, which +causes the binary files between two different builds of the +same data to be different. Add -n for reproducibilty + +Signed-off-by: Jeremy Puhlman + +Upstream-Status: Submitted [mailinglist] + +--- + Makefile | 24 + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index a54d82b..e9f0d5a 100644 +--- a/Makefile b/Makefile +@@ -168,17 +168,17 @@ install: all install_hwlatdetect + cp $(TARGETS) "$(DESTDIR)$(bindir)" + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" +- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" +- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" +- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" +- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" +- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" +- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" +- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" +- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" +- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" ++ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" ++ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" ++ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" ++ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" ++ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" ++ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" ++ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" ++ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" ++ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" ++ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" ++ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect +@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect + install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ + rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ + ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ + fi + + .PHONY: tarball +-- +2.23.0 + diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb index 5aa0aa10c3..dad252b4ed 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -13,6 +13,7 @@ inherit ptest SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ +file://0001-gzip-with-n-for-build-reproducibilty.patch \ " # rt-tests needs PI mutex support in libc -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] sysvinit: remove logsave.8
From: Jeremy Puhlman
logsave is a duplicate from e2fsprogs, which was already removed,
but the man page remained which is also a duplicate. However it
does not get modifed on install so it conflicts with the e2fsprogs
version.
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb
b/meta/recipes-core/sysvinit/sysvinit_2.96.bb
index 63c10848b4..d2b85ed9c0 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb
@@ -110,4 +110,5 @@ do_install () {
# Already provided by e2fsprogs; sysvinit's version is a copy from
there
rm ${D}${base_sbindir}/logsave
+rm ${D}${mandir}/man8/logsave.8
}
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] lsb-release: fix likely reproducabilty timestamp
From: Jeremy Puhlman
Remove timestamp from gzipped manpage.
Signed-off-by: Jeremy A. Puhlman
---
.../0001-Remove-timestamp-from-manpage.patch | 25 +++
meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 +
2 files changed, 26 insertions(+)
create mode 100644
meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
diff --git
a/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
new file mode 100644
index 00..e7ff00d132
--- /dev/null
+++
b/meta/recipes-extended/lsb/lsb-release/0001-Remove-timestamp-from-manpage.patch
@@ -0,0 +1,25 @@
+From fb0b58be938bab5571ac0bdec3725f6d88b07e9f Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman
+Date: Sat, 22 Feb 2020 19:01:28 +
+Subject: [PATCH] Remove timestamp from manpage
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 04fdecd..5be8081 100644
+--- a/Makefile
b/Makefile
+@@ -17,7 +17,7 @@ man: lsb_release.1.gz
+
+ lsb_release.1.gz: lsb_release
+ @./help2man -N --include ./lsb_release.examples
--alt_version_key=program_version ./lsb_release >lsb_release.1
+- @gzip -9f lsb_release.1
++ @gzip -9fn lsb_release.1
+
+ install: all
+ install -D -m 644 lsb_release.1.gz ${mandir}/man1/lsb_release.1.gz
+--
+2.13.3
+
diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb
b/meta/recipes-extended/lsb/lsb-release_1.4.bb
index 52e30267f5..a06cbcf845 100644
--- a/meta/recipes-extended/lsb/lsb-release_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM =
"file://README;md5=12da544b1a3a5a1795a21160b49471cf"
SRC_URI =
"${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \
file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \
+ file://0001-Remove-timestamp-from-manpage.patch \
"
SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libedit/readline: Correct package alternatives link for manpage
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/readline/readline.inc | 2 +-
meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/readline/readline.inc
b/meta/recipes-core/readline/readline.inc
index 4babcbd69a..052e2d5f3d 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -47,7 +47,7 @@ CONFFILES_${PN} += "${sysconfdir}/inputrc"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "history.3"
+ALTERNATIVE_${PN}-doc = "history.3"
ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
# OpenSuse injects versions into libreadline leading to conficits between our
native one and theirs
diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
index 267fdcc54a..8d2d57a930 100644
--- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
+++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
@@ -21,5 +21,5 @@ BBCLASSEXTEND = "native nativesdk"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_${PN} = "history.3"
+ALTERNATIVE_${PN}-doc = "history.3"
ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] readline/ediline: Fix conflicting manpages.
From: Jeremy Puhlman
file /usr/share/man/man3/history.3 conflicts between attempted installs of
libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64
Signed-off-by: Jeremy A. Puhlman
---
meta/recipes-core/readline/readline.inc | 8 +++-
meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/readline/readline.inc
b/meta/recipes-core/readline/readline.inc
index 07f54a76f1..4babcbd69a 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk"
CONFFILES_${PN} += "${sysconfdir}/inputrc"
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "history.3"
+ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
+
# OpenSuse injects versions into libreadline leading to conficits between our
native one and theirs
# see their spec file for where this is injected. Extra versioning is harmless
so we just do the same.
SRC_URI_append_class-native = " file://rl-native.map"
-LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
\ No newline at end of file
+LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
index 7116c9ddbc..267fdcc54a 100644
--- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
+++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
@@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416"
SRC_URI[sha256sum] =
"dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071"
BBCLASSEXTEND = "native nativesdk"
+
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_${PN} = "history.3"
+ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] toolchain-shar-extract: ignore timestamp on decompress
From: Jeremy Puhlman Installing on centos7, which the extended version of the buildtools tarball is supposed to fix and with reproducable builds turned on, all the time stamps are for epoch. This results in the following output for every file: tar: ./sysroots/x86_64-pokysdk-linux/usr/include/c++/9.2.0/cstdalign: implausibly old time stamp 1969-12-31 16:00:00 tar: ./sysroots/x86_64-pokysdk-linux/usr/lib/libstdc++.so.6: implausibly old time stamp 1969-12-31 16:00:00 Ignore the timestamps during the uncompession step. Signed-off-by: Jeremy Puhlman --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ccc4f4e1ac..4c4b4deb4c 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -249,7 +249,7 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else -tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 +tail -n +$payload_offset $0| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Unknown Postinstall Scriptlet Failing to Defer Boot
If you look at the log.do_rootfs it will give you more or less the exact
failure(using the message below as a guide), the error message below is
basically
the final catchall that says "at least one of them failed, please go fix
it" kind of message.
On 2/14/2020 10:30 AM, Andrew Boos wrote:
Thanks Jeremy for the hint about update-alternatives. It turns out
that lmbench was installing a binary called "stream" that conflicts
with ImageMagick's own stream. All we had to do was remove lmbench
from our IMAGE_INSTALL and the problem went away. I'm posting the
original error for anyone that is having the same issue.
ERROR: imx8-image-3.0b3-r0 do_rootfs: Postinstall scriptlets of
['imagemagick'] have failed. If the intention is to defer them to
first boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Andrew
On Thu, Feb 13, 2020 at 8:02 PM Jeremy A. Puhlman <mailto:jpuhl...@mvista.com>> wrote:
In these kind of cases, by providing the actual error message,
people can provide more help.
The recipe inherits update-alternatives and sets a large number of
alternatives. The alternatives are done in the automatically added
post install scripts. In all likelihood one of the listed links is
wrong, or already a symlink or something similar.
On 2/13/2020 4:49 PM, Andrew Boos wrote:
Hi,
I am working on a bitbake build and I am running into an issue
where a postinst scriptlet is failing via "exit 1" to defer to
first boot and I cannot figure out which recipe is causing the
issue. Does anybody have any tips on identifying which recipe is
actually exiting with a failure? The error log says that it is in
imagemagick but the recipe does not have any postinst scripts
defined. Also, there are no imagemagick .bbappend files in my
layers.
(https://github.com/openembedded/meta-openembedded/blob/sumo/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb)
Thanks,
Andrew
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
Virus-free. www.avg.com
<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
<#m_-7702559278781328841_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
--
Jeremy A. Puhlman
jpuhl...@mvista.com <mailto:jpuhl...@mvista.com>
--
*Andrew Boos* | Avilution, LLC
(c) 251-895-5509
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Unknown Postinstall Scriptlet Failing to Defer Boot
In these kind of cases, by providing the actual error message, people can provide more help. The recipe inherits update-alternatives and sets a large number of alternatives. The alternatives are done in the automatically added post install scripts. In all likelihood one of the listed links is wrong, or already a symlink or something similar. On 2/13/2020 4:49 PM, Andrew Boos wrote: Hi, I am working on a bitbake build and I am running into an issue where a postinst scriptlet is failing via "exit 1" to defer to first boot and I cannot figure out which recipe is causing the issue. Does anybody have any tips on identifying which recipe is actually exiting with a failure? The error log says that it is in imagemagick but the recipe does not have any postinst scripts defined. Also, there are no imagemagick .bbappend files in my layers. (https://github.com/openembedded/meta-openembedded/blob/sumo/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb) Thanks, Andrew <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> Virus-free. www.avg.com <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2> -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] perl: don't package the host configuration
Should that bug number be 13772 not 13372?
On 2/6/2020 2:07 PM, Ross Burton wrote:
From: Ross Burton
`make install` installs xconfig.h, which is the configuration of the
*build host* used when building miniperl, used to bootstrap the Perl
build.
As this changes depending on the build host, remove don't install it.
[ YOCTO #13372 ]
Signed-off-by: Ross Burton
---
meta/recipes-devtools/perl/perl_5.30.1.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb
b/meta/recipes-devtools/perl/perl_5.30.1.bb
index d4b6bb32b43..8af9dfa4a2c 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
@@ -139,6 +139,10 @@ do_install() {
# Fix up shared library
rm ${D}/${libdir}/perl5/${PV}/*/CORE/libperl.so
ln -sf ../../../../libperl.so.${PERL_LIB_VER} $(echo
${D}/${libdir}/perl5/${PV}/*/CORE)/libperl.so
+
+# This is the native configuration for the bootstrap perl, don't need it
+# packaged.
+rm -f ${D}${libdir}/perl5/${PV}/*/CORE/xconfig.h
}
do_install_append_class-target() {
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH] update-alternatives: Don't process duplicated entries
On Fri, 2018-06-15 at 17:59 -0700, Jeremy Puhlman wrote: If ALTERNATIVE_ lists the same entry more then once, the update-alternatives identical install and remove actions are added for each repeated entry. This is exhibited when you add meta-selinux, and examine the busybox package, which installs every link twice because it alters the links to point to the shell replacements so selinux will work with them. This can generate warnings on do_rootfs about similarly prioritized alternatives. Given that at this point in the processing the addtions should always be identical there shouldn't be any good reason to add them twice. Signed-off-by: Jeremy Puhlman --- meta/classes/update-alternatives.bbclass | 4 1 file changed, 4 insertions(+) Shouldn't we detect and make this a fatal error in one of the other sanity tests like we do for PACKAGES for example? That is certainly one way to go, it would also require at least a fix to the selinux append(which is what I did first), but I figured a more generalized fix would be more useful in the long run. Would there ever be a valid use case for duplicate entries here? Given at this point in the code all the values are pretty much locked in, you can't really create links that are different, so at least as the way the code is currently structured, there is no value in adding identical values twice as far as I can think of. With out any change, there does not appear to be any degradation in the on target alternatives function, in some cases it just generates a number of "alternatives set at the same priority" warning messages during the image construction. In the PACKAGES case, I thought there was actual real functional issues with duplicating values in package, which is why it was added. In this case the only real effect would be cleaner alternatives files/post scripts and no warnings during image builds. I am fine with either way, as I already have a fix up for the selinux append. Cheers, Richard -- Jeremy A. Puhlman jpuhl...@mvista.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xorgproto: Install .pc files in ${libdir}/pkgconfig
Okay I did some test builds and nuking the libdir lines worked fine.
The patch is submitted here:
https://lists.x.org/archives/xorg-devel/2018-June/057123.html
It wasn't rejected out of hand. Did you want me to roll a update to this
with the submitted
patch, or did you want to wait to see how it pays out on the x-org list?
On 6/11/2018 9:35 AM, Burton, Ross wrote:
I'd recommend deleting the libdir lines in every .pc file (and pushing
the patch upstream).
Ross
On 11 June 2018 at 17:19, Jeremy A. Puhlman wrote:
On 6/11/2018 3:23 AM, Burton, Ross wrote:
Upstream will (and do) argue that $datadir is the right location as
these headers are architecture-independent.
Would the package manager do the right thing if the files didn't have
the libdir line in, so where bit-identical?
Yes, if the files are binary identical then the package manager would not
call it a conflict.
Ross
On 10 June 2018 at 20:01, Jeremy Puhlman wrote:
* --data dir config option is only used to install pkgconfig
* Installing into ${datadir} causes mutlilib conficts on install
file /usr/share/pkgconfig/applewmproto.pc conflicts between attempted
installs of lib32-xorgproto-dev-2018.4-r0.i586 and
xorgproto-dev-2018.4-r0.corei7_64
file /usr/share/pkgconfig/bigreqsproto.pc conflicts between attempted
installs of lib32-xorgproto-dev-2018.4-r0.i586 and
xorgproto-dev-2018.4-r0.corei7_64
and so on.
Signed-off-by: Jeremy Puhlman
---
meta/recipes-graphics/xorg-proto/xorg-proto-common.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
index 7a417c9..7377283 100644
--- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
+++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
DEPENDS = "util-macros"
inherit autotools pkgconfig
-EXTRA_OECONF = "--without-fop"
+EXTRA_OECONF = "--without-fop --datadir=${libdir}"
UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto
--with-xmlto"
--
2.6.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xorgproto: Install .pc files in ${libdir}/pkgconfig
On 6/11/2018 3:23 AM, Burton, Ross wrote:
Upstream will (and do) argue that $datadir is the right location as
these headers are architecture-independent.
Would the package manager do the right thing if the files didn't have
the libdir line in, so where bit-identical?
Yes, if the files are binary identical then the package manager would
not call it a conflict.
Ross
On 10 June 2018 at 20:01, Jeremy Puhlman wrote:
* --data dir config option is only used to install pkgconfig
* Installing into ${datadir} causes mutlilib conficts on install
file /usr/share/pkgconfig/applewmproto.pc conflicts between attempted
installs of lib32-xorgproto-dev-2018.4-r0.i586 and
xorgproto-dev-2018.4-r0.corei7_64
file /usr/share/pkgconfig/bigreqsproto.pc conflicts between attempted
installs of lib32-xorgproto-dev-2018.4-r0.i586 and
xorgproto-dev-2018.4-r0.corei7_64
and so on.
Signed-off-by: Jeremy Puhlman
---
meta/recipes-graphics/xorg-proto/xorg-proto-common.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
index 7a417c9..7377283 100644
--- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
+++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
DEPENDS = "util-macros"
inherit autotools pkgconfig
-EXTRA_OECONF = "--without-fop"
+EXTRA_OECONF = "--without-fop --datadir=${libdir}"
UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto"
--
2.6.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Jeremy A. Puhlman
jpuhl...@mvista.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
