summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-21 11:51:25 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-21 11:51:25 +0000
commita4b8304b62d6bf4b522769d5d9283050a5e63f3c (patch)
treedfd99644235c298deb9c435282e94d119eeca242 /meta/classes
parent4a705e9b1a6660a01d5528445b3b2acdbf9bd238 (diff)
downloadopenembedded-core-a4b8304b62d6bf4b522769d5d9283050a5e63f3c.tar.gz
openembedded-core-a4b8304b62d6bf4b522769d5d9283050a5e63f3c.tar.bz2
openembedded-core-a4b8304b62d6bf4b522769d5d9283050a5e63f3c.zip
package.bbclass: More pkgdata fixes, (install task needs to rerun on existing builds)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/multimachine.bbclass2
-rw-r--r--meta/classes/package.bbclass8
-rw-r--r--meta/classes/package_ipk.bbclass2
3 files changed, 5 insertions, 7 deletions
diff --git a/meta/classes/multimachine.bbclass b/meta/classes/multimachine.bbclass
index 7a2f24c963..945d22bfe0 100644
--- a/meta/classes/multimachine.bbclass
+++ b/meta/classes/multimachine.bbclass
@@ -1,7 +1,7 @@
STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
-PKGDATA_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/pkgdata"
+PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
# Find any machine specific sub packages and if present, mark the
# whole package as machine specific for multimachine purposes.
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e1a7d91a9e..ef7a084455 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -497,13 +497,13 @@ python emit_pkgdata() {
if not packages:
return
- data_file = bb.data.expand("${STAGING_DIR}/pkgdata/${PN}", d)
+ data_file = bb.data.expand("${PKGDATA_DIR}/${PN}", d)
f = open(data_file, 'w')
f.write("PACKAGES: %s\n" % packages)
f.close()
for pkg in packages.split():
- subdata_file = bb.data.expand("${STAGING_DIR}/pkgdata/runtime/%s" % pkg, d)
+ subdata_file = bb.data.expand("${PKGDATA_DIR}/runtime/%s" % pkg, d)
sf = open(subdata_file, 'w')
write_if_exists(sf, pkg, 'DESCRIPTION')
write_if_exists(sf, pkg, 'RDEPENDS')
@@ -522,7 +522,7 @@ python emit_pkgdata() {
write_if_exists(sf, pkg, 'pkg_prerm')
sf.close()
}
-emit_pkgdata[dirs] = "${STAGING_DIR}/pkgdata/runtime"
+emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
ldconfig_postinst_fragment() {
if [ x"$D" = "x" ]; then
@@ -820,7 +820,7 @@ python package_depchains() {
def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
def packaged(pkg, d):
- return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK)
+ return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
#bb.note('rdepends for %s is %s' % (base, rdepends))
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 2c75cd1838..17918bbde3 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -225,8 +225,6 @@ python do_package_ipk () {
if ret != 0:
raise bb.build.FuncFailed("ipkg-build execution failed")
- file(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), 'w').close()
-
for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
scriptfile = os.path.join(controldir, script)
try: