harfbuzz: fix install of version.h

version.h is listed both in pkginclude_HEADERS (via $HBHEADERS) and nodist_pkginclude_HEADERS. This double listing is likely cause of the make install error: /usr/bin/install: cannot create regular file `.../harfbuzz/0.9.10-r0/image/usr/include/harfbuzz/hb-version.h': File exists Just remove the nodist_pkginclude_HEADERS entry. We're not creating the tarball, and listing version.h here wouldn't prevent the other listing from including it to tarball anyway. (From OE-Core rev: 1489a69cecb1dcc3502a4c24beaea81e6ca6dacc) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rpm: Ensure native binaries are correctly wrapped
2026-01-29 21:08:42 +01:00 · 2013-01-31 12:30:13 +00:00 · 2013-01-31 12:26:43 +00:00 · 2013-01-30 08:34:32 -08:00 · 2013-01-29 16:17:25 -08:00 · 2013-01-29 16:17:25 -08:00
6 changed files with 22 additions and 7 deletions
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -25,7 +25,7 @@ module_do_install() {
 	           modules_install
 }

-pkg_postinst_append () {
+pkg_postinst_${PN}_append () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
@@ -33,7 +33,7 @@ else
 fi
 }

-pkg_postrm_append () {
+pkg_postrm_${PN}_append () {
 if [ -z "$D" ]; then
 	depmod -a ${KERNEL_VERSION}
 else
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -108,7 +108,7 @@ fakeroot rootfs_rpm_do_rootfs () {
 	i=\$i
 	cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF
 #!/bin/sh
-for i in `ls /etc/rpm-postinsts/`; do
+for i in \`ls /etc/rpm-postinsts/\`; do
 	i=/etc/rpm-postinsts/$i
 	echo "Running postinst $i..."
 	if [ -f $i ] && $i; then
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -470,7 +470,7 @@ do_install_append_class-native() {
 		RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale

 	for rpm_binary in ${D}/${libdir}/rpm/bin/rpm*; do
-        	create_wrapper $rpm_binary
+        	create_wrapper $rpm_binary \
 			RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
 			RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
 			RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -32,8 +32,8 @@ COMPATIBLE_HOST_armv7a = 'arm.*-linux'

 inherit autotools

-EXTRA_OECONF = "--enable-tls"
-EXTRA_OECONF_armv7a = "--enable-tls -host=armv7-none-linux-gnueabi"
+EXTRA_OECONF = "--enable-tls --without-mpicc"
+EXTRA_OECONF_armv7a = "--enable-tls -host=armv7-none-linux-gnueabi --without-mpicc"
 EXTRA_OEMAKE = "-w"
 PARALLEL_MAKE = ""

--- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Pending
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd harfbuzz-0.9.10/src/Makefile.am harfbuzz-0.9.10/src/Makefile.am
+--- harfbuzz-0.9.10/src/Makefile.am	2012-12-19 03:39:27.000000000 +0200
+++ harfbuzz-0.9.10/src/Makefile.am	2013-01-25 11:55:23.946354729 +0200
+@@ -210,7 +210,6 @@
+ libharfbuzz_la_LIBADD = $(HBLIBS)
+ EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency)
+ pkginclude_HEADERS = $(HBHEADERS)
+-nodist_pkginclude_HEADERS = hb-version.h
+
+ CLEANFILES += harfbuzz.def
+ harfbuzz.def: $(HBHEADERS)
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \

 SECTION = "libs"

-PR = "r0"
+PR = "r1"

 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
           file://disable_graphite.patch \
+           file://avoid_double_version_h.patch \
 "

 SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7"
Author	SHA1	Message	Date
Marko Lindqvist	3ae1a4ba97	harfbuzz: fix install of version.h version.h is listed both in pkginclude_HEADERS (via $HBHEADERS) and nodist_pkginclude_HEADERS. This double listing is likely cause of the make install error: /usr/bin/install: cannot create regular file `.../harfbuzz/0.9.10-r0/image/usr/include/harfbuzz/hb-version.h': File exists Just remove the nodist_pkginclude_HEADERS entry. We're not creating the tarball, and listing version.h here wouldn't prevent the other listing from including it to tarball anyway. (From OE-Core rev: 1489a69cecb1dcc3502a4c24beaea81e6ca6dacc) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2013-01-31 12:30:13 +00:00
Richard Purdie	5e17deac79	rpm: Ensure native binaries are correctly wrapped (From OE-Core rev: 1cdeff2c50a13c7238543ee1e4e1eb60753120e2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2013-01-31 12:26:43 +00:00
Paul Eggleton	b47d0b23d9	valgrind: explicitly disable MPI2 support We don't have support for this in OE-Core, so ensure we don't pick this up from the build host if e.g. openmpi development files happen to be installed there. Fixes [YOCTO #3726]. (From OE-Core rev: cc490d76aba0a778409ca1a3d0e1f2c308684c9b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2013-01-30 08:34:32 -08:00
Saul Wold	8617f7eb15	module.bbclass: Don't add pkg_postinst/pkg_prerm to all packages in recipe The code in module.bbclass was appending the pkg_postinst and pkg_prerm to all packages that are part of a given recipe, meaning that the -lic, -dev, -doc, ... packages all got the scriptlet This change uses only which macthes with the RDEPENDS and FILES already used in module.bbclass. The failure was that rootfs creation would fail due to the -lic package being installed before the kernel and the script would fail. [YOCTO #3803] (From OE-Core rev: cf05c4578c99c0cb885cf2706f7f2b39b100aeb8) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2013-01-29 16:17:25 -08:00
Saul Wold	87017b554e	rootfs_rpm: Escape the backtick to ensure the ls runs on the target This change ensures that the ls /etc/rpm-postinsts runs in the target at first boot time, rather than at the creation time of the script on the host. This was causing the following error in the rootfs log: + install -d /srv/ssd/sgw/machines/fri2/tmp/work/fri2-poky-linux/core-image-minimal/1.0-r0/rootfs//etc/rcS.d + i= + ls /etc/rpm-postinsts/ ls: cannot access /etc/rpm-postinsts/: No such file or directory (From OE-Core rev: e893cf0b3843701e80f5c9f47be04d1a88e5ed68) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2013-01-29 16:17:25 -08:00