From 035dab3a2edcb3698b44e64d44b6eecfbc0fb77c Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Sat, 19 Sep 2009 20:33:00 +0000
Subject: package.bbclass: export subpackage individual version, if different
 from main

Fixes the wrong versioned runtime dependency for shlib subpackages with
own versions. Consider this:

PACKAGES = "libfoo libbar"
PV_libfoo = "1"
PV_libbar = "2"
PV = "3"

That will generate libfoo_1 and libbar_2 packages, but version 3 will be
exported in shlibs database, leading to the following versioned runtime
dependencies:

RDEPENDS: libfoo (>=3) libbar (>=3)

This fixes the problem.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Koen Kooi <koen@openembedded.org>
---
 classes/package.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 0cba1260d8..046351a415 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -652,6 +652,10 @@ python package_do_shlibs() {
 		needs_ldconfig = False
 		bb.debug(2, "calculating shlib provides for %s" % pkg)
 
+		pkgver = bb.data.getVar('PV_' + pkg, d, 1)
+		if not pkgver:
+			pkgver = ver
+
 		needed[pkg] = []
 		sonames = list()
 		top = os.path.join(pkgdest, pkg)
@@ -696,7 +700,7 @@ python package_do_shlibs() {
 			fd.close()
 			package_stagefile(shlibs_file, d)
 			fd = open(shver_file, 'w')
-			fd.write(ver + '\n')
+			fd.write(pkgver + '\n')
 			fd.close()
 			package_stagefile(shver_file, d)
 		if needs_ldconfig and use_ldconfig:
-- 
cgit v1.2.3


From 98e736cd3dbf6fd3c6a1528aa240af56858647ee Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Oct 2009 09:27:30 +0200
Subject: image bbclass: tweak lingue script

---
 classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/image.bbclass b/classes/image.bbclass
index f03a115388..ab580312bb 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -237,7 +237,7 @@ install_linguas() {
 if [ -e ${IMAGE_ROOTFS}/usr/bin/opkg-cl ] ; then
 	OPKG="opkg-cl ${IPKG_ARGS}"
 
-	${OPKG} update
+	${OPKG} update || true
 	${OPKG} list_installed | awk '{print $1}' |sort | uniq > /tmp/installed-packages
 
 	for i in $(cat /tmp/installed-packages | grep -v locale) ; do
-- 
cgit v1.2.3


From 1f7a632a9689fb9b6e03eefd0781f3e39c6f12e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Mon, 26 Oct 2009 09:49:20 +0100
Subject: update-rc.d.bbclass: make prerm and postrm dpkg-compatible

* prerm : only stop service at the "upgrade" and "remove" steps
* postrm : only remove symlinks at the "remove" and "purge" steps, after
  checking the init script no longer exists
---
 classes/update-rc.d.bbclass | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass
index 91af859392..00ec37cfb8 100644
--- a/classes/update-rc.d.bbclass
+++ b/classes/update-rc.d.bbclass
@@ -16,17 +16,27 @@ update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
 
 updatercd_prerm() {
 if test "x$D" = "x"; then
-	${INIT_D_DIR}/${INITSCRIPT_NAME} stop
+	if test "$1" = "upgrade" -o "$1" = "remove"; then
+		${INIT_D_DIR}/${INITSCRIPT_NAME} stop
+	fi
 fi
 }
 
+# Note: to be Debian compliant, we should only invoke update-rc.d remove
+# at the "purge" step, but opkg does not support it. So instead we also
+# run it at the "remove" step if the init script no longer exists.
+
 updatercd_postrm() {
 if test "x$D" != "x"; then
 	OPT="-r $D"
 else
 	OPT=""
 fi
-update-rc.d $OPT ${INITSCRIPT_NAME} remove
+if test "$1" = "remove" -o "$1" = "purge"; then
+	if ! test -e "${INIT_D_DIR}/${INITSCRIPT_NAME}"; then
+		update-rc.d $OPT ${INITSCRIPT_NAME} remove
+	fi
+fi
 }
 
 
-- 
cgit v1.2.3


From dba8dec4093dc68610b762c8c7ac4e38c31cc8f9 Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@cbnco.com>
Date: Sun, 25 Oct 2009 21:47:55 -0400
Subject: gitver.bbclass: fix git dependency tracking

.git/HEAD doesn't usually change on a commit, but the ref it points to
(e.g. .git/refs/heads/master) should. Handle this and another couple of
cases: if a tag is added without a new commit, or if the ref is in
packed-refs.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Chris Larson <clarson@kergoth.com>
---
 classes/gitver.bbclass | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'classes')

diff --git a/classes/gitver.bbclass b/classes/gitver.bbclass
index 92c053ae24..5b4ba8d1e1 100644
--- a/classes/gitver.bbclass
+++ b/classes/gitver.bbclass
@@ -8,20 +8,14 @@
 
 GITVER = "${@get_git_pv('${S}', d)}"
 
-def gitver_mark_dependency(d):
-    from bb.data import expand
-    from bb.parse import mark_dependency
-    from os.path import abspath
-
-    fn = abspath(expand("${S}/.git/HEAD", d))
-    mark_dependency(d, fn)
-
 def get_git_pv(path, d, tagadjust=None):
     from subprocess import Popen, PIPE
-    from os.path import join
+    import os
     from bb import error
+    from bb.parse import mark_dependency
 
-    env = {"GIT_DIR": join(d.getVar("S", True), ".git")}
+    gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
+    env = { "GIT_DIR": gitdir }
 
     def popen(cmd, **kwargs):
         kwargs["stderr"] = PIPE
@@ -39,7 +33,23 @@ def get_git_pv(path, d, tagadjust=None):
             return
         return stdout.rstrip()
 
-    gitver_mark_dependency(d)
+    # Force the recipe to be reparsed so the version gets bumped
+    # if the active branch is switched, or if the branch changes.
+    mark_dependency(d, os.path.join(gitdir, "HEAD"))
+
+    ref = popen(["git", "symbolic-ref", "HEAD"])
+    reffile = os.path.join(gitdir, ref)
+    if ref and os.path.exists(reffile):
+        mark_dependency(d, reffile)
+    else:
+        # The ref might be hidden in packed-refs. Force a reparse if anything
+        # in the working copy changes.
+        mark_dependency(d, os.path.join(gitdir, "index"))
+
+    # Catch new tags.
+    tagdir = os.path.join(gitdir, "refs", "tags")
+    if os.path.exists(tagdir):
+        mark_dependency(d, tagdir)
 
     ver = popen(["git", "describe", "--tags"], cwd=path)
     if not ver:
-- 
cgit v1.2.3


From 3499e5b252d8e4b118f6ea6cc406be7e8c22765a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Oct 2009 11:37:26 +0200
Subject: package bbclass: don't strip static libs so aggressively

---
 classes/package.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 046351a415..7a9b987c7c 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -159,7 +159,7 @@ def runstrip(file, d):
     if ret:
         bb.error("runstrip: 'file %s' failed (forced strip)" % file)
 
-    if "not stripped" not in result and not file.endswith(".a"):
+    if "not stripped" not in result:
         bb.debug(1, "runstrip: skip %s" % file)
         return 0
 
@@ -183,6 +183,9 @@ def runstrip(file, d):
         extraflags = "--remove-section=.comment --remove-section=.note --strip-unneeded"
     elif "shared" in result or "executable" in result:
         extraflags = "--remove-section=.comment --remove-section=.note"
+    elif file.endswith(".a"):
+        extraflags = "--remove-section=.comment --strip-debug"
+
 
     bb.mkdirhier(os.path.join(os.path.dirname(file), ".debug"))
     debugfile=os.path.join(os.path.dirname(file), ".debug", os.path.basename(file))
@@ -393,7 +396,7 @@ python populate_packages () {
 		for root, dirs, files in os.walk(dvar):
 			for f in files:
 				file = os.path.join(root, f)
-				if not os.path.islink(file) and not os.path.isdir(file) and (isexec(file) or ".a" in file):
+				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
 					runstrip(file, d)
 
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
-- 
cgit v1.2.3


From 6de8a003f930bfade8502cf80617009a9c96c278 Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Sun, 25 Oct 2009 10:55:35 +0000
Subject: xfce46.bbclass: Add a helper class for XFCE 4.6 (based on the
 existing xfce.bbclass).

---
 classes/xfce46.bbclass | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 classes/xfce46.bbclass

(limited to 'classes')

diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
new file mode 100644
index 0000000000..84b73cda56
--- /dev/null
+++ b/classes/xfce46.bbclass
@@ -0,0 +1,28 @@
+# xfce46.bbclass
+
+# Global class to help maintain XFCE 4.6.* packages
+
+HOMEPAGE = "http://www.xfce.org"
+LICENSE = "LGPLv2"
+
+DEPENDS += "startup-notification"
+
+SECTION ?= "x11/xfce"
+
+XFCE_VERSION = ${PV}
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+
+inherit autotools gtk-icon-cache pkgconfig
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/"
+
+# FIXME:  Put icons in their own package too?
+
+FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*"
+FILES_${PN}-doc += "${datadir}/xfce4/doc"
+
+FILES_${PN}-dev += "${libdir}/xfce4/*/*.la"
+FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug"
-- 
cgit v1.2.3


From 599bbb2eaff6f0827b04ab5b2665303a22ea072e Mon Sep 17 00:00:00 2001
From: David-John Willis <John.Willis@Distant-earth.com>
Date: Sun, 25 Oct 2009 11:02:48 +0000
Subject: XFCE: Import all the 4.6.1 recipes (and a newer version of
 xfce-terminal).

---
 classes/xfce46.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
index 84b73cda56..c24dfa4d8c 100644
--- a/classes/xfce46.bbclass
+++ b/classes/xfce46.bbclass
@@ -11,7 +11,7 @@ SECTION ?= "x11/xfce"
 
 XFCE_VERSION = ${PV}
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
 
 inherit autotools gtk-icon-cache pkgconfig
 
-- 
cgit v1.2.3


From fcee557e1b0551d1743bbb3ad61102b9ccc4cba8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 29 Oct 2009 23:20:57 +0000
Subject: package.bbclass: Cleanup getVar syntax to use True, not 1 as third
 argument (from Poky)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 classes/package.bbclass | 120 ++++++++++++++++++++++++------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

(limited to 'classes')

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 7a9b987c7c..e7865754eb 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -28,12 +28,12 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 	"""
 	import os, os.path, bb
 
-	dvar = bb.data.getVar('D', d, 1)
+	dvar = bb.data.getVar('D', d, True)
 	if not dvar:
 		bb.error("D not defined")
 		return
 
-	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	packages = bb.data.getVar('PACKAGES', d, True).split()
 
 	if postinst:
 		postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -94,7 +94,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 					the_files.append(aux_files_pattern_verbatim % m.group(1))
 			bb.data.setVar('FILES_' + pkg, " ".join(the_files), d)
 			if extra_depends != '':
-				the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, 1)
+				the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, True)
 				if the_depends:
 					the_depends = '%s %s' % (the_depends, extra_depends)
 				else:
@@ -106,7 +106,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 			if postrm:
 				bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
 		else:
-			oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
+			oldfiles = bb.data.getVar('FILES_' + pkg, d, True)
 			if not oldfiles:
 				bb.fatal("Package '%s' exists but has no files" % pkg)
 			bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
@@ -152,7 +152,7 @@ def runstrip(file, d):
 
     import bb, os, commands, stat
 
-    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1)
+    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
 
     ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
 
@@ -169,8 +169,8 @@ def runstrip(file, d):
         bb.debug(2, "Already ran strip on %s" % file)
         return 0
 
-    strip = bb.data.getVar("STRIP", d, 1)
-    objcopy = bb.data.getVar("OBJCOPY", d, 1)
+    strip = bb.data.getVar("STRIP", d, True)
+    objcopy = bb.data.getVar("OBJCOPY", d, True)
 
     newmode = None
     if not os.access(file, os.W_OK):
@@ -268,10 +268,10 @@ def get_package_mapping (pkg, d):
 def runtime_mapping_rename (varname, d):
 	import bb, os
 
-	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1)))	
+	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))	
 
 	new_depends = []
-	for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""):
+	for depend in explode_deps(bb.data.getVar(varname, d, True) or ""):
 		# Have to be careful with any version component of the depend
 		split_depend = depend.split(' (')
 		new_depend = get_package_mapping(split_depend[0].strip(), d)
@@ -282,7 +282,7 @@ def runtime_mapping_rename (varname, d):
 
 	bb.data.setVar(varname, " ".join(new_depends) or None, d)
 
-	#bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1)))
+	#bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, True)))
 
 #
 # Package functions suitable for inclusion in PACKAGEFUNCS
@@ -291,23 +291,23 @@ def runtime_mapping_rename (varname, d):
 python package_do_split_locales() {
 	import os
 
-	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, 1) == '1'):
+	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'):
 		bb.debug(1, "package requested not splitting locales")
 		return
 
-	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
 
-	datadir = bb.data.getVar('datadir', d, 1)
+	datadir = bb.data.getVar('datadir', d, True)
 	if not datadir:
 		bb.note("datadir not defined")
 		return
 
-	dvar = bb.data.getVar('D', d, 1)
+	dvar = bb.data.getVar('D', d, True)
 	if not dvar:
 		bb.error("D not defined")
 		return
 
-	pn = bb.data.getVar('PN', d, 1)
+	pn = bb.data.getVar('PN', d, True)
 	if not pn:
 		bb.error("PN not defined")
 		return
@@ -346,27 +346,27 @@ python package_do_split_locales() {
 python populate_packages () {
 	import glob, stat, errno, re
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 	if not workdir:
 		bb.error("WORKDIR not defined, unable to package")
 		return
 
 	import os # path manipulations
-	outdir = bb.data.getVar('DEPLOY_DIR', d, 1)
+	outdir = bb.data.getVar('DEPLOY_DIR', d, True)
 	if not outdir:
 		bb.error("DEPLOY_DIR not defined, unable to package")
 		return
 	bb.mkdirhier(outdir)
 
-	dvar = bb.data.getVar('D', d, 1)
+	dvar = bb.data.getVar('D', d, True)
 	if not dvar:
 		bb.error("D not defined, unable to package")
 		return
 	bb.mkdirhier(dvar)
 
-	packages = bb.data.getVar('PACKAGES', d, 1)
+	packages = bb.data.getVar('PACKAGES', d, True)
 
-	pn = bb.data.getVar('PN', d, 1)
+	pn = bb.data.getVar('PN', d, True)
 	if not pn:
 		bb.error("PN not defined")
 		return
@@ -392,19 +392,19 @@ python populate_packages () {
 		else:
 			package_list.append(pkg)
 
-	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
+	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'):
 		for root, dirs, files in os.walk(dvar):
 			for f in files:
 				file = os.path.join(root, f)
 				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
 					runstrip(file, d)
 
-	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+	pkgdest = bb.data.getVar('PKGDEST', d, True)
 	os.system('rm -rf %s' % pkgdest)
 
 	seen = []
 	main_is_empty = 1
-	main_pkg = bb.data.getVar('PN', d, 1)
+	main_pkg = bb.data.getVar('PN', d, True)
 
 	for pkg in package_list:
 		localdata = bb.data.createCopy(d)
@@ -412,13 +412,13 @@ python populate_packages () {
 		bb.mkdirhier(root)
 
 		bb.data.setVar('PKG', pkg, localdata)
-		overrides = bb.data.getVar('OVERRIDES', localdata, 1)
+		overrides = bb.data.getVar('OVERRIDES', localdata, True)
 		if not overrides:
 			raise bb.build.FuncFailed('OVERRIDES not defined')
 		bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
 		bb.data.update_data(localdata)
 
-		filesvar = bb.data.getVar('FILES', localdata, 1) or ""
+		filesvar = bb.data.getVar('FILES', localdata, True) or ""
 		files = filesvar.split()
 		for file in files:
 			if os.path.isabs(file):
@@ -473,7 +473,7 @@ python populate_packages () {
 	bb.build.exec_func("package_name_hook", d)
 
 	for pkg in package_list:
-		pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
+		pkgname = bb.data.getVar('PKG_%s' % pkg, d, True)
 		if pkgname is None:
 			bb.data.setVar('PKG_%s' % pkg, pkg, d)
 
@@ -532,11 +532,11 @@ python emit_pkgdata() {
 			c = codecs.getencoder("string_escape")
 			return c(str)[0]
 
-		val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
+		val = bb.data.getVar('%s_%s' % (var, pkg), d, True)
 		if val:
 			f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
  			return
- 		val = bb.data.getVar('%s' % (var), d, 1)
+ 		val = bb.data.getVar('%s' % (var), d, True)
  		if val:
  			f.write('%s: %s\n' % (var, encode(val)))
  		return
@@ -554,7 +554,7 @@ python emit_pkgdata() {
 	f.close()
 	package_stagefile(data_file, d)
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 
 	for pkg in packages.split():
 		subdata_file = pkgdatadir + "/runtime/%s" % pkg
@@ -582,9 +582,9 @@ python emit_pkgdata() {
 		#if pkgdatadir2:
 		#	bb.copyfile(subdata_file, pkgdatadir2 + "/runtime/%s" % pkg)
 
-		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
+		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True)
 		if not allow_empty:
-			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
+			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True)
 		root = "%s/install/%s" % (workdir, pkg)
 		os.chdir(root)
 		g = glob('*') + glob('.[!.]*')
@@ -618,21 +618,21 @@ python package_do_shlibs() {
 	lib_re = re.compile("^lib.*\.so")
 	libdir_re = re.compile(".*/lib$")
 
-	packages = bb.data.getVar('PACKAGES', d, 1)
+	packages = bb.data.getVar('PACKAGES', d, True)
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 	if not workdir:
 		bb.error("WORKDIR not defined")
 		return
 
-	ver = bb.data.getVar('PV', d, 1)
+	ver = bb.data.getVar('PV', d, True)
 	if not ver:
 		bb.error("PV not defined")
 		return
 
-	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+	pkgdest = bb.data.getVar('PKGDEST', d, True)
 
-	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
+	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
 	bb.mkdirhier(shlibs_dir)
 
 	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
@@ -650,12 +650,12 @@ python package_do_shlibs() {
 		use_ldconfig = False
 
 	needed = {}
-	private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
+	private_libs = bb.data.getVar('PRIVATE_LIBS', d, True)
 	for pkg in packages.split():
 		needs_ldconfig = False
 		bb.debug(2, "calculating shlib provides for %s" % pkg)
 
-		pkgver = bb.data.getVar('PV_' + pkg, d, 1)
+		pkgver = bb.data.getVar('PV_' + pkg, d, True)
 		if not pkgver:
 			pkgver = ver
 
@@ -668,8 +668,8 @@ python package_do_shlibs() {
 				soname = None
 				path = os.path.join(root, file)
 				if (os.access(path, os.X_OK) or lib_re.match(file)) and not os.path.islink(path):
-					cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
-					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd)
+					cmd = bb.data.getVar('OBJDUMP', d, True) + " -p " + path + " 2>/dev/null"
+					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, True), cmd)
 					fd = os.popen(cmd)
 					lines = fd.readlines()
 					fd.close()
@@ -708,10 +708,10 @@ python package_do_shlibs() {
 			package_stagefile(shver_file, d)
 		if needs_ldconfig and use_ldconfig:
 			bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
-			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, True) or bb.data.getVar('pkg_postinst', d, True)
 			if not postinst:
 				postinst = '#!/bin/sh\n'
-			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, 1)
+			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True)
 			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
 	if pstageactive == "1":
@@ -738,7 +738,7 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
-	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True)
 	if assumed_libs:
 	    for e in assumed_libs.split():
 		l, dep_pkg = e.split(":")
@@ -786,16 +786,16 @@ python package_do_shlibs() {
 python package_do_pkgconfig () {
 	import re, os
 
-	packages = bb.data.getVar('PACKAGES', d, 1)
+	packages = bb.data.getVar('PACKAGES', d, True)
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 	if not workdir:
 		bb.error("WORKDIR not defined")
 		return
 
-	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+	pkgdest = bb.data.getVar('PKGDEST', d, True)
 
-	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
+	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
 	bb.mkdirhier(shlibs_dir)
 
 	pc_re = re.compile('(.*)\.pc$')
@@ -890,7 +890,7 @@ python package_do_pkgconfig () {
 }
 
 python read_shlibdeps () {
-	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	packages = bb.data.getVar('PACKAGES', d, True).split()
 	for pkg in packages:
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
 		for extension in ".shlibdeps", ".pcdeps", ".clilibdeps":
@@ -918,14 +918,14 @@ python package_depchains() {
 	package.
 	"""
 
-	packages  = bb.data.getVar('PACKAGES', d, 1)
-	postfixes = (bb.data.getVar('DEPCHAIN_POST', d, 1) or '').split()
-	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
+	packages  = bb.data.getVar('PACKAGES', d, True)
+	postfixes = (bb.data.getVar('DEPCHAIN_POST', d, True) or '').split()
+	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, True) or '').split()
 
 	def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
 
 		#bb.note('depends for %s is %s' % (base, depends))
-		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
 
 		for depend in depends:
 			if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
@@ -946,7 +946,7 @@ python package_depchains() {
 	def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
 
 		#bb.note('rdepends for %s is %s' % (base, rdepends))
-		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
 
 		for depend in rdepends:
 			if depend.endswith('-dev'):
@@ -966,15 +966,15 @@ python package_depchains() {
 			list.append(dep)
 
 	depends = []
-	for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""):
+	for dep in explode_deps(bb.data.getVar('DEPENDS', d, True) or ""):
 		add_dep(depends, dep)
 
 	rdepends = []
-	for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""):
+	for dep in explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""):
 		add_dep(rdepends, dep)
 
 	for pkg in packages.split():
-		for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""):
+		for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, True) or ""):
 			add_dep(rdepends, dep)
 
 	#bb.note('rdepends is %s' % rdepends)
@@ -1007,7 +1007,7 @@ python package_depchains() {
 				pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
 			else:
 				rdeps = []
-				for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""):
+				for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, True) or bb.data.getVar('RDEPENDS', d, True) or ""):
 					add_dep(rdeps, dep)
 				pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
 }
@@ -1035,7 +1035,7 @@ def package_run_hooks(f, d):
 				bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d)
 				line += 1
 			fp.close()
-	                anonqueue = bb.data.getVar("__anonqueue", d, 1) or []
+	                anonqueue = bb.data.getVar("__anonqueue", d, True) or []
         	        body = [x['content'] for x in anonqueue]
             	        flag = { 'python' : 1, 'func' : 1 }
             	        bb.data.setVar("__anonfunc", "\n".join(body), d)
@@ -1054,12 +1054,12 @@ def package_run_hooks(f, d):
             		bb.data.delVar("__anonfunc", d)
 
 python package_do_package () {
-	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
 	if len(packages) < 1:
 		bb.debug(1, "No packages to build, skipping do_package")
 		return
 
-	for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split():
+	for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split():
 		bb.build.exec_func(f, d)
 		package_run_hooks(f, d)
 }
-- 
cgit v1.2.3


From 056193c6638892ddde7bddbfc6f6f06a2288ba64 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Fri, 30 Oct 2009 12:48:03 +0100
Subject: Revert "package.bbclass: Cleanup getVar syntax to use True, not 1 as
 third argument (from Poky)"

This reverts commit fcee557e1b0551d1743bbb3ad61102b9ccc4cba8.
---
 classes/package.bbclass | 120 ++++++++++++++++++++++++------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

(limited to 'classes')

diff --git a/classes/package.bbclass b/classes/package.bbclass
index e7865754eb..7a9b987c7c 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -28,12 +28,12 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 	"""
 	import os, os.path, bb
 
-	dvar = bb.data.getVar('D', d, True)
+	dvar = bb.data.getVar('D', d, 1)
 	if not dvar:
 		bb.error("D not defined")
 		return
 
-	packages = bb.data.getVar('PACKAGES', d, True).split()
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
 
 	if postinst:
 		postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -94,7 +94,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 					the_files.append(aux_files_pattern_verbatim % m.group(1))
 			bb.data.setVar('FILES_' + pkg, " ".join(the_files), d)
 			if extra_depends != '':
-				the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, True)
+				the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, 1)
 				if the_depends:
 					the_depends = '%s %s' % (the_depends, extra_depends)
 				else:
@@ -106,7 +106,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 			if postrm:
 				bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
 		else:
-			oldfiles = bb.data.getVar('FILES_' + pkg, d, True)
+			oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
 			if not oldfiles:
 				bb.fatal("Package '%s' exists but has no files" % pkg)
 			bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
@@ -152,7 +152,7 @@ def runstrip(file, d):
 
     import bb, os, commands, stat
 
-    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
+    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1)
 
     ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
 
@@ -169,8 +169,8 @@ def runstrip(file, d):
         bb.debug(2, "Already ran strip on %s" % file)
         return 0
 
-    strip = bb.data.getVar("STRIP", d, True)
-    objcopy = bb.data.getVar("OBJCOPY", d, True)
+    strip = bb.data.getVar("STRIP", d, 1)
+    objcopy = bb.data.getVar("OBJCOPY", d, 1)
 
     newmode = None
     if not os.access(file, os.W_OK):
@@ -268,10 +268,10 @@ def get_package_mapping (pkg, d):
 def runtime_mapping_rename (varname, d):
 	import bb, os
 
-	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))	
+	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1)))	
 
 	new_depends = []
-	for depend in explode_deps(bb.data.getVar(varname, d, True) or ""):
+	for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""):
 		# Have to be careful with any version component of the depend
 		split_depend = depend.split(' (')
 		new_depend = get_package_mapping(split_depend[0].strip(), d)
@@ -282,7 +282,7 @@ def runtime_mapping_rename (varname, d):
 
 	bb.data.setVar(varname, " ".join(new_depends) or None, d)
 
-	#bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, True)))
+	#bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1)))
 
 #
 # Package functions suitable for inclusion in PACKAGEFUNCS
@@ -291,23 +291,23 @@ def runtime_mapping_rename (varname, d):
 python package_do_split_locales() {
 	import os
 
-	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'):
+	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, 1) == '1'):
 		bb.debug(1, "package requested not splitting locales")
 		return
 
-	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
+	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
 
-	datadir = bb.data.getVar('datadir', d, True)
+	datadir = bb.data.getVar('datadir', d, 1)
 	if not datadir:
 		bb.note("datadir not defined")
 		return
 
-	dvar = bb.data.getVar('D', d, True)
+	dvar = bb.data.getVar('D', d, 1)
 	if not dvar:
 		bb.error("D not defined")
 		return
 
-	pn = bb.data.getVar('PN', d, True)
+	pn = bb.data.getVar('PN', d, 1)
 	if not pn:
 		bb.error("PN not defined")
 		return
@@ -346,27 +346,27 @@ python package_do_split_locales() {
 python populate_packages () {
 	import glob, stat, errno, re
 
-	workdir = bb.data.getVar('WORKDIR', d, True)
+	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
 		bb.error("WORKDIR not defined, unable to package")
 		return
 
 	import os # path manipulations
-	outdir = bb.data.getVar('DEPLOY_DIR', d, True)
+	outdir = bb.data.getVar('DEPLOY_DIR', d, 1)
 	if not outdir:
 		bb.error("DEPLOY_DIR not defined, unable to package")
 		return
 	bb.mkdirhier(outdir)
 
-	dvar = bb.data.getVar('D', d, True)
+	dvar = bb.data.getVar('D', d, 1)
 	if not dvar:
 		bb.error("D not defined, unable to package")
 		return
 	bb.mkdirhier(dvar)
 
-	packages = bb.data.getVar('PACKAGES', d, True)
+	packages = bb.data.getVar('PACKAGES', d, 1)
 
-	pn = bb.data.getVar('PN', d, True)
+	pn = bb.data.getVar('PN', d, 1)
 	if not pn:
 		bb.error("PN not defined")
 		return
@@ -392,19 +392,19 @@ python populate_packages () {
 		else:
 			package_list.append(pkg)
 
-	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'):
+	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
 		for root, dirs, files in os.walk(dvar):
 			for f in files:
 				file = os.path.join(root, f)
 				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
 					runstrip(file, d)
 
-	pkgdest = bb.data.getVar('PKGDEST', d, True)
+	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 	os.system('rm -rf %s' % pkgdest)
 
 	seen = []
 	main_is_empty = 1
-	main_pkg = bb.data.getVar('PN', d, True)
+	main_pkg = bb.data.getVar('PN', d, 1)
 
 	for pkg in package_list:
 		localdata = bb.data.createCopy(d)
@@ -412,13 +412,13 @@ python populate_packages () {
 		bb.mkdirhier(root)
 
 		bb.data.setVar('PKG', pkg, localdata)
-		overrides = bb.data.getVar('OVERRIDES', localdata, True)
+		overrides = bb.data.getVar('OVERRIDES', localdata, 1)
 		if not overrides:
 			raise bb.build.FuncFailed('OVERRIDES not defined')
 		bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
 		bb.data.update_data(localdata)
 
-		filesvar = bb.data.getVar('FILES', localdata, True) or ""
+		filesvar = bb.data.getVar('FILES', localdata, 1) or ""
 		files = filesvar.split()
 		for file in files:
 			if os.path.isabs(file):
@@ -473,7 +473,7 @@ python populate_packages () {
 	bb.build.exec_func("package_name_hook", d)
 
 	for pkg in package_list:
-		pkgname = bb.data.getVar('PKG_%s' % pkg, d, True)
+		pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
 		if pkgname is None:
 			bb.data.setVar('PKG_%s' % pkg, pkg, d)
 
@@ -532,11 +532,11 @@ python emit_pkgdata() {
 			c = codecs.getencoder("string_escape")
 			return c(str)[0]
 
-		val = bb.data.getVar('%s_%s' % (var, pkg), d, True)
+		val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
 		if val:
 			f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
  			return
- 		val = bb.data.getVar('%s' % (var), d, True)
+ 		val = bb.data.getVar('%s' % (var), d, 1)
  		if val:
  			f.write('%s: %s\n' % (var, encode(val)))
  		return
@@ -554,7 +554,7 @@ python emit_pkgdata() {
 	f.close()
 	package_stagefile(data_file, d)
 
-	workdir = bb.data.getVar('WORKDIR', d, True)
+	workdir = bb.data.getVar('WORKDIR', d, 1)
 
 	for pkg in packages.split():
 		subdata_file = pkgdatadir + "/runtime/%s" % pkg
@@ -582,9 +582,9 @@ python emit_pkgdata() {
 		#if pkgdatadir2:
 		#	bb.copyfile(subdata_file, pkgdatadir2 + "/runtime/%s" % pkg)
 
-		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True)
+		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
 		if not allow_empty:
-			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True)
+			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
 		root = "%s/install/%s" % (workdir, pkg)
 		os.chdir(root)
 		g = glob('*') + glob('.[!.]*')
@@ -618,21 +618,21 @@ python package_do_shlibs() {
 	lib_re = re.compile("^lib.*\.so")
 	libdir_re = re.compile(".*/lib$")
 
-	packages = bb.data.getVar('PACKAGES', d, True)
+	packages = bb.data.getVar('PACKAGES', d, 1)
 
-	workdir = bb.data.getVar('WORKDIR', d, True)
+	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
 		bb.error("WORKDIR not defined")
 		return
 
-	ver = bb.data.getVar('PV', d, True)
+	ver = bb.data.getVar('PV', d, 1)
 	if not ver:
 		bb.error("PV not defined")
 		return
 
-	pkgdest = bb.data.getVar('PKGDEST', d, True)
+	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 
-	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
+	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
 	bb.mkdirhier(shlibs_dir)
 
 	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
@@ -650,12 +650,12 @@ python package_do_shlibs() {
 		use_ldconfig = False
 
 	needed = {}
-	private_libs = bb.data.getVar('PRIVATE_LIBS', d, True)
+	private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
 	for pkg in packages.split():
 		needs_ldconfig = False
 		bb.debug(2, "calculating shlib provides for %s" % pkg)
 
-		pkgver = bb.data.getVar('PV_' + pkg, d, True)
+		pkgver = bb.data.getVar('PV_' + pkg, d, 1)
 		if not pkgver:
 			pkgver = ver
 
@@ -668,8 +668,8 @@ python package_do_shlibs() {
 				soname = None
 				path = os.path.join(root, file)
 				if (os.access(path, os.X_OK) or lib_re.match(file)) and not os.path.islink(path):
-					cmd = bb.data.getVar('OBJDUMP', d, True) + " -p " + path + " 2>/dev/null"
-					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, True), cmd)
+					cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
+					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd)
 					fd = os.popen(cmd)
 					lines = fd.readlines()
 					fd.close()
@@ -708,10 +708,10 @@ python package_do_shlibs() {
 			package_stagefile(shver_file, d)
 		if needs_ldconfig and use_ldconfig:
 			bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
-			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, True) or bb.data.getVar('pkg_postinst', d, True)
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
 			if not postinst:
 				postinst = '#!/bin/sh\n'
-			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True)
+			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, 1)
 			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
 	if pstageactive == "1":
@@ -738,7 +738,7 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
-	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True)
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
 	if assumed_libs:
 	    for e in assumed_libs.split():
 		l, dep_pkg = e.split(":")
@@ -786,16 +786,16 @@ python package_do_shlibs() {
 python package_do_pkgconfig () {
 	import re, os
 
-	packages = bb.data.getVar('PACKAGES', d, True)
+	packages = bb.data.getVar('PACKAGES', d, 1)
 
-	workdir = bb.data.getVar('WORKDIR', d, True)
+	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
 		bb.error("WORKDIR not defined")
 		return
 
-	pkgdest = bb.data.getVar('PKGDEST', d, True)
+	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 
-	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
+	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
 	bb.mkdirhier(shlibs_dir)
 
 	pc_re = re.compile('(.*)\.pc$')
@@ -890,7 +890,7 @@ python package_do_pkgconfig () {
 }
 
 python read_shlibdeps () {
-	packages = bb.data.getVar('PACKAGES', d, True).split()
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
 	for pkg in packages:
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
 		for extension in ".shlibdeps", ".pcdeps", ".clilibdeps":
@@ -918,14 +918,14 @@ python package_depchains() {
 	package.
 	"""
 
-	packages  = bb.data.getVar('PACKAGES', d, True)
-	postfixes = (bb.data.getVar('DEPCHAIN_POST', d, True) or '').split()
-	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, True) or '').split()
+	packages  = bb.data.getVar('PACKAGES', d, 1)
+	postfixes = (bb.data.getVar('DEPCHAIN_POST', d, 1) or '').split()
+	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
 
 	def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
 
 		#bb.note('depends for %s is %s' % (base, depends))
-		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
 
 		for depend in depends:
 			if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
@@ -946,7 +946,7 @@ python package_depchains() {
 	def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
 
 		#bb.note('rdepends for %s is %s' % (base, rdepends))
-		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
 
 		for depend in rdepends:
 			if depend.endswith('-dev'):
@@ -966,15 +966,15 @@ python package_depchains() {
 			list.append(dep)
 
 	depends = []
-	for dep in explode_deps(bb.data.getVar('DEPENDS', d, True) or ""):
+	for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""):
 		add_dep(depends, dep)
 
 	rdepends = []
-	for dep in explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""):
+	for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""):
 		add_dep(rdepends, dep)
 
 	for pkg in packages.split():
-		for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, True) or ""):
+		for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""):
 			add_dep(rdepends, dep)
 
 	#bb.note('rdepends is %s' % rdepends)
@@ -1007,7 +1007,7 @@ python package_depchains() {
 				pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
 			else:
 				rdeps = []
-				for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, True) or bb.data.getVar('RDEPENDS', d, True) or ""):
+				for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""):
 					add_dep(rdeps, dep)
 				pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
 }
@@ -1035,7 +1035,7 @@ def package_run_hooks(f, d):
 				bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d)
 				line += 1
 			fp.close()
-	                anonqueue = bb.data.getVar("__anonqueue", d, True) or []
+	                anonqueue = bb.data.getVar("__anonqueue", d, 1) or []
         	        body = [x['content'] for x in anonqueue]
             	        flag = { 'python' : 1, 'func' : 1 }
             	        bb.data.setVar("__anonfunc", "\n".join(body), d)
@@ -1054,12 +1054,12 @@ def package_run_hooks(f, d):
             		bb.data.delVar("__anonfunc", d)
 
 python package_do_package () {
-	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
+	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
 	if len(packages) < 1:
 		bb.debug(1, "No packages to build, skipping do_package")
 		return
 
-	for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split():
+	for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split():
 		bb.build.exec_func(f, d)
 		package_run_hooks(f, d)
 }
-- 
cgit v1.2.3


From 138f792724e42d5b87668d470e3162ba4148ed14 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Sat, 31 Oct 2009 13:52:45 +0100
Subject: Revert "Revert "package.bbclass: Cleanup getVar syntax to use True,
 not 1 as third argument (from Poky)"" Oops, accidently reverted a patch,
 reverting the revert. Sorry for any inconvenience

This reverts commit 056193c6638892ddde7bddbfc6f6f06a2288ba64.
---
 classes/package.bbclass | 120 ++++++++++++++++++++++++------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

(limited to 'classes')

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 7a9b987c7c..e7865754eb 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -28,12 +28,12 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 	"""
 	import os, os.path, bb
 
-	dvar = bb.data.getVar('D', d, 1)
+	dvar = bb.data.getVar('D', d, True)
 	if not dvar:
 		bb.error("D not defined")
 		return
 
-	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	packages = bb.data.getVar('PACKAGES', d, True).split()
 
 	if postinst:
 		postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -94,7 +94,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 					the_files.append(aux_files_pattern_verbatim % m.group(1))
 			bb.data.setVar('FILES_' + pkg, " ".join(the_files), d)
 			if extra_depends != '':
-				the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, 1)
+				the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, True)
 				if the_depends:
 					the_depends = '%s %s' % (the_depends, extra_depends)
 				else:
@@ -106,7 +106,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 			if postrm:
 				bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
 		else:
-			oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
+			oldfiles = bb.data.getVar('FILES_' + pkg, d, True)
 			if not oldfiles:
 				bb.fatal("Package '%s' exists but has no files" % pkg)
 			bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
@@ -152,7 +152,7 @@ def runstrip(file, d):
 
     import bb, os, commands, stat
 
-    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1)
+    pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
 
     ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
 
@@ -169,8 +169,8 @@ def runstrip(file, d):
         bb.debug(2, "Already ran strip on %s" % file)
         return 0
 
-    strip = bb.data.getVar("STRIP", d, 1)
-    objcopy = bb.data.getVar("OBJCOPY", d, 1)
+    strip = bb.data.getVar("STRIP", d, True)
+    objcopy = bb.data.getVar("OBJCOPY", d, True)
 
     newmode = None
     if not os.access(file, os.W_OK):
@@ -268,10 +268,10 @@ def get_package_mapping (pkg, d):
 def runtime_mapping_rename (varname, d):
 	import bb, os
 
-	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1)))	
+	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))	
 
 	new_depends = []
-	for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""):
+	for depend in explode_deps(bb.data.getVar(varname, d, True) or ""):
 		# Have to be careful with any version component of the depend
 		split_depend = depend.split(' (')
 		new_depend = get_package_mapping(split_depend[0].strip(), d)
@@ -282,7 +282,7 @@ def runtime_mapping_rename (varname, d):
 
 	bb.data.setVar(varname, " ".join(new_depends) or None, d)
 
-	#bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1)))
+	#bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, True)))
 
 #
 # Package functions suitable for inclusion in PACKAGEFUNCS
@@ -291,23 +291,23 @@ def runtime_mapping_rename (varname, d):
 python package_do_split_locales() {
 	import os
 
-	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, 1) == '1'):
+	if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'):
 		bb.debug(1, "package requested not splitting locales")
 		return
 
-	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
 
-	datadir = bb.data.getVar('datadir', d, 1)
+	datadir = bb.data.getVar('datadir', d, True)
 	if not datadir:
 		bb.note("datadir not defined")
 		return
 
-	dvar = bb.data.getVar('D', d, 1)
+	dvar = bb.data.getVar('D', d, True)
 	if not dvar:
 		bb.error("D not defined")
 		return
 
-	pn = bb.data.getVar('PN', d, 1)
+	pn = bb.data.getVar('PN', d, True)
 	if not pn:
 		bb.error("PN not defined")
 		return
@@ -346,27 +346,27 @@ python package_do_split_locales() {
 python populate_packages () {
 	import glob, stat, errno, re
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 	if not workdir:
 		bb.error("WORKDIR not defined, unable to package")
 		return
 
 	import os # path manipulations
-	outdir = bb.data.getVar('DEPLOY_DIR', d, 1)
+	outdir = bb.data.getVar('DEPLOY_DIR', d, True)
 	if not outdir:
 		bb.error("DEPLOY_DIR not defined, unable to package")
 		return
 	bb.mkdirhier(outdir)
 
-	dvar = bb.data.getVar('D', d, 1)
+	dvar = bb.data.getVar('D', d, True)
 	if not dvar:
 		bb.error("D not defined, unable to package")
 		return
 	bb.mkdirhier(dvar)
 
-	packages = bb.data.getVar('PACKAGES', d, 1)
+	packages = bb.data.getVar('PACKAGES', d, True)
 
-	pn = bb.data.getVar('PN', d, 1)
+	pn = bb.data.getVar('PN', d, True)
 	if not pn:
 		bb.error("PN not defined")
 		return
@@ -392,19 +392,19 @@ python populate_packages () {
 		else:
 			package_list.append(pkg)
 
-	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'):
+	if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'):
 		for root, dirs, files in os.walk(dvar):
 			for f in files:
 				file = os.path.join(root, f)
 				if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
 					runstrip(file, d)
 
-	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+	pkgdest = bb.data.getVar('PKGDEST', d, True)
 	os.system('rm -rf %s' % pkgdest)
 
 	seen = []
 	main_is_empty = 1
-	main_pkg = bb.data.getVar('PN', d, 1)
+	main_pkg = bb.data.getVar('PN', d, True)
 
 	for pkg in package_list:
 		localdata = bb.data.createCopy(d)
@@ -412,13 +412,13 @@ python populate_packages () {
 		bb.mkdirhier(root)
 
 		bb.data.setVar('PKG', pkg, localdata)
-		overrides = bb.data.getVar('OVERRIDES', localdata, 1)
+		overrides = bb.data.getVar('OVERRIDES', localdata, True)
 		if not overrides:
 			raise bb.build.FuncFailed('OVERRIDES not defined')
 		bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
 		bb.data.update_data(localdata)
 
-		filesvar = bb.data.getVar('FILES', localdata, 1) or ""
+		filesvar = bb.data.getVar('FILES', localdata, True) or ""
 		files = filesvar.split()
 		for file in files:
 			if os.path.isabs(file):
@@ -473,7 +473,7 @@ python populate_packages () {
 	bb.build.exec_func("package_name_hook", d)
 
 	for pkg in package_list:
-		pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
+		pkgname = bb.data.getVar('PKG_%s' % pkg, d, True)
 		if pkgname is None:
 			bb.data.setVar('PKG_%s' % pkg, pkg, d)
 
@@ -532,11 +532,11 @@ python emit_pkgdata() {
 			c = codecs.getencoder("string_escape")
 			return c(str)[0]
 
-		val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
+		val = bb.data.getVar('%s_%s' % (var, pkg), d, True)
 		if val:
 			f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
  			return
- 		val = bb.data.getVar('%s' % (var), d, 1)
+ 		val = bb.data.getVar('%s' % (var), d, True)
  		if val:
  			f.write('%s: %s\n' % (var, encode(val)))
  		return
@@ -554,7 +554,7 @@ python emit_pkgdata() {
 	f.close()
 	package_stagefile(data_file, d)
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 
 	for pkg in packages.split():
 		subdata_file = pkgdatadir + "/runtime/%s" % pkg
@@ -582,9 +582,9 @@ python emit_pkgdata() {
 		#if pkgdatadir2:
 		#	bb.copyfile(subdata_file, pkgdatadir2 + "/runtime/%s" % pkg)
 
-		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
+		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True)
 		if not allow_empty:
-			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
+			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True)
 		root = "%s/install/%s" % (workdir, pkg)
 		os.chdir(root)
 		g = glob('*') + glob('.[!.]*')
@@ -618,21 +618,21 @@ python package_do_shlibs() {
 	lib_re = re.compile("^lib.*\.so")
 	libdir_re = re.compile(".*/lib$")
 
-	packages = bb.data.getVar('PACKAGES', d, 1)
+	packages = bb.data.getVar('PACKAGES', d, True)
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 	if not workdir:
 		bb.error("WORKDIR not defined")
 		return
 
-	ver = bb.data.getVar('PV', d, 1)
+	ver = bb.data.getVar('PV', d, True)
 	if not ver:
 		bb.error("PV not defined")
 		return
 
-	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+	pkgdest = bb.data.getVar('PKGDEST', d, True)
 
-	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
+	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
 	bb.mkdirhier(shlibs_dir)
 
 	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
@@ -650,12 +650,12 @@ python package_do_shlibs() {
 		use_ldconfig = False
 
 	needed = {}
-	private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1)
+	private_libs = bb.data.getVar('PRIVATE_LIBS', d, True)
 	for pkg in packages.split():
 		needs_ldconfig = False
 		bb.debug(2, "calculating shlib provides for %s" % pkg)
 
-		pkgver = bb.data.getVar('PV_' + pkg, d, 1)
+		pkgver = bb.data.getVar('PV_' + pkg, d, True)
 		if not pkgver:
 			pkgver = ver
 
@@ -668,8 +668,8 @@ python package_do_shlibs() {
 				soname = None
 				path = os.path.join(root, file)
 				if (os.access(path, os.X_OK) or lib_re.match(file)) and not os.path.islink(path):
-					cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
-					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd)
+					cmd = bb.data.getVar('OBJDUMP', d, True) + " -p " + path + " 2>/dev/null"
+					cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, True), cmd)
 					fd = os.popen(cmd)
 					lines = fd.readlines()
 					fd.close()
@@ -708,10 +708,10 @@ python package_do_shlibs() {
 			package_stagefile(shver_file, d)
 		if needs_ldconfig and use_ldconfig:
 			bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg)
-			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, True) or bb.data.getVar('pkg_postinst', d, True)
 			if not postinst:
 				postinst = '#!/bin/sh\n'
-			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, 1)
+			postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True)
 			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
 	if pstageactive == "1":
@@ -738,7 +738,7 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
-	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True)
 	if assumed_libs:
 	    for e in assumed_libs.split():
 		l, dep_pkg = e.split(":")
@@ -786,16 +786,16 @@ python package_do_shlibs() {
 python package_do_pkgconfig () {
 	import re, os
 
-	packages = bb.data.getVar('PACKAGES', d, 1)
+	packages = bb.data.getVar('PACKAGES', d, True)
 
-	workdir = bb.data.getVar('WORKDIR', d, 1)
+	workdir = bb.data.getVar('WORKDIR', d, True)
 	if not workdir:
 		bb.error("WORKDIR not defined")
 		return
 
-	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+	pkgdest = bb.data.getVar('PKGDEST', d, True)
 
-	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1)
+	shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
 	bb.mkdirhier(shlibs_dir)
 
 	pc_re = re.compile('(.*)\.pc$')
@@ -890,7 +890,7 @@ python package_do_pkgconfig () {
 }
 
 python read_shlibdeps () {
-	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	packages = bb.data.getVar('PACKAGES', d, True).split()
 	for pkg in packages:
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
 		for extension in ".shlibdeps", ".pcdeps", ".clilibdeps":
@@ -918,14 +918,14 @@ python package_depchains() {
 	package.
 	"""
 
-	packages  = bb.data.getVar('PACKAGES', d, 1)
-	postfixes = (bb.data.getVar('DEPCHAIN_POST', d, 1) or '').split()
-	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
+	packages  = bb.data.getVar('PACKAGES', d, True)
+	postfixes = (bb.data.getVar('DEPCHAIN_POST', d, True) or '').split()
+	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, True) or '').split()
 
 	def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d):
 
 		#bb.note('depends for %s is %s' % (base, depends))
-		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
 
 		for depend in depends:
 			if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
@@ -946,7 +946,7 @@ python package_depchains() {
 	def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
 
 		#bb.note('rdepends for %s is %s' % (base, rdepends))
-		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
+		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "")
 
 		for depend in rdepends:
 			if depend.endswith('-dev'):
@@ -966,15 +966,15 @@ python package_depchains() {
 			list.append(dep)
 
 	depends = []
-	for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""):
+	for dep in explode_deps(bb.data.getVar('DEPENDS', d, True) or ""):
 		add_dep(depends, dep)
 
 	rdepends = []
-	for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""):
+	for dep in explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""):
 		add_dep(rdepends, dep)
 
 	for pkg in packages.split():
-		for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""):
+		for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, True) or ""):
 			add_dep(rdepends, dep)
 
 	#bb.note('rdepends is %s' % rdepends)
@@ -1007,7 +1007,7 @@ python package_depchains() {
 				pkg_addrrecs(pkg, base, suffix, func, rdepends, d)
 			else:
 				rdeps = []
-				for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""):
+				for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, True) or bb.data.getVar('RDEPENDS', d, True) or ""):
 					add_dep(rdeps, dep)
 				pkg_addrrecs(pkg, base, suffix, func, rdeps, d)
 }
@@ -1035,7 +1035,7 @@ def package_run_hooks(f, d):
 				bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d)
 				line += 1
 			fp.close()
-	                anonqueue = bb.data.getVar("__anonqueue", d, 1) or []
+	                anonqueue = bb.data.getVar("__anonqueue", d, True) or []
         	        body = [x['content'] for x in anonqueue]
             	        flag = { 'python' : 1, 'func' : 1 }
             	        bb.data.setVar("__anonfunc", "\n".join(body), d)
@@ -1054,12 +1054,12 @@ def package_run_hooks(f, d):
             		bb.data.delVar("__anonfunc", d)
 
 python package_do_package () {
-	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	packages = (bb.data.getVar('PACKAGES', d, True) or "").split()
 	if len(packages) < 1:
 		bb.debug(1, "No packages to build, skipping do_package")
 		return
 
-	for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split():
+	for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split():
 		bb.build.exec_func(f, d)
 		package_run_hooks(f, d)
 }
-- 
cgit v1.2.3


From c510866574d65798eef3ef36318457b41cf542c0 Mon Sep 17 00:00:00 2001
From: Matthew Dombroski <matthew@4d-electronics.co.nz>
Date: Tue, 3 Nov 2009 14:25:34 +0100
Subject: qmake2.bbclass: Add lupdate and lrelease.

http://patchwork.openembedded.org/patch/987

Signed-off-by: Matthew Dombroski <matthew@4d-electronics.co.nz>
Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
---
 classes/qmake2.bbclass | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'classes')

diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 26e813a036..37721898d6 100644
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -19,3 +19,5 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
+export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"
-- 
cgit v1.2.3


From c724ad44d6adfda201f33c15378cab8d9e7ee902 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 3 Nov 2009 14:45:02 +0100
Subject: base.bbclass: Better error message in case the Config Parser fails

http://patchwork.openembedded.org/patch/1088/
Tested-by: Ed Nelson <enelson1000@comcast.net>
---
 classes/base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index d29ba4bfcf..89ee917d20 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -661,7 +661,7 @@ python base_do_fetch() {
 		bb.note("No conf/checksums.ini found, not checking checksums")
 		return
 	except:
-		bb.note("Creating the CheckSum parser failed")
+		bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1]))
 		return
 
 	pv = bb.data.getVar('PV', d, True)
-- 
cgit v1.2.3


From d450fec33abb311dac3d47a51e16098b802d08e2 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Tue, 3 Nov 2009 17:38:31 +0100
Subject: cmake.bbclass: use staging from autotools too

---
 classes/cmake.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index b5b7b8655b..4978421b63 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -1,7 +1,7 @@
 DEPENDS += " cmake-native "
 
 # We want the staging and installing functions from autotools
-inherit autotools
+inherit autotools_stage
 
 # Use in-tree builds by default but allow this to be changed
 # since some packages do not support them (e.g. llvm 2.5).
-- 
cgit v1.2.3


From 4dcaca2917c61d8858e4a86ed84f32435e119c79 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 4 Nov 2009 10:11:42 +0100
Subject: e* bbclass: fix up PACKAGES (again!)

This should why overriding PACKAGES is bad
---
 classes/e.bbclass   | 2 +-
 classes/efl.bbclass | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'classes')

diff --git a/classes/e.bbclass b/classes/e.bbclass
index a6fa1d0d78..fca9aa0010 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -23,7 +23,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
 # And it's in efl.bbclass as well....
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
 FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 22e664ce01..d4c3baa9cf 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -24,7 +24,7 @@ do_stage() {
 }
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
 
 FILES_${PN} = "${libdir}/*.so.*"
 
@@ -40,13 +40,14 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \
 FILES_${PN}-dev   += "${bindir}/${PN}-config \
                       ${libdir}/pkgconfig/* \
                       ${libdir}/lib*.la \
-                      ${libdir}/lib*.a \
                       ${libdir}/*.so \
-                      ${libdir}/${PN}/*.a \
                       ${libdir}/${PN}/*.la \
-                      ${libdir}/${PN}/*/*.a \
                       ${libdir}/${PN}/*/*.la"
 
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+                       ${libdir}/${PN}/*/*.a \
+"
+
 FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
                       ${libdir}/${PN}/*/.debug"
 
-- 
cgit v1.2.3


From 4270cb2928afa95117bde026244fb877ee8e2a6e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@buglabs.net>
Date: Thu, 5 Nov 2009 15:37:36 +0100
Subject: java.bbclass: fixed oe_jarinstall for broken symlinks

Code checked for existance of JAR file and if it was present then it had
to be removed before symlinking to it. But it was not working sometimes
so we forced symlinking.

Proper fix is to check "does file exists or is a symlink" which we do
now.

Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net>
---
 classes/java.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/java.bbclass b/classes/java.bbclass
index cacd2ce525..b68035c13e 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -68,11 +68,11 @@ oe_jarinstall() {
 
   # Creates symlinks out of the remaining arguments.
   while [ "$#" -gt 0 ]; do
-    if [ -e $dir/$1 ]; then
+    if [ -e $dir/$1 -o -h $dir/$1 ]; then
       oewarn "file was in the way. removing:" $dir/$1
       rm $dir/$1
     fi
-    ln -sf $destname $dir/$1
+    ln -s $destname $dir/$1
     shift
   done
 }
-- 
cgit v1.2.3


From 58e0b0dc2501957c27a58ad1e2ffebf61f48c3b6 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 8 Nov 2009 12:43:39 +0100
Subject: gnome bbclass: delete more scrollkeeper junk

---
 classes/gnome.bbclass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes')

diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 2045697516..cb03650b48 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -24,6 +24,7 @@ gnome_stage_includes() {
 
 do_install_append() {
 	rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+	rm -rf ${D}${localstatedir}/scrollkeeper/*
 	rm -f ${D}${datadir}/applications/*.cache
 }
 
-- 
cgit v1.2.3


From 0d722f5b12f447a46af3f935c0c516bfab927893 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Sun, 8 Nov 2009 20:48:44 +0000
Subject: base.bbclass: Drop legacy rebuild mangling code

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 classes/base.bbclass | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'classes')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 89ee917d20..4cda29cf38 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -529,21 +529,11 @@ python do_cleanall() {
 do_cleanall[recrdeptask] = "do_clean"
 addtask cleanall after do_clean
 
-#Uncomment this for bitbake 1.8.12
-#addtask rebuild after do_${BB_DEFAULT_TASK}
-addtask rebuild
+addtask rebuild after do_${BB_DEFAULT_TASK}
 do_rebuild[dirs] = "${TOPDIR}"
 do_rebuild[nostamp] = "1"
 python base_do_rebuild() {
 	"""rebuild a package"""
-	from bb import __version__
-	try:
-		from distutils.version import LooseVersion
-	except ImportError:
-		def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
-	if (LooseVersion(__version__) < LooseVersion('1.8.11')):
-		bb.build.exec_func('do_clean', d)
-		bb.build.exec_task('do_' + bb.data.getVar('BB_DE