From b4a7122cacef647dbec3db5c9ebe1e504a7670df Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 20 Sep 2005 07:04:35 +0000
Subject: Updates against mainline OE

git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/classes/autotools.bbclass   |  2 +-
 openembedded/classes/base.bbclass        | 14 +++++++++++---
 openembedded/classes/package_ipk.bbclass |  1 +
 openembedded/classes/qt3x11.bbclass      |  1 +
 openembedded/classes/qt4x11.bbclass      |  1 +
 openembedded/classes/sourcepkg.bbclass   |  2 +-
 6 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'openembedded/classes')

diff --git a/openembedded/classes/autotools.bbclass b/openembedded/classes/autotools.bbclass
index 8a387da5c..ec1d4af1a 100644
--- a/openembedded/classes/autotools.bbclass
+++ b/openembedded/classes/autotools.bbclass
@@ -145,7 +145,7 @@ autotools_stage_includes() {
 		rm -rf ${STAGE_TEMP}
 		mkdir -p ${STAGE_TEMP}
 		make DESTDIR="${STAGE_TEMP}" install
-		cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+		cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
 		rm -rf ${STAGE_TEMP}
 	fi
 }
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass
index 37254b94b..18d51a02e 100644
--- a/openembedded/classes/base.bbclass
+++ b/openembedded/classes/base.bbclass
@@ -371,7 +371,7 @@ def oe_unpack_file(file, data, url = None):
 				destdir = "."
 			elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK):
 				os.makedirs("%s/%s" % (os.getcwd(), destdir))
-		cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir)
+		cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
 	else:
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
 		if not 'patch' in parm:
@@ -496,8 +496,16 @@ python base_eventhandler() {
 	note(msg)
 
 	if name.startswith("BuildStarted"):
-		statusvars = ['TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO',
-			      'TARGET_FPU']
+		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
+		path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
+		path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )]
+		monotone_revision = "<unknown>"
+		try:
+			monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
+		except IOError:
+			pass
+		bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
+		statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU']
 		statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
 		statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
 		print statusmsg
diff --git a/openembedded/classes/package_ipk.bbclass b/openembedded/classes/package_ipk.bbclass
index 3c6125d9e..6d3e1eb68 100644
--- a/openembedded/classes/package_ipk.bbclass
+++ b/openembedded/classes/package_ipk.bbclass
@@ -145,6 +145,7 @@ python do_package_ipk () {
 		fields.append(["Maintainer: %s\n", ['MAINTAINER']])
 		fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
 		fields.append(["OE: %s\n", ['P']])
+		fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
 		def pullData(l, d):
 			l2 = []
diff --git a/openembedded/classes/qt3x11.bbclass b/openembedded/classes/qt3x11.bbclass
index 09b9cbac9..1023a1f80 100644
--- a/openembedded/classes/qt3x11.bbclass
+++ b/openembedded/classes/qt3x11.bbclass
@@ -1,3 +1,4 @@
+DEPENDS += "qt3-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
diff --git a/openembedded/classes/qt4x11.bbclass b/openembedded/classes/qt4x11.bbclass
index d4ca0073d..92885aa7e 100644
--- a/openembedded/classes/qt4x11.bbclass
+++ b/openembedded/classes/qt4x11.bbclass
@@ -1,3 +1,4 @@
+DEPENDS += "qt4-x11"
 #
 # override variables set by qmake-base to compile Qt/X11 apps
 #
diff --git a/openembedded/classes/sourcepkg.bbclass b/openembedded/classes/sourcepkg.bbclass
index ee022c99d..3eeff9133 100644
--- a/openembedded/classes/sourcepkg.bbclass
+++ b/openembedded/classes/sourcepkg.bbclass
@@ -43,7 +43,7 @@ sourcepkg_do_create_orig_tgz(){
 	echo $src_tree
 	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
 	tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz  $src_tree --exclude-from temp/exclude-from-file
-	cp -a $src_tree $src_tree.orig
+	cp -pPR $src_tree $src_tree.orig
 }
 
 sourcepkg_do_archive_bb() {
-- 
cgit v1.2.3