aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-10 22:50:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-14 15:16:04 +0000
commitcece583d58f82a50c3a4eac876eb326ac3b8f5e5 (patch)
tree77a9d3a2967290c9de0eb610590a01e967e86025 /meta
parent06c891f0fa6c7712eae233dd18612f1ab1889c45 (diff)
downloadopenembedded-core-contrib-cece583d58f82a50c3a4eac876eb326ac3b8f5e5.tar.gz
openembedded-core-contrib-cece583d58f82a50c3a4eac876eb326ac3b8f5e5.tar.bz2
openembedded-core-contrib-cece583d58f82a50c3a4eac876eb326ac3b8f5e5.zip
nopackages: Add class for recipes which don't generate packages
It turns out writing the same list of packaging tasks multiple times in multiple places is error prone. Move this to a new class 'nopackages", migrate existing users and add glibc-initial and libgcc-initial since we don't want packages for those recipes. This means the sstate for those recipes won't be installed, saving small amounts of build time and bandwidth. A reference to the old package_write task is also dropped. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross.bbclass8
-rw-r--r--meta/classes/native.bbclass8
-rw-r--r--meta/classes/nopackages.bbclass6
-rw-r--r--meta/recipes-core/glibc/glibc-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-source.inc8
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial.inc1
7 files changed, 14 insertions, 20 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 3eab5b907b..81d1c9d855 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -68,10 +68,4 @@ do_install () {
USE_NLS = "no"
-deltask package
-deltask packagedata
-deltask package_qa
-deltask package_write_ipk
-deltask package_write_deb
-deltask package_write_rpm
-deltask package_write
+inherit nopackages
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index bcbcd61e03..aac2c1e870 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -169,13 +169,7 @@ python native_virtclass_handler () {
addhandler native_virtclass_handler
native_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
-deltask package
-deltask packagedata
-deltask package_qa
-deltask package_write_ipk
-deltask package_write_deb
-deltask package_write_rpm
-deltask package_write
+inherit nopackages
do_packagedata[stamp-extra-info] = ""
do_populate_sysroot[stamp-extra-info] = ""
diff --git a/meta/classes/nopackages.bbclass b/meta/classes/nopackages.bbclass
new file mode 100644
index 0000000000..0c2761bef0
--- /dev/null
+++ b/meta/classes/nopackages.bbclass
@@ -0,0 +1,6 @@
+deltask do_package
+deltask do_package_write_rpm
+deltask do_package_write_ipk
+deltask do_package_write_deb
+deltask do_package_qa
+deltask do_packagedata
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
index 35008489ee..8e81f097aa 100644
--- a/meta/recipes-core/glibc/glibc-initial.inc
+++ b/meta/recipes-core/glibc/glibc-initial.inc
@@ -74,3 +74,5 @@ do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
do_evacuate_scripts () {
:
}
+
+inherit nopackages
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index ae92f220a5..910f2ef4d5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -98,3 +98,4 @@ sysroot_stage_all() {
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/ ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}/"
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/ ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}/"
+inherit nopackages
diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
index 794fd4de2e..49bde92c49 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-source.inc
@@ -1,16 +1,12 @@
deltask do_configure
deltask do_compile
-deltask do_package
-deltask do_package_write_rpm
-deltask do_package_write_ipk
-deltask do_package_write_deb
deltask do_install
deltask do_populate_sysroot
deltask do_populate_lic
-deltask do_package_qa
-deltask do_packagedata
deltask do_rm_work
+inherit nopackages
+
PN = "gcc-source-${PV}"
WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}"
SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:"
diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc
index 4e92f002f0..59e8a62e7f 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial.inc
+++ b/meta/recipes-devtools/gcc/libgcc-initial.inc
@@ -16,3 +16,4 @@ LIBGCCBUILDTREENAME = "gcc-build-internal-initial-"
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
+inherit nopackages