kernel-yocto: add CCACHE_DIR dependency to do_kernel_configme

[YOCTO #1350]

Since do_kernel_configme is added before the standard do_configure task
we needed to add CCACHE_DIR so when the kernel builds it's host configure
tools the CCACHE_DIR exists.

Signed-off-by: Saul Wold <sgw@linux.intel.com>

meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb

@@ -1,6 +1,6 @@
 DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
 HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz"
+SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz"
 LICENSE = "GPLv2.1"
 DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
 

meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb

@@ -5,6 +5,6 @@ LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gnutls libcheck"
 PR = "r2"
 
-SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2"
 
 inherit autotools pkgconfig

meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc

@@ -2,7 +2,7 @@ DEPENDS = "libopensync (>= 0.36)"
 
 DESCRIPTION ?= "OpenSync plugin"
 
-SRC_URI = "http://opensync.org/download/releases/${PV}/${P}.tar.bz2"
+SRC_URI = "http://opensync.org/download/releases/${PV}/${BPN}-${PV}.tar.bz2"
 
 inherit cmake
 

meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb

@@ -5,7 +5,7 @@ HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
 LICENSE = "LGPLv2"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${BPN}-${PV}.tar.gz \
 "
 
 inherit autotools

meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb

@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
 LICENSE = "LGPL"
 
 # gabble.manager needs to get regenerated every release, so please don't copy it over blindly
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${BPN}-${PV}.tar.gz \
            file://gabble.manager"
 
 inherit autotools pkgconfig

meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb

@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 
 DEPENDS = "libxml2 sed-native expat"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${P}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${BPN}-${PV}.tar.gz \
 	   file://no-doc-install.patch;patch=1"
 
 inherit autotools pkgconfig

meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb

@@ -4,7 +4,7 @@ DEPENDS = "gtk+"
 DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r2"
 
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
+SRC_URI = "http://download.gnome.org/sources/${BPN}/5.7/${BPN}-${PV}.tar.gz \
         file://makefile-fix.diff;patch=1\
 	file://fix-includedir.patch;patch=1"
 

meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb

@@ -4,7 +4,7 @@ DEPENDS = "gtk+ gnome-doc-utils"
 DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r0"
 
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
+SRC_URI = "http://download.gnome.org/sources/${BPN}/5.8/${BPN}-${PV}.tar.gz \
 	file://fix-includedir.patch;patch=1"
 
 inherit autotools pkgconfig

meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb

@@ -6,7 +6,7 @@ PR = "r2"
 
 inherit autotools
 
-SRC_URI = "http://burtonini.com/temp/${PN}-${PV}.tar.gz \
+SRC_URI = "http://burtonini.com/temp/${BPN}-${PV}.tar.gz \
 	file://gtkstylus.sh"
 
 do_install_append() {

meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb

@@ -9,6 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
 
 EXTRA_OECONF = ""

meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb

@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade"
 PR = "r4"
 
-SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://jabberstudio.2nw.net/${BPN}/${BPN}-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
            file://fix-desktop-file.patch;patch=0 \
            file://gcc4.patch;patch=1"

meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb

@@ -7,7 +7,7 @@ PV = "0.3+git${SRCPV}"
 
 LIC_FILES_CHKSUM = "file://configure.ac;endline=7;md5=3c4e087662e37f10e469425f3a0ad225"
 
-SRC_URI = "git://git.yoctoproject.org/${PN};protocol=git"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig

meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code bas
 LICENSE = "Adobe"
 PR = "r0"
 
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+SRC_URI = "http://poppler.freedesktop.org/${BPN}-${PV}.tar.gz"
 
 do_compile() {
 }

meta-demoapps/recipes-support/poppler/poppler.inc

@@ -3,7 +3,7 @@ DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+SRC_URI = "http://poppler.freedesktop.org/${BPN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 

meta-yocto/conf/machine/atom-pc.conf

@@ -28,7 +28,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
 
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
 APPEND += "usbcore.autosuspend=1"
 

meta/classes/autotools.bbclass

@@ -111,8 +111,13 @@ autotools_do_configure() {
 			if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then
 				acpaths="$acpaths -I${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV"
 			fi
+			# The aclocal directory could get modified by other processes 
+			# uninstalling data from the sysroot. See Yocto #861 for details.
+			# We avoid this by taking a copy here and then files cannot disappear.
 			if [ -d ${STAGING_DATADIR}/aclocal ]; then
-				acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal"
+				mkdir -p ${B}/aclocal-copy/
+				cp ${STAGING_DATADIR}/aclocal/* ${B}/aclocal-copy/
+				acpaths="$acpaths -I ${B}/aclocal-copy/"
 			fi
 			# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
 			# like it was auto-generated.  Work around this by blowing it away

meta/classes/kernel-yocto.bbclass

@@ -83,6 +83,7 @@ do_kernel_checkout[dirs] = "${S}"
 
 addtask kernel_checkout before do_patch after do_unpack
 
+do_kernel_configme[dirs] = "${CCACHE_DIR} ${S} ${B}"
 do_kernel_configme() {
 	echo "[INFO] doing kernel configme"
 

meta/classes/libc-package.bbclass

@@ -191,7 +191,7 @@ python package_do_split_gconvs () {
 
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \
 		description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
-	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bpn + '-gconv', d)
+	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bb.data.getVar('MLPREFIX', d) + bpn + '-gconv', d)
 
 	use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
 

meta/classes/package_rpm.bbclass

@@ -501,6 +501,10 @@ python write_specfile () {
 		splitrconflicts  = bb.data.getVar('RCONFLICTS', localdata, True) or ""
 		splitrobsoletes  = []
 
+		# For now we need to manually supplement RPROVIDES with any update-alternatives links
+		if pkg == d.getVar("PN", True):
+			splitrprovides = splitrprovides + " " + (d.getVar('ALTERNATIVE_LINK', True) or '') + " " + (d.getVar('ALTERNATIVE_LINKS', True) or '')
+
 		# Gather special src/first package data
 		if srcname == splitname:
 			srcrdepends    = splitrdepends

meta/conf/bitbake.conf

@@ -728,7 +728,7 @@ TARGET_ARCH[unexport] = "1"
 DISTRO[unexport] = "1"
 
 # Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
-TRANSLATED_TARGET_ARCH ??= ${TARGET_ARCH}
+TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
 
 # Setup our default hash policy
 BB_SIGNATURE_HANDLER ?= "basic"

meta/conf/machine/qemux86-64.conf

@@ -2,9 +2,6 @@
 #@NAME: common_pc
 #@DESCRIPTION: Machine configuration for running a common x86
 
-TARGET_ARCH = "x86_64"
-TRANSLATED_TARGET_ARCH = "x86-64"
-
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"

meta/recipes-bsp/powervr-drivers/omap3-sgx-modules_1.3.13.1397.bb

@@ -5,7 +5,7 @@ inherit module
 
 SRC_URI = "http://dominion.thruhere.net/koen/OE/omap3-sgx-modules-1.3.13.1397.tar.bz2"
 
-S = ${WORKDIR}/${PN}-${PV}/eurasiacon/build/linux/omap3430_linux/kbuild/
+S = ${WORKDIR}/${BPN}-${PV}/eurasiacon/build/linux/omap3430_linux/kbuild/
 
 MAKE_TARGETS = "BUILD=debug"
 
@@ -13,5 +13,5 @@ COMPATIBLE_MACHINE = "(omap-3430ldp|omap-3430sdp|beagleboard|overo)"
 
 do_install() {
 	mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu
-	cp ${WORKDIR}/${PN}-${PV}/eurasiacon/binary_omap3430_linux_debug/*.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu	
+	cp ${WORKDIR}/${BPN}-${PV}/eurasiacon/binary_omap3430_linux_debug/*.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/gpu	
 }

meta/recipes-bsp/zaurusd/zaurusd_svn.bb

@@ -11,7 +11,7 @@ PR = "r3"
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
 	file://fix_makefile.patch"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

meta/recipes-connectivity/galago/galago-daemon_0.5.1.bb

@@ -5,7 +5,7 @@ LICENSE =       "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS =       "libgalago dbus glib-2.0"
 
-SRC_URI =       "http://www.galago-project.org/files/releases/source/${BPN}/${P}.tar.gz "
+SRC_URI =       "http://www.galago-project.org/files/releases/source/${BPN}/${BPN}-${PV}.tar.gz "
 
 SRC_URI[md5sum] = "fdb81f938f86f380b127158ebb542279"
 SRC_URI[sha256sum] = "db42a0d1d0f8b069ea5ac1203207f9178f25ac1367f4910bd48547f5be1db4c2"

meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb

@@ -2,7 +2,7 @@ require iproute2.inc
 
 PR = "r0"
 
-SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \
+SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${BPN}-${PV}.tar.bz2 \
 	   file://configure-cross.patch"
 
 SRC_URI[md5sum] = "a243bfea837e71824b7ca26c3bb45fa8"

meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "avahi"
 RDEPENDS_${PN} = "avahi-daemon"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
 
@@ -21,7 +21,7 @@ inherit autotools
 LEAD_SONAME = "libnss_mdns.so"
 DEBIANNAME_${PN} = "libnss-mdns"
 
-EXTRA_OECONF = "--libdir=/lib --disable-lynx --enable-avahi"
+EXTRA_OECONF = "--libdir=${base_libdir} --disable-lynx --enable-avahi"
 
 # TODO: pattern based configuration update
 pkg_postinst_${PN} () {

meta/recipes-connectivity/ofono/ofono_0.50.bb

@@ -2,7 +2,7 @@ require ofono.inc
 
 PR = "r1"
 
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \
+SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
 	          file://ofono"
 
 EXTRA_OECONF += "\

meta/recipes-connectivity/telepathy/telepathy-glib_0.14.3.bb

@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
 LICENSE = "LGPLv2.1+"
 PR = "r0"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "fe9a4f781651593fd4afddb343ff50bf"
 SRC_URI[sha256sum] = "62e759084355ac0fce61feb561a7535a6707b223f0d1e4305fd47c83fa5494d0"

meta/recipes-connectivity/telepathy/telepathy-idle_0.1.8.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
 PR = "r0"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "82f5eafa07df5e1abc785061143bbfd2"
 SRC_URI[sha256sum] = "384119cc64022626b6f51aaaef605abf248602d8fae25baff82762a097f20fe9"

meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 RDEPENDS_${PN} += "python-dbus"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${P}.tar.gz \
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
            file://parallel_make.patch"
 
 PR = "r2"

meta/recipes-core/dbus-wait/dbus-wait_svn.bb

@@ -11,6 +11,6 @@ PR = "r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=dbus-wait;proto=http"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 inherit autotools

meta/recipes-core/eglibc/eglibc-locale.inc

@@ -41,7 +41,10 @@ PACKAGES_DYNAMIC = "locale-base-* \
 
 DESCRIPTION_localedef = "eglibc: compile locale definition files"
 
-FILES_eglibc-gconv = "${libdir}/gconv/*"
+# eglibc-gconv is dynamically added into PACKAGES, thus
+# FILES_eglibc-gconv will not be automatically extended in multilib.
+# Explicitly add ${MLPREFIX} for FILES_eglibc-gconv.
+FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*"
 FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
 FILES_localedef${PKGSUFFIX} = "${bindir}/localedef"
 

meta/recipes-core/eglibc/eglibc-package.inc

@@ -56,10 +56,10 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba
 FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
 FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
 FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
-FILES_libcidn{PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
+FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
-FILES_libmemusage{PKGSUFFIX} = "${base_libdir}/libmemusage.so"
+FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so"
-FILES_eglibc-extra-nss{PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
+FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
-FILES_sln{PKGSUFFIX} = "/sbin/sln"
+FILES_sln${PKGSUFFIX} = "/sbin/sln"
 FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
 FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
 FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*.a \

meta/recipes-core/eglibc/eglibc_2.12.bb

@@ -1,7 +1,7 @@
 require eglibc.inc
 
 DEPENDS += "gperf-native"
-PR = "r20"
+PR = "r21"
 
 SRCREV = "14158"
 

meta/recipes-core/eglibc/eglibc_2.13.bb

@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "14157"
 
 DEPENDS += "gperf-native"
-PR = "r9"
+PR = "r10"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"

meta/recipes-core/glib-networking/glib-networking_2.28.7.bb

@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 gnutls"
 
 PR = "r0"
 
-SRC_URI = "${GNOME_MIRROR}/${PN}/2.28/${PN}-${PV}.tar.bz2"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/2.28/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "c10e51571d03c10111a37bcd21fbf777"
 SRC_URI[sha256sum] = "98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c"

meta/recipes-devtools/automake/automake.inc

@@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
 

meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch

@@ -0,0 +1,41 @@
+When the user has a UID or GID that is larger than the ustar format
+supports, pax does not error out gracefully in some cases (FC13).  In
+this case cpio does.
+
+See for more details: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8343
+
+Additionally drop tar.m4 out of that part of the Makefile or we end up in
+a fatal attempt to regen loop:
+
+CDPATH="${ZSH_VERSION+.}:" && cd . && perllibdir="automake-1.11.1/lib:./lib" "automake-1.11.1/aclocal" --acdir=m4 -I m4
+/bin/sh: automake-1.11.1/aclocal: No such file or directory
+make: *** [aclocal.m4] Error 127
+
+Signed-off-by: Tom Rini <tom_rini@mentor.com>
+
+Index: automake-1.11.1/m4/tar.m4
+===================================================================
+--- automake-1.11.1.orig/m4/tar.m4
++++ automake-1.11.1/m4/tar.m4
+@@ -30,7 +30,7 @@ m4_if([$1], [v7],
+               [m4_fatal([Unknown tar format])])
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+ # Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+ # Do not fold the above two line into one, because Tru64 sh and
+ # Solaris sh will not grok spaces in the rhs of `-'.
+Index: automake-1.11.1/Makefile.in
+===================================================================
+--- automake-1.11.1.orig/Makefile.in
++++ automake-1.11.1/Makefile.in
+@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ 	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
+ 	$(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
+ 	$(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
+-	$(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
++	$(top_srcdir)/m4/substnot.m4 \
+ 	$(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)

meta/recipes-devtools/automake/automake_1.11.1.bb

@@ -32,7 +32,8 @@ RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
 PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
 PATHFIXPATCH_virtclass-native = ""
 
-SRC_URI += "${PATHFIXPATCH}"
+SRC_URI += "${PATHFIXPATCH} \
+	    file://prefer-cpio-over-pax-for-ustar-archives.patch"
 
 SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
 SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"

meta/recipes-devtools/distcc/distcc_2.18.3.bb

@@ -14,7 +14,7 @@ RRECOMMENDS_${PN} = "avahi-daemon"
 
 # Upstream change this patch periodically so store locally
 # http://0pointer.de/public/distcc-avahi.patch
-SRC_URI = "http://distcc.googlecode.com/files/${PN}-${PV}.tar.bz2 \
+SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
            file://distcc-avahi.patch \	  
            file://makefile-param-order.patch \
 	   file://default \

meta/recipes-devtools/gcc/gcc-4.6.inc

@@ -1,6 +1,6 @@
 require gcc-common.inc
 
-PR = "r2"
+PR = "r3"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.6.0

meta/recipes-devtools/gcc/gcc-configure-common.inc

@@ -64,11 +64,15 @@ SYSTEMLIBS1 = "${target_libdir}/"
 do_configure_prepend () {
 	# Change the default dynamic linker path, only useful for SDK, other's value
 	# are not changed according to the SYSTEMLIBS_DIR
+	#
+	# We want something like the following:
+	# 	#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+	# becomes
+	#	#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
+	#
 	sed -i ${S}/gcc/config/*/linux*.h -e \
-		's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'
+		's#\(GLIBC_DYNAMIC_LINKER[^ ]*\) \( *"/lib.*\)/\(.*\)#\1 SYSTEMLIBS_DIR "\3#'
 
-	SYSTEMLIBS_DIR=`dirname ${SYSTEMLIBS}`
-	[ "$SYSTEMLIBS_DIR" = "/" ] && SYSTEMLIBS_DIR=""
 	# teach gcc to find correct target includedir when checking libc ssp support
 	mkdir -p ${B}/gcc
 	echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
@@ -83,7 +87,7 @@ do_configure_prepend () {
 #ifndef STANDARD_STARTFILE_PREFIX_2
 #define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
 #endif
-#define SYSTEMLIBS_DIR "$SYSTEMLIBS_DIR"
+#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
 #endif /* ! GCC_DEFAULTS_H */
 _EOF
 	mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h

meta/recipes-devtools/gcc/gcc_4.5.1.bb

@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc

meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb

@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

meta/recipes-devtools/python/python_2.6.6.bb

@@ -116,8 +116,8 @@ FILES_${PN}-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
 FILES_${PN}-core += "${bindir}/2to3"
 
 # package libpython2
-PACKAGES =+ "lib${PN}2"
+PACKAGES =+ "lib${BPN}2"
-FILES_lib${PN}2 = "${libdir}/libpython*.so.*"
+FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
 
 # additional stuff -dev
 

meta/recipes-devtools/subversion/subversion_1.6.15.bb

@@ -7,7 +7,7 @@ HOMEPAGE = "http://subversion.tigris.org"
 
 PR = "r0"
 
-SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
 	   file://neon-detection.patch;patch=1 \
 	   file://libtool2.patch;patch=1"

meta/recipes-extended/augeas/augeas.inc

@@ -11,15 +11,15 @@ DEPENDS = "readline"
 
 inherit autotools
 
-PACKAGES =+ "${PN}-lenses lib${PN} lib${PN}-dev lib${PN}-dbg"
+PACKAGES =+ "${PN}-lenses lib${BPN} lib${BPN}-dev lib${BPN}-dbg"
 
 FILES_${PN}-lenses = "${datadir}/augeas/lenses"
-FILES_lib${PN} = "${libdir}/*.so.*"
+FILES_lib${BPN} = "${libdir}/*.so.*"
-FILES_lib${PN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
+FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
-FILES_lib${PN}-dbg = "${libdir}/.debug"
+FILES_lib${BPN}-dbg = "${libdir}/.debug"
 
-RDEPENDS_lib${PN} += "${PN}-lenses"
+RDEPENDS_lib${BPN} += "${PN}-lenses"
-RRECOMMENDS_lib${PN} += "${PN}"
+RRECOMMENDS_lib${BPN} += "${PN}"
 
 LEAD_SONAME = "libaugeas.so"
 

meta/recipes-extended/blktool/blktool_4-6.bb

@@ -19,6 +19,6 @@ SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e0680
 SRC_URI[patch.md5sum] = "2d1bc2f2c38b65d47e27da7c7508d17f"
 SRC_URI[patch.sha256sum] = "999f2062203e389327d997724621be37bea9c98fa226238f9f4eb4a6ea25bd4b"
 
-S = "${WORKDIR}/${PN}-4.orig"
+S = "${WORKDIR}/${BPN}-4.orig"
 
 inherit autotools

meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb

@@ -14,7 +14,7 @@ DEPENDS = "libnewt popt"
 
 PR = "r0"
 
-SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${P}.tar.bz2"
+SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "a576808a6d66763606d750ec451bab6d"
 SRC_URI[sha256sum] = "aa36bf7fd3f7c6e3371eddd8a7846b83435c48f132cc5919d83a830504b797d6"

meta/recipes-extended/gamin/gamin_0.1.10.bb

@@ -20,14 +20,14 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--without-python"
 
-PACKAGES += "lib${PN} lib${PN}-dev"
+PACKAGES += "lib${BPN} lib${BPN}-dev"
 FILES_${PN} = "${libexecdir}"
 FILES_${PN}-dbg += "${libexecdir}/.debug"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
+FILES_lib${BPN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
+FILES_lib${BPN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
                       ${libdir}/lib*.a ${libdir}/lib*.so"
 
-RDEPENDS_lib${PN} = "${PN}"
+RDEPENDS_lib${BPN} = "${PN}"
 
 LEAD_SONAME = "libgamin-1.so"
 

meta/recipes-extended/libidn/libidn_0.6.14.bb

@@ -11,7 +11,7 @@ PR = "r0"
 
 inherit pkgconfig autotools gettext
 
-SRC_URI = "http://alpha.gnu.org/gnu/libidn/${P}.tar.gz"
+SRC_URI = "http://alpha.gnu.org/gnu/libidn/${BPN}-${PV}.tar.gz"
 
 EXTRA_OECONF = " --disable-tld"
 

meta/recipes-extended/libidn/libidn_1.22.bb

@@ -11,7 +11,7 @@ PR = "r0"
 
 inherit pkgconfig autotools gettext
 
-SRC_URI = "${GNU_MIRROR}/libidn/${P}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+
 # so package command into a separate package

meta/recipes-extended/libtirpc/libtirpc_0.2.2.bb

@@ -11,8 +11,8 @@ PR = "r0"
 DEPENDS += "xz-native"
 PROVIDES = "virtual/librpc"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.bz2;name=libtirpc \
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \
-           ${GENTOO_MIRROR}/${PN}-glibc-nfs.tar.xz;name=glibc-nfs \
+           ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \
            file://libtirpc-0.2.1-fortify.patch \
            file://libtirpc-0.2.2-rpc-des-prot.patch \
            file://remove-des-crypt.patch \

meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch

@@ -8,14 +8,15 @@ before the usage of _foo during the initialization of the compatibility
 table.
 
 The patch, along with a similar change to the recipe generation of the 
-poky-arch.h file, remove the DEF_BUILTIN globals and replace them with
+oe-arch.h file, remove the DEF_BUILTIN globals and replace them with
 immediate strings wherever they are used.
 
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
-diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
+Index: git/zypp/Arch.cc
---- git.orig/zypp/Arch.cc	2011-03-29 14:15:32.695079271 -0500
+===================================================================
-+++ git/zypp/Arch.cc	2011-03-29 14:17:22.680910025 -0500
+--- git.orig/zypp/Arch.cc	2011-08-04 21:03:31.000000000 -0700
++++ git/zypp/Arch.cc	2011-08-04 21:04:16.635480895 -0700
 @@ -152,13 +152,10 @@
      // NOTE: Thake care CompatBits::IntT is able to provide one
      //       bit for each architecture.
@@ -24,13 +25,13 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
 -    DEF_BUILTIN( all );
 -    DEF_BUILTIN( any );
 -    DEF_BUILTIN( noarch );
- 
--#include "poky-arch.h"
--#undef DEF_BUILTIN
 +/* Global constructors are not working properly on ARM, avoid the
 + * known bad case and merge constructors in with the usages
 + */
  
+-#include "oe-arch.h"
+-#undef DEF_BUILTIN
+ 
      ///////////////////////////////////////////////////////////////////
      //
 @@ -227,9 +224,9 @@
@@ -46,7 +47,7 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
          ///////////////////////////////////////////////////////////////////
          // Define the CompatibleWith relation:
          //
-@@ -305,9 +302,9 @@
+@@ -331,9 +328,9 @@
    ///////////////////////////////////////////////////////////////////
  
    const Arch Arch_empty ( IdString::Empty );
@@ -57,9 +58,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
 +  const Arch Arch_any( IdString ( "any" ) );
 +  const Arch Arch_noarch( IdString ( "noarch" ) );
  
- #define POKY_PROTO 1
+ #define OE_PROTO 1
- #include "poky-arch.h"
+ #include "oe-arch.h"
-@@ -316,7 +316,7 @@
+@@ -345,7 +342,7 @@
    //	METHOD TYPE : Ctor
    //
    Arch::Arch()

meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch

@@ -0,0 +1,54 @@
+zypp/Arch.cc: Add room for additional architecture compatibilities
+
+Upstream-status: Pending
+
+Increase the size of the compatibility table from 9 to 30.  There are already
+existing checks within libzypp to ensure that we don't overflow the 64-bit
+architecture field, so nothing further was required.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
+--- git.orig/zypp/Arch.cc	2011-08-02 16:40:37.696662889 -0500
++++ git/zypp/Arch.cc	2011-08-04 11:24:18.051745246 -0500
+@@ -280,13 +280,39 @@
+                               IdString arch6_r = IdString(),
+                               IdString arch7_r = IdString(),
+                               IdString arch8_r = IdString(),
+-                              IdString arch9_r = IdString() )
++                              IdString arch9_r = IdString(),
++                              IdString arch10_r = IdString(),
++                              IdString arch11_r = IdString(),
++                              IdString arch12_r = IdString(),
++                              IdString arch13_r = IdString(),
++                              IdString arch14_r = IdString(),
++                              IdString arch15_r = IdString(),
++                              IdString arch16_r = IdString(),
++                              IdString arch17_r = IdString(),
++                              IdString arch18_r = IdString(),
++                              IdString arch19_r = IdString(),
++                              IdString arch20_r = IdString(),
++                              IdString arch21_r = IdString(),
++                              IdString arch22_r = IdString(),
++                              IdString arch23_r = IdString(),
++                              IdString arch24_r = IdString(),
++                              IdString arch25_r = IdString(),
++                              IdString arch26_r = IdString(),
++                              IdString arch27_r = IdString(),
++                              IdString arch28_r = IdString(),
++                              IdString arch29_r = IdString(),
++                              IdString arch30_r = IdString() )
+       {
+         const CompatEntry & target( assertCompatSetEntry( targetArch_r ) );
+         target.addCompatBit( assertCompatSetEntry( arch0_r )._idBit );
+ #define _SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit )
+         _SETARG(1); _SETARG(2); _SETARG(3); _SETARG(4);
+         _SETARG(5); _SETARG(6); _SETARG(7); _SETARG(8); _SETARG(9);
++        _SETARG(10); _SETARG(11); _SETARG(12); _SETARG(13); _SETARG(14);
++        _SETARG(15); _SETARG(16); _SETARG(17); _SETARG(18); _SETARG(19);
++        _SETARG(20); _SETARG(21); _SETARG(22); _SETARG(23); _SETARG(24);
++        _SETARG(25); _SETARG(26); _SETARG(27); _SETARG(28); _SETARG(29);
++	_SETARG(30);
+ #undef _SETARG
+       }
+ 

meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch

@@ -3,7 +3,7 @@ Upstream-Status: Inappropriate [distribution]
 Disable all of the internal architectures
 
 We disable all of the internal architectures and replace them with ones
-generated by the libzypp recipe as specified in the poky-arch.h.
+generated by the libzypp recipe as specified in the oe-arch.h.
 
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
@@ -148,7 +148,7 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
 -
 -    DEF_BUILTIN( sh4 );
 -    DEF_BUILTIN( sh4a );
-+#include "poky-arch.h"
++#include "oe-arch.h"
  #undef DEF_BUILTIN
  
      ///////////////////////////////////////////////////////////////////
@@ -211,9 +211,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
 -        //
 -        defCompatibleWith( _sh4,	_noarch );
 -        defCompatibleWith( _sh4a,	_noarch,_sh4 );
-+#define POKY_DEF_COMPAT 1
++#define OE_DEF_COMPAT 1
-+#include "poky-arch.h"
++#include "oe-arch.h"
-+#undef POKY_DEF_COMPAT
++#undef OE_DEF_COMPAT
          //
          ///////////////////////////////////////////////////////////////////
          // dumpOn( USR ) << endl;
@@ -270,9 +270,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc
 -
 -  const Arch Arch_sh4( _sh4 );
 -  const Arch Arch_sh4a( _sh4a );
-+#define POKY_PROTO 1
++#define OE_PROTO 1
-+#include "poky-arch.h"
++#include "oe-arch.h"
-+#undef POKY_PROTO
++#undef OE_PROTO
  
    ///////////////////////////////////////////////////////////////////
    //
@@ -398,9 +398,9 @@ diff -ur git.orig/zypp/Arch.h git/zypp/Arch.h
 -  extern const Arch Arch_sh4;
 -  /** \relates Arch */
 -  extern const Arch Arch_sh4a;
-+#define POKY_EXTERN_PROTO 1
++#define OE_EXTERN_PROTO 1
-+#include "poky-arch.h"
++#include "oe-arch.h"
-+#undef POKY_EXTERN_PROTO
++#undef OE_EXTERN_PROTO
    //@}
  
    ///////////////////////////////////////////////////////////////////
@@ -411,7 +411,7 @@ diff -ur git.orig/zypp/CMakeLists.txt git/zypp/CMakeLists.txt
  
  SET( zypp_HEADERS
    Arch.h
-+  poky-arch.h
++  oe-arch.h
    AutoDispose.h
    Bit.h
    ByteCount.h

meta/recipes-extended/libzypp/libzypp_git.bb

@@ -14,16 +14,17 @@ RDEPENDS_${PN} = "sat-solver"
 S = "${WORKDIR}/git"
 SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
 PV = "0.0-git${SRCPV}"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
            file://no-doc.patch \
            file://rpm5.patch \
            file://rpm5-no-rpmdbinit.patch \
 	   file://config-release.patch \
-	   file://libzypp-pokyarch.patch \
+	   file://libzypp-oearch.patch \
+	   file://libzypp-compatargs.patch \
 	   file://fix_for_compile_wth_gcc-4.6.0.patch \
-          file://hardcode-lib-fix.patch \
+	   file://hardcode-lib-fix.patch \
           "
 
 SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
@@ -49,55 +50,57 @@ AVOID_CONSTRUCTOR_mips = "true"
 do_archgen () {
 	# We need to dynamically generate our arch file based on the machine
 	# configuration
-	echo "/* Automatically generated by the libzypp recipes */" 		 > zypp/poky-arch.h
+	echo "/* Automatically generated by the libzypp recipes */" 		 > zypp/oe-arch.h
-	echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" 			 >> zypp/poky-arch.h
+	echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" 			 >> zypp/oe-arch.h
-	echo ""									>> zypp/poky-arch.h
+	echo ""									>> zypp/oe-arch.h
-	echo "#ifndef POKY_ARCH_H"						>> zypp/poky-arch.h
+	echo "#ifndef OE_ARCH_H"						>> zypp/oe-arch.h
-	echo "#define POKY_ARCH_H 1"						>> zypp/poky-arch.h
+	echo "#define OE_ARCH_H 1"						>> zypp/oe-arch.h
-	echo "#define Arch_machine Arch_${MACHINE_ARCH}"			>> zypp/poky-arch.h
+	echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _		>> zypp/oe-arch.h
-	echo "#endif /* POKY_ARCH_H */"						>> zypp/poky-arch.h
+	echo "#endif /* OE_ARCH_H */"						>> zypp/oe-arch.h
-	echo ""									>> zypp/poky-arch.h
+	echo ""									>> zypp/oe-arch.h
 	if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
-	  echo "#ifdef DEF_BUILTIN"						>> zypp/poky-arch.h
+	  echo "#ifdef DEF_BUILTIN"						>> zypp/oe-arch.h
-	  echo "/* Specify builtin types */"					>> zypp/poky-arch.h
+	  echo "/* Specify builtin types */"					>> zypp/oe-arch.h
 	  for each_arch in ${PACKAGE_ARCHS} ; do
 		case "$each_arch" in
 			all | any | noarch)
 				continue;;
 		esac
-		echo "    DEF_BUILTIN( ${each_arch} );"				>> zypp/poky-arch.h
+		echo "    DEF_BUILTIN( ${each_arch} );"	 | tr - _		>> zypp/oe-arch.h
 	  done
-	  echo "#endif /* DEF_BUILTIN */"						>> zypp/poky-arch.h
+	  echo "#endif /* DEF_BUILTIN */"						>> zypp/oe-arch.h
-	  echo ""									>> zypp/poky-arch.h
+	  echo ""									>> zypp/oe-arch.h
 	fi
-	echo "#ifdef POKY_EXTERN_PROTO"						>> zypp/poky-arch.h
+	echo "#ifdef OE_EXTERN_PROTO"						>> zypp/oe-arch.h
-	echo "/* Specify extern prototypes */"					>> zypp/poky-arch.h
+	echo "/* Specify extern prototypes */"					>> zypp/oe-arch.h
 	for each_arch in ${PACKAGE_ARCHS} ; do
 		case "$each_arch" in
 			all | any | noarch)
 				continue;;
 		esac
-		echo "  extern const Arch Arch_${each_arch};"			>> zypp/poky-arch.h
+		echo "  extern const Arch Arch_${each_arch};" | tr - _		>> zypp/oe-arch.h
 	done
-	echo "#endif /* POKY_EXTERN_PROTO */"					>> zypp/poky-arch.h
+	echo "#endif /* OE_EXTERN_PROTO */"					>> zypp/oe-arch.h
-	echo ""									>> zypp/poky-arch.h
+	echo ""									>> zypp/oe-arch.h
-	echo "#ifdef POKY_PROTO"						>> zypp/poky-arch.h
+	echo "#ifdef OE_PROTO"						>> zypp/oe-arch.h
-	echo "/* Specify prototypes */"						>> zypp/poky-arch.h
+	echo "/* Specify prototypes */"						>> zypp/oe-arch.h
 	for each_arch in ${PACKAGE_ARCHS} ; do
 		case "$each_arch" in
 			all | any | noarch)
 				continue;;
 		esac
 		if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
-		  echo "  const Arch Arch_${each_arch} (_${each_arch});"		>> zypp/poky-arch.h
+		  echo -n "  const Arch Arch_${each_arch} " | tr - _		>> zypp/oe-arch.h
+		  echo "(_${each_arch});" 					>> zypp/oe-arch.h
 		else
-		  echo "  const Arch Arch_${each_arch} ( IdString ( \"${each_arch}\" ) );"		>> zypp/poky-arch.h
+		  echo -n "  const Arch Arch_${each_arch} " | tr - _		>> zypp/oe-arch.h
+		  echo "( IdString ( \"${each_arch}\" ) );" 			>> zypp/oe-arch.h
 		fi
 	done
-	echo "#endif /* POKY_PROTO */"						>> zypp/poky-arch.h
+	echo "#endif /* OE_PROTO */"						>> zypp/oe-arch.h
-	echo ""									>> zypp/poky-arch.h
+	echo ""									>> zypp/oe-arch.h
-	echo "#ifdef POKY_DEF_COMPAT"						>> zypp/poky-arch.h
+	echo "#ifdef OE_DEF_COMPAT"						>> zypp/oe-arch.h
-	echo "/* Specify compatibility information */"				>> zypp/poky-arch.h
+	echo "/* Specify compatibility information */"				>> zypp/oe-arch.h
 	INSTALL_PLATFORM_ARCHS=""
 	for each_arch in ${PACKAGE_ARCHS} ; do
 		INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS"
@@ -132,10 +135,10 @@ do_archgen () {
 		COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
 	done
 	for each_compat in ${COMPAT_WITH} ; do
-		echo "        defCompatibleWith( ${each_compat} );"		>> zypp/poky-arch.h
+		echo "        defCompatibleWith( ${each_compat} );"		>> zypp/oe-arch.h
 	done
-	echo "#endif /* DEF_COMPAT */"						>> zypp/poky-arch.h
+	echo "#endif /* DEF_COMPAT */"						>> zypp/oe-arch.h
-	echo ""									>> zypp/poky-arch.h
+	echo ""									>> zypp/oe-arch.h
 }
 
 addtask archgen before do_configure after do_patch

meta/recipes-extended/mktemp/mktemp_1.7.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
 
 PR = "r0"
 
-SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${P}.tar.gz \
+SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
         file://disable-strip.patch \
         "
 

meta/recipes-extended/xdg-utils/xdg-utils_1.0.2.bb

@@ -18,7 +18,7 @@ PR="r0"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a5367a90934098d6b05af3b746405014"
 
-SRC_URI = "http://portland.freedesktop.org/download/${PN}-${PV}.tgz"
+SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tgz"
 
 inherit autotools
 

meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb

@@ -17,7 +17,7 @@ FONTREV = "0.20100721"
 SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \
            file://30-liberation-aliases.conf"
 
-S = ${WORKDIR}/${PN}-${PV}.${FONTREV}
+S = ${WORKDIR}/${BPN}-${PV}.${FONTREV}
 
 do_install () {
 	install -d ${D}${datadir}/fonts/ttf/

meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm

@@ -35,10 +35,8 @@ case "$1" in
            chmod g+r /dev/tty[0-3]
            chmod o+rw /dev/input/*
        fi
-       # Using sudo -i here has the nice side effect of making sire
+       # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
-       # HOME, USER and other previously problematic variables
+       su -l -c '/etc/X11/Xserver&' $username 
-       # are set correctly
-       sudo -b -i -u $username /etc/X11/Xserver
        # Wait for the desktop to say its finished loading
        dbus-wait org.matchbox_project.desktop Loaded
   ;;

meta/recipes-graphics/xorg-driver/xf86-driver-common.inc

@@ -9,7 +9,7 @@ PR = "r1"
 
 DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
 
-XORG_PN = "${PN}"
+XORG_PN = "${BPN}"
 SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"

meta/recipes-graphics/xorg-font/encodings_1.0.4.bb

@@ -13,5 +13,7 @@ DEPENDS = "mkfontscale-native font-util-native"
 
 EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
 
+PACKAGE_ARCH = "all"
+
 SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1"
 SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539"

meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb

@@ -16,5 +16,7 @@ RDEPENDS_${PN}_virtclass-native = "font-util-native"
 PE = "1"
 PR = "${INC_PR}.1"
 
+PACKAGE_ARCH = "all"
+
 SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562"
 SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"

meta/recipes-graphics/xorg-font/xorg-font-common.inc

@@ -30,8 +30,6 @@ do_install_append() {
 	find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f	
 }
 
-PACKAGE_ARCH = "all"
-
 FILES_${PN} += " ${libdir}/X11/fonts ${datadir}"
 
 pkg_postinst_${PN} () {

meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb

@@ -7,7 +7,7 @@ DEPENDS = "libvorbis libogg alsa-lib libmad"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-B-${PV}.tar.gz"
 
-S = "${WORKDIR}/${PN}-B-${PV}"
+S = "${WORKDIR}/${BPN}-B-${PV}"
 
 inherit autotools
 

meta/recipes-sato/eds/eds-tools_bzr.bb

@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so"

meta/recipes-sato/gaku/gaku_svn.bb

@@ -22,6 +22,6 @@ PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 inherit autotools pkgconfig

meta/recipes-sato/libical/libical_0.46.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=35da21efce2b9f0ca07524c9f844e6ed \
 SECTION = "libs"
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${BPN}-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "9c08f88945bfd5d0791d102e4aa4125c"
 SRC_URI[sha256sum] = "000762efb81501421d94ec56343648a62b3bd2884e7cdf6f638e2c207dd8f6a1"

meta/recipes-sato/libowl/libowl_svn.bb

@@ -16,6 +16,6 @@ PR = "r6"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 inherit autotools pkgconfig

meta/recipes-sato/owl-video-widget/libowl-av_svn.bb

@@ -16,7 +16,7 @@ SRCREV = "416"
 PV = "0.0+svnr${SRCPV}"
 PR = "r6"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
            file://gst_change_state.patch \

meta/recipes-sato/puzzles/oh-puzzles_svn.bb

@@ -22,7 +22,7 @@ inherit autotools pkgconfig
 SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
 SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;patch=1;pnum=0 "
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${BPN}"
 
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
 

meta/recipes-sato/puzzles/puzzles_r9175.bb

@@ -15,7 +15,7 @@ SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar
 #SRC_URI[sha256sum] = "69f37e497e63b2f7ab44e7bbd50aee078269c16dbc2d78ec1b00257678f2cbd2"
 #SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
 
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
 
 do_configure () {
 	./mkfiles.pl

meta/recipes-sato/screenshot/screenshot_svn.bb

@@ -15,7 +15,7 @@ PR = "r2"
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
            file://fix_ldadd_order.patch"
 
-S = ${WORKDIR}/${PN}
+S = ${WORKDIR}/${BPN}
 
 inherit autotools pkgconfig
 

meta/recipes-support/apr/apr-util_1.3.10.bb

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
 
 PR = "r0"
 
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
            file://configfix.patch;patch=1 \
            file://configure_fixes.patch;patch=1"
 

meta/recipes-support/apr/apr_1.4.2.bb

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
 
 PR = "r1"
 
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
+SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://configure_fixes.patch;patch=1 \
 	   file://cleanup.patch;patch=1 \
            file://configfix.patch;patch=1 \

meta/recipes-support/attr/ea-acl.inc

@@ -16,7 +16,7 @@ do_install () {
 	oe_runmake install install-lib install-dev DIST_ROOT="${D}"
 }
 
-PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc"
+PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc"
 
 FILES_lib${PN} = "${base_libdir}/lib*.so.*"
 

meta/recipes-support/liboil/liboil_0.3.17.bb

@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \
 DEPENDS = "glib-2.0"
 PR = "r3"
 
-SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \
            file://no-tests.patch \
            file://fix-unaligned-whitelist.patch \
           "

meta/recipes-support/neon/neon_0.29.5.bb

@@ -8,7 +8,7 @@ DEPENDS = "zlib libxml2 expat time gnutls"
 
 PR = "r0"
 
-SRC_URI = "http://www.webdav.org/${BPN}/${P}.tar.gz \
+SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
            file://pkgconfig.patch;patch=1"
 
 SRC_URI[md5sum] = "ff369e69ef0f0143beb5626164e87ae2"

meta/recipes-support/sqlite/sqlite3.inc

@@ -17,12 +17,12 @@ export config_TARGET_LINK = "${CCLD}"
 export config_TARGET_CFLAGS = "${CFLAGS}"
 export config_TARGET_LFLAGS = "${LDFLAGS}"
 
-PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg"
+PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN} ${PN}-dbg"
 FILES_${PN} = "${bindir}/*"
 FILES_lib${PN} = "${libdir}/*.so.*"
 FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
 		       ${libdir}/pkgconfig ${includedir}"
-FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
+FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}"
-AUTO_LIBNAME_PKGS = "lib${PN}"
+AUTO_LIBNAME_PKGS = "lib${BPN}"
 
 BBCLASSEXTEND = "native nativesdk"