* [PATCH 0/7] udev and multilib changes
@ 2012-12-17 9:16 Constantin Musca
2012-12-17 9:16 ` [PATCH 1/7] bitbake.conf: add nonarch_base_lib variable Constantin Musca
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
This patchset addresses the udevdir problem (some packages hardcode udevdir
to /lib/udev) by using a arch independent variable (nonarch_base_libdir). It also includes some multilib fixes.
The following changes since commit 958162e96b4a4f23bca94500b5f20975633dd5c6:
bitbake: hob: use base image only if it was set (2012-12-14 17:31:31 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib cmuscax/udev
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/udev
Constantin Musca (7):
bitbake.conf: add nonarch_base_lib variable
udev: replace base_libdir with nonarch_base_libdir
alsa-utils: Pass udev-rules-dir as parameter
pcmciautils: set correct udevdir and add missing debug files
bluez: set correct udevdir
polkit: fix multilib packaging issue
psplash: enable multilib
meta/classes/staging.bbclass | 4 ++++
meta/conf/bitbake.conf | 1 +
meta/recipes-bsp/pcmciautils/pcmciautils.inc | 3 ++-
meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 6 +++---
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 6 +++---
meta/recipes-core/psplash/psplash_git.bb | 16 +++++++++------
meta/recipes-core/udev/udev.inc | 24 +++++++++++------------
meta/recipes-core/udev/udev_182.bb | 2 +-
meta/recipes-extended/polkit/polkit_0.104.bb | 12 ++++++------
meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb | 6 +++---
10 files changed, 45 insertions(+), 35 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/7] bitbake.conf: add nonarch_base_lib variable
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
2012-12-17 9:16 ` [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir Constantin Musca
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
Adapt stagging.bbclass to this change
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/classes/staging.bbclass | 4 ++++
meta/conf/bitbake.conf | 1 +
2 files changed, 5 insertions(+)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 82624cb..1a078b4 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -50,6 +50,10 @@ sysroot_stage_dirs() {
then
sysroot_stage_libdir $from${base_libdir} $to${base_libdir}
fi
+ if [ -d $from${nonarch_base_libdir} ]
+ then
+ sysroot_stage_libdir $from${nonarch_base_libdir} $to${nonarch_base_libdir}
+ fi
sysroot_stage_dir $from${datadir} $to${datadir}
# We don't care about docs/info/manpages/locales
rm -rf $to${mandir}/ $to${docdir}/ $to${infodir}/ ${to}${datadir}/locale/
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index be3bfc2..a2d3abe 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -21,6 +21,7 @@ export exec_prefix = "/usr"
export base_bindir = "${base_prefix}/bin"
export base_sbindir = "${base_prefix}/sbin"
export base_libdir = "${base_prefix}/${baselib}"
+export nonarch_base_libdir = "${base_prefix}/lib"
# Architecture independent paths
export datadir = "${prefix}/share"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
2012-12-17 9:16 ` [PATCH 1/7] bitbake.conf: add nonarch_base_lib variable Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
2012-12-17 17:28 ` Richard Purdie
2012-12-17 9:16 ` [PATCH 3/7] alsa-utils: Pass udev-rules-dir as parameter Constantin Musca
` (4 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/recipes-core/udev/udev.inc | 24 ++++++++++++------------
meta/recipes-core/udev/udev_182.bb | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 4705b9b..9f83821 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -32,16 +32,16 @@ inherit autotools pkgconfig update-rc.d
# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
sbindir = "${base_sbindir}"
-libexecdir = "${base_libdir}"
+libexecdir = "${nonarch_base_libdir}"
EXTRA_OECONF = "--disable-introspection \
- --with-rootlibdir=${base_libdir} \
+ --with-rootlibdir=${nonarch_base_libdir} \
--with-pci-ids-path=${datadir}/pci.ids \
ac_cv_file__usr_share_pci_ids=no \
ac_cv_file__usr_share_hwdata_pci_ids=no \
ac_cv_file__usr_share_misc_pci_ids=yes \
--sbindir=${base_sbindir} \
- --libexecdir=${base_libdir} \
- --with-rootlibdir=${base_libdir} \
+ --libexecdir=${nonarch_base_libdir} \
+ --with-rootlibdir=${nonarch_base_libdir} \
--with-rootprefix= \
"
@@ -59,20 +59,20 @@ FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
RRECOMMENDS_${PN} += "udev-utils"
FILES_${PN}-dbg += "${libexecdir}/.debug"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
+FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/"
+FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
-FILES_libudev = "${base_libdir}/libudev.so.*"
-FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
+FILES_libudev = "${nonarch_base_libdir}/libudev.so.*"
+FILES_libudev-dbg = "${nonarch_base_libdir}/.debug/libudev.so.*"
FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
-FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
-FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
+FILES_libgudev = "${nonarch_base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
+FILES_libgudev-dbg = "${nonarch_base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
-FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
+FILES_udev-acl = "${nonarch_base_libdir}/udev/udev-acl ${nonarch_base_libdir}/udev/rules.d/70-acl.rules"
FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
@@ -94,7 +94,7 @@ do_install_append () {
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
# hid2hci has moved to bluez4. removed in udev as of version 169
- rm -f ${D}${base_libdir}/udev/hid2hci
+ rm -f ${D}${nonarch_base_libdir}/udev/hid2hci
echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
}
diff --git a/meta/recipes-core/udev/udev_182.bb b/meta/recipes-core/udev/udev_182.bb
index c41de9f..0ae9f8c 100644
--- a/meta/recipes-core/udev/udev_182.bb
+++ b/meta/recipes-core/udev/udev_182.bb
@@ -1,6 +1,6 @@
include udev.inc
-PR = "r2"
+PR = "r3"
# module-init-tools from kmod_git will provide libkmod runtime
DEPENDS += "module-init-tools"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/7] alsa-utils: Pass udev-rules-dir as parameter
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
2012-12-17 9:16 ` [PATCH 1/7] bitbake.conf: add nonarch_base_lib variable Constantin Musca
2012-12-17 9:16 ` [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
2012-12-17 9:16 ` [PATCH 4/7] pcmciautils: set correct udevdir and add missing debug files Constantin Musca
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
Fix the following warning:
WARNING: QA Issue: alsa-utils: Files/directories were installed but not shipped
/lib
/lib/udev
/lib/udev/rules.d
/lib/udev/rules.d/90-alsa-restore.rules
[YOCTO #3440]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
index 597e8b6..4990eb0 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
file://ncursesfix.patch \
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb61570
# http://bugs.openembedded.org/show_bug.cgi?id=2348
# please close bug and remove this comment when properly fixed
#
-EXTRA_OECONF = "--disable-xmlto"
+EXTRA_OECONF = "--disable-xmlto --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
inherit autotools gettext
@@ -61,7 +61,7 @@ FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bind
FILES_alsa-utils-aconnect = "${bindir}/aconnect"
FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
FILES_alsa-utils-iecset = "${bindir}/iecset"
-FILES_alsa-utils-alsactl = "${sbindir}/alsactl ${base_libdir}/udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
+FILES_alsa-utils-alsactl = "${sbindir}/alsactl ${nonarch_base_libdir}/udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
FILES_alsa-utils-aseqdump = "${bindir}/aseqdump"
FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
FILES_alsa-utils-alsaloop = "${bindir}/alsaloop"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/7] pcmciautils: set correct udevdir and add missing debug files
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
` (2 preceding siblings ...)
2012-12-17 9:16 ` [PATCH 3/7] alsa-utils: Pass udev-rules-dir as parameter Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
2012-12-17 9:16 ` [PATCH 5/7] bluez: set correct udevdir Constantin Musca
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
Fix the following warning:
WARNING: QA Issue: pcmciautils: Files/directories were installed but not shipped
/usr/lib
/usr/lib/udev
/usr/lib/udev/pcmcia-socket-startup
/usr/lib/udev/pcmcia-check-broken-cis
/usr/lib/udev/.debug
/usr/lib/udev/.debug/pcmcia-socket-startup
/usr/lib/udev/.debug/pcmcia-check-broken-cis
[YOCTO #3440]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/recipes-bsp/pcmciautils/pcmciautils.inc | 3 ++-
meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index fa35daf..24231f5 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -16,7 +16,8 @@ export HOSTCC = "${BUILD_CC}"
export etcdir = "${sysconfdir}"
export sbindir = "${base_sbindir}"
export pcmciaconfdir = "${sysconfdir}/pcmcia"
-export udevrulesdir = "${sysconfdir}/udev/rules.d"
+export udevdir = "${nonarch_base_libdir}/udev"
+export udevrulesdir = "${nonarch_base_libdir}/udev/rules.d"
export UDEV = "1"
LD = "${CC}"
CFLAGS =+ "-I${S}/src"
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 202437a..3dd8a0d 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -5,7 +5,7 @@ SRC_URI += "file://makefile_fix.patch"
SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
-PR = "r0"
+PR = "r1"
-FILES_${PN}-dbg += "${libdir}/udev/.debug"
-FILES_${PN} += "${libdir}/udev"
+FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug"
+FILES_${PN} += "${nonarch_base_libdir}/udev"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/7] bluez: set correct udevdir
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
` (3 preceding siblings ...)
2012-12-17 9:16 ` [PATCH 4/7] pcmciautils: set correct udevdir and add missing debug files Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
2012-12-17 9:16 ` [PATCH 6/7] polkit: fix multilib packaging issue Constantin Musca
2012-12-17 9:16 ` [PATCH 7/7] psplash: enable multilib Constantin Musca
6 siblings, 0 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
Fix the following warning:
WARNING: QA Issue: bluez4: Files/directories were installed but not shipped
/lib/udev/hid2hci
/lib/udev/.debug
/lib/udev/.debug/hid2hci
[YOCTO #3438]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index f1a2fe7..8f5fa9d 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -1,6 +1,6 @@
require bluez4.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://bluetooth.conf \
file://sbc_mmx.patch"
@@ -22,7 +22,7 @@ ALLOW_EMPTY_libasound-module-bluez = "1"
PACKAGES =+ "libasound-module-bluez"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
+FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
${libdir}/alsa-lib/*.la \
@@ -31,5 +31,5 @@ FILES_${PN}-dev += "\
FILES_${PN}-dbg += "\
${libdir}/bluetooth/plugins/.debug \
${libdir}/*/.debug \
- ${base_libdir}/udev/.debug \
+ ${nonarch_base_libdir}/udev/.debug \
"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/7] polkit: fix multilib packaging issue
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
` (4 preceding siblings ...)
2012-12-17 9:16 ` [PATCH 5/7] bluez: set correct udevdir Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
2012-12-17 9:16 ` [PATCH 7/7] psplash: enable multilib Constantin Musca
6 siblings, 0 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
- use BPN instead of PN (PN includes MLPREFIX)
- fix the following warning:
WARNING: QA Issue: lib32-polkit: Files/directories were installed but not shipped
/usr/share/polkit-1
/usr/share/polkit-1/actions
/usr/share/polkit-1/actions/org.freedesktop.policykit.policy
/usr/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
/usr/lib/polkit-1
/usr/lib/polkit-1/extensions
/usr/lib/polkit-1/extensions/libnullbackend.so
/usr/lib/polkit-1/extensions/libnullbackend.a
/usr/lib/polkit-1/extensions/libnullbackend.la
/usr/lib/polkit-1/extensions/.debug
/usr/lib/polkit-1/extensions/.debug/libnullbackend.so
[YOCTO #3438]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/recipes-extended/polkit/polkit_0.104.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 67c375a..74b5379 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -10,7 +10,7 @@ DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
-PR = "r7"
+PR = "r8"
PAM_SRC_URI = "file://polkit-1_pam.patch"
SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
@@ -27,12 +27,12 @@ EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspectio
inherit autotools gtk-doc pkgconfig
do_install_append() {
- rm -f ${D}${libdir}/${PN}-1/extensions/*.a
+ rm -f ${D}${libdir}/${BPN}-1/extensions/*.a
}
-FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
- ${datadir}/${PN}-1/actions/* \
+FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \
+ ${datadir}/${BPN}-1/actions/* \
${datadir}/dbus-1/system-services/*"
-FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so"
-FILES_${PN}-dev += "${libdir}/${PN}-1/extensions/*.la "
+FILES_${PN}-dbg += "${libdir}/${BPN}-1/extensions/.debug/*.so"
+FILES_${PN}-dev += "${libdir}/${BPN}-1/extensions/*.la "
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/7] psplash: enable multilib
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
` (5 preceding siblings ...)
2012-12-17 9:16 ` [PATCH 6/7] polkit: fix multilib packaging issue Constantin Musca
@ 2012-12-17 9:16 ` Constantin Musca
6 siblings, 0 replies; 9+ messages in thread
From: Constantin Musca @ 2012-12-17 9:16 UTC (permalink / raw)
To: openembedded-core
[YOCTO #3438]
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
meta/recipes-core/psplash/psplash_git.bb | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 7c033e7..272b732 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85b
SRCREV = "de9979aefbc56af59b4d236a4b63dd19dcdcfb53"
PV = "0.1+git${SRCPV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://psplash-init \
@@ -50,13 +50,17 @@ python __anonymous() {
d.appendVar("DEPENDS", " gdk-pixbuf-native")
d.prependVar("PACKAGES", "%s " % (" ".join(pkgs)))
+ mlprefix = d.getVar('MLPREFIX', True) or ''
+ pn = d.getVar('PN', True) or ''
for p in pkgs:
- d.setVar("FILES_%s" % p, "${bindir}/%s" % p)
- d.setVar("ALTERNATIVE_%s" % p, 'psplash')
- d.setVarFlag("ALTERNATIVE_TARGET_%s" % p, 'psplash', '${bindir}/%s' % p)
- d.appendVar("RDEPENDS_%s" % p, " ${PN}")
+ ep = '%s%s' % (mlprefix, p)
+ epsplash = '%s%s' % (mlprefix, 'psplash')
+ d.setVar("FILES_%s" % ep, "${bindir}/%s" % p)
+ d.setVar("ALTERNATIVE_%s" % ep, epsplash)
+ d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, epsplash, '${bindir}/%s' % p)
+ d.appendVar("RDEPENDS_%s" % ep, " %s%s" % (mlprefix, pn))
if p == "psplash-default":
- d.appendVar("RRECOMMENDS_${PN}", " %s" % p)
+ d.appendVar("RRECOMMENDS_%s%s" % (mlprefix, pn), " %s" % ep)
}
S = "${WORKDIR}/git"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir
2012-12-17 9:16 ` [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir Constantin Musca
@ 2012-12-17 17:28 ` Richard Purdie
0 siblings, 0 replies; 9+ messages in thread
From: Richard Purdie @ 2012-12-17 17:28 UTC (permalink / raw)
To: Constantin Musca; +Cc: openembedded-core
On Mon, 2012-12-17 at 11:16 +0200, Constantin Musca wrote:
> Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> ---
> meta/recipes-core/udev/udev.inc | 24 ++++++++++++------------
> meta/recipes-core/udev/udev_182.bb | 2 +-
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
> index 4705b9b..9f83821 100644
> --- a/meta/recipes-core/udev/udev.inc
> +++ b/meta/recipes-core/udev/udev.inc
> @@ -32,16 +32,16 @@ inherit autotools pkgconfig update-rc.d
>
> # udevd/udevadm -> /sbin/, libudev.so.* -> /lib/
> sbindir = "${base_sbindir}"
> -libexecdir = "${base_libdir}"
> +libexecdir = "${nonarch_base_libdir}"
> EXTRA_OECONF = "--disable-introspection \
> - --with-rootlibdir=${base_libdir} \
> + --with-rootlibdir=${nonarch_base_libdir} \
> --with-pci-ids-path=${datadir}/pci.ids \
> ac_cv_file__usr_share_pci_ids=no \
> ac_cv_file__usr_share_hwdata_pci_ids=no \
> ac_cv_file__usr_share_misc_pci_ids=yes \
> --sbindir=${base_sbindir} \
> - --libexecdir=${base_libdir} \
> - --with-rootlibdir=${base_libdir} \
> + --libexecdir=${nonarch_base_libdir} \
> + --with-rootlibdir=${nonarch_base_libdir} \
> --with-rootprefix= \
> "
>
> @@ -59,20 +59,20 @@ FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
> RRECOMMENDS_${PN} += "udev-utils"
>
> FILES_${PN}-dbg += "${libexecdir}/.debug"
> -FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
> -FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
> +FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/"
> +FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
> FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
> -FILES_libudev = "${base_libdir}/libudev.so.*"
> -FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
> +FILES_libudev = "${nonarch_base_libdir}/libudev.so.*"
> +FILES_libudev-dbg = "${nonarch_base_libdir}/.debug/libudev.so.*"
> FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
> ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
> -FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
> -FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
> +FILES_libgudev = "${nonarch_base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
> +FILES_libgudev-dbg = "${nonarch_base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
> FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
> ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
> FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
>
> -FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
> +FILES_udev-acl = "${nonarch_base_libdir}/udev/udev-acl ${nonarch_base_libdir}/udev/rules.d/70-acl.rules"
This doesn't look right.
Binaries and libraries need to go into ${base_libdir}, rules and other
files that don't vary by architecture need to go into
${nonarch_base_libdir}.
Cheers,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-12-17 17:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-17 9:16 [PATCH 0/7] udev and multilib changes Constantin Musca
2012-12-17 9:16 ` [PATCH 1/7] bitbake.conf: add nonarch_base_lib variable Constantin Musca
2012-12-17 9:16 ` [PATCH 2/7] udev: replace base_libdir with nonarch_base_libdir Constantin Musca
2012-12-17 17:28 ` Richard Purdie
2012-12-17 9:16 ` [PATCH 3/7] alsa-utils: Pass udev-rules-dir as parameter Constantin Musca
2012-12-17 9:16 ` [PATCH 4/7] pcmciautils: set correct udevdir and add missing debug files Constantin Musca
2012-12-17 9:16 ` [PATCH 5/7] bluez: set correct udevdir Constantin Musca
2012-12-17 9:16 ` [PATCH 6/7] polkit: fix multilib packaging issue Constantin Musca
2012-12-17 9:16 ` [PATCH 7/7] psplash: enable multilib Constantin Musca
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox