[PATCH 0/6] Multilib fixes

[PATCH 0/6] Multilib fixes

[Constantin Musca]

This is another set of multilib fixes.
The following changes since commit 4a36a32567ecfbc7ce7b967803e6e23314953ef5:

  libpng: fix packaging (2012-12-26 11:34:09 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib cmuscax/multilib4
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/multilib4

Constantin Musca (6):
  libpam: enable multilib
  vte: add missing unpackaged files
  package.bbclass: don't prepend MLPREFIX to LOCALEBASEPN
  eglibc-locale: enable multilib
  sysstat: fix sa_lib_dir
  rpm: replace /usr/lib with ${libdir}

 meta/classes/package.bbclass               |  2 +-
 meta/recipes-core/eglibc/eglibc-locale.inc |  4 ++--
 meta/recipes-devtools/rpm/rpm_5.4.9.bb     |  4 ++--
 meta/recipes-extended/pam/libpam_1.1.6.bb  | 15 ++++++++-------
 meta/recipes-extended/sysstat/sysstat.inc  |  6 +++++-
 meta/recipes-support/vte/vte.inc           |  3 ++-
 meta/recipes-support/vte/vte_0.28.2.bb     |  2 +-
 7 files changed, 21 insertions(+), 15 deletions(-)

-- 
1.7.11.7

[PATCH 1/6] libpam: enable multilib

[Constantin Musca]

Fix the following warning:
WARNING: QA Issue: lib32-libpam: Files/directories were installed but not shipped
  /usr/sbin/unix_chkpwd
  /usr/sbin/pam_tally2
  /usr/sbin/mkhomedir_helper
  /usr/sbin/unix_update
  /usr/sbin/pam_timestamp_check
  /usr/sbin/pam_tally

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index fae0467..93c98c0 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF = "--with-db-uniquename=_pam \
 
 CFLAGS_append = " -fPIC "
 
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/Linux-PAM-${PV}"
 
@@ -66,12 +66,13 @@ python populate_packages_prepend () {
     pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
 
     do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
-    pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd')
-    pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_update')
-    pam_plugin_append_file('pam-plugin-tally', pam_sbindir, 'pam_tally')
-    pam_plugin_append_file('pam-plugin-tally2', pam_sbindir, 'pam_tally2')
-    pam_plugin_append_file('pam-plugin-timestamp', pam_sbindir, 'pam_timestamp_check')
-    pam_plugin_append_file('pam-plugin-mkhomedir', pam_sbindir, 'mkhomedir_helper')
+    mlprefix = d.getVar('MLPREFIX', True) or ''
+    pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd')
+    pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update')
+    pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally')
+    pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2')
+    pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check')
+    pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper')
     do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
 }
 
-- 
1.7.11.7

[PATCH 2/6] vte: add missing unpackaged files

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-support/vte/vte.inc       | 3 ++-
 meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 0766da7..2d4e9aa 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -10,5 +10,6 @@ EXTRA_OECONF = "--disable-python --disable-introspection"
 
 PACKAGES =+ "libvte vte-termcap"
 FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
-FILES_vte-dbg =+ "${libexecdir}/.debug"
+FILES_vte-dbg =+ "${libexecdir}/.debug ${prefix}/src ${bindir}/.debug \
+               ${libdir}/.debug"
 FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
index 1fe66e7..9ad4a96 100644
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ b/meta/recipes-support/vte/vte_0.28.2.bb
@@ -2,7 +2,7 @@ require vte.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
 SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
-- 
1.7.11.7

[PATCH 3/6] package.bbclass: don't prepend MLPREFIX to LOCALEBASEPN

[Constantin Musca]

- all the recipes that overwrite LOCALEBASEPN must consider
also the MLPREFIX
- if the LOCALEBASEPN variable is not overwritten then it will
have the correct prefix (LOCALEBASEPN ??= "${PN}")

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9885d94..8a94e30 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -438,7 +438,7 @@ python package_do_split_locales() {
         return
 
     dvar = d.getVar('PKGD', True)
-    pn = "%s%s" % (d.getVar('MLPREFIX', True) or "", d.getVar('LOCALEBASEPN', True))
+    pn = d.getVar('LOCALEBASEPN', True)
 
     if pn + '-locale' in packages:
         packages.remove(pn + '-locale')
-- 
1.7.11.7

[PATCH 4/6] eglibc-locale: enable multilib

[Constantin Musca]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-core/eglibc/eglibc-locale.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 0381e26..d2b23de 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -1,7 +1,7 @@
 include eglibc-collateral.inc
 
 BPN = "eglibc"
-LOCALEBASEPN = "eglibc"
+LOCALEBASEPN = "${MLPREFIX}eglibc"
 
 # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
 # is set. The idea is to avoid running localedef on the target (at first boot)
@@ -20,7 +20,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips mips64"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r22"
+PR = "r23"
 
 PROVIDES = "virtual/libc-locale"
 
-- 
1.7.11.7

[PATCH 5/6] sysstat: fix sa_lib_dir

[Constantin Musca]

Fix the following warning:
WARNING: QA Issue: sysstat: Files/directories were installed but not shipped
  /usr/lib
  /usr/lib/sa
  /usr/lib/sa/sadc
  /usr/lib/sa/sa2
  /usr/lib/sa/sa1
  /usr/lib/sa/.debug
  /usr/lib/sa/.debug/sadc

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-extended/sysstat/sysstat.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 287bb54..863f246 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "The sysstat utilities are a collection of performance monitoring
 HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
 LICENSE = "GPLv2+"
 SECTION = "console/utils"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
 		   file://99_sysstat"
@@ -13,6 +13,10 @@ inherit autotools gettext
 EXTRA_OECONF += "--disable-sensors"
 EXTRA_OEMAKE += 'LFLAGS=""'
 
+do_configure_prepend() {
+    export sa_lib_dir=${libdir}/sa
+}
+
 do_install() {
 	autotools_do_install
 
-- 
1.7.11.7

[PATCH 6/6] rpm: replace /usr/lib with ${libdir}

[Constantin Musca]

Fix the following warning:
WARNING: QA Issue: rpm: Files/directories were installed but not shipped
  /usr/lib64/rpm/bin/api-sanity-checker.pl

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 088fc66..c916a42 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
-PR = "r60"
+PR = "r61"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...
@@ -445,7 +445,7 @@ do_install_append() {
 	rm -f ${D}/${libdir}/rpm/bin/pom2spec
 
 	rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj
-	rm -f ${D}/usr/lib/rpm/bin/api-sanity-checker.pl
+	rm -f ${D}/${libdir}/rpm/bin/api-sanity-checker.pl
 }
 
 do_install_append_class-native() {
-- 
1.7.11.7