summaryrefslogtreecommitdiffstats
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)
downloadpoky-a4b8304b62d6bf4b522769d5d9283050a5e63f3c.tar.gz
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 @@
1STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" 1STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
2WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" 2WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
3STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" 3STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
4PKGDATA_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/pkgdata" 4PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
5 5
6# Find any machine specific sub packages and if present, mark the 6# Find any machine specific sub packages and if present, mark the
7# whole package as machine specific for multimachine purposes. 7# 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() {
497 if not packages: 497 if not packages:
498 return 498 return
499 499
500 data_file = bb.data.expand("${STAGING_DIR}/pkgdata/${PN}", d) 500 data_file = bb.data.expand("${PKGDATA_DIR}/${PN}", d)
501 f = open(data_file, 'w') 501 f = open(data_file, 'w')
502 f.write("PACKAGES: %s\n" % packages) 502 f.write("PACKAGES: %s\n" % packages)
503 f.close() 503 f.close()
504 504
505 for pkg in packages.split(): 505 for pkg in packages.split():
506 subdata_file = bb.data.expand("${STAGING_DIR}/pkgdata/runtime/%s" % pkg, d) 506 subdata_file = bb.data.expand("${PKGDATA_DIR}/runtime/%s" % pkg, d)
507 sf = open(subdata_file, 'w') 507 sf = open(subdata_file, 'w')
508 write_if_exists(sf, pkg, 'DESCRIPTION') 508 write_if_exists(sf, pkg, 'DESCRIPTION')
509 write_if_exists(sf, pkg, 'RDEPENDS') 509 write_if_exists(sf, pkg, 'RDEPENDS')
@@ -522,7 +522,7 @@ python emit_pkgdata() {
522 write_if_exists(sf, pkg, 'pkg_prerm') 522 write_if_exists(sf, pkg, 'pkg_prerm')
523 sf.close() 523 sf.close()
524} 524}
525emit_pkgdata[dirs] = "${STAGING_DIR}/pkgdata/runtime" 525emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
526 526
527ldconfig_postinst_fragment() { 527ldconfig_postinst_fragment() {
528if [ x"$D" = "x" ]; then 528if [ x"$D" = "x" ]; then
@@ -820,7 +820,7 @@ python package_depchains() {
820 820
821 def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): 821 def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
822 def packaged(pkg, d): 822 def packaged(pkg, d):
823 return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK) 823 return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
824 824
825 #bb.note('rdepends for %s is %s' % (base, rdepends)) 825 #bb.note('rdepends for %s is %s' % (base, rdepends))
826 826
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 () {
225 if ret != 0: 225 if ret != 0:
226 raise bb.build.FuncFailed("ipkg-build execution failed") 226 raise bb.build.FuncFailed("ipkg-build execution failed")
227 227
228 file(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), 'w').close()
229
230 for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: 228 for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
231 scriptfile = os.path.join(controldir, script) 229 scriptfile = os.path.join(controldir, script)
232 try: 230 try: