summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-10-02 11:33:33 +0000
committerKoen Kooi <koen@openembedded.org>2006-10-02 11:33:33 +0000
commit6e142fb48c1184dd125a96d5a2be4b9eea03fbf2 (patch)
tree451a6cc731f5737df0aad20deee5ef1a853d7edd
parent5ceebc17c8bba910df1f299739fa7b3f4e09fe36 (diff)
downloadopenembedded-6e142fb48c1184dd125a96d5a2be4b9eea03fbf2.tar.gz
classes/packaged-staging.bbclass: inherit package
classes/package.bbclass: use ?= for PACKAGEFUNCS
-rw-r--r--classes/package.bbclass2
-rw-r--r--classes/packaged-staging.bbclass2
2 files changed, 3 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 0e4028f8e4..27d5a3a685 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -786,7 +786,7 @@ python package_do_split_locales() {
bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
}
-PACKAGEFUNCS = "package_do_split_locales \
+PACKAGEFUNCS ?= "package_do_split_locales \
populate_packages package_do_shlibs \
package_do_pkgconfig read_shlibdeps \
package_depchains"
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index f693c4d8ef..af0c8da09d 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -19,6 +19,8 @@
# PSTAGE_MODE = 'repopulate': repopulated staging from scratch for each packages
# PSTAGE_MODE = 'append': append each package to staging (current behaviour)
+inherit package
+
DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage"
PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}"