summaryrefslogtreecommitdiff
path: root/openembedded/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-20 07:04:35 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-20 07:04:35 +0000
commitb4a7122cacef647dbec3db5c9ebe1e504a7670df (patch)
tree006885a1f4e8032062632ee1a091e72c32dd2810 /openembedded/classes
parentf9e1d16bfa73a2df5254c63ae1abb6a4bbe0a062 (diff)
downloadopenembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.gz
openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.bz2
openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.xz
openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.zip
Updates against mainline OE
git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes')
-rw-r--r--openembedded/classes/autotools.bbclass2
-rw-r--r--openembedded/classes/base.bbclass14
-rw-r--r--openembedded/classes/package_ipk.bbclass1
-rw-r--r--openembedded/classes/qt3x11.bbclass1
-rw-r--r--openembedded/classes/qt4x11.bbclass1
-rw-r--r--openembedded/classes/sourcepkg.bbclass2
6 files changed, 16 insertions, 5 deletions
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() {