summaryrefslogtreecommitdiffstats
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 22:30:57 +0000
commit0da1d71809b3248cc91f1d8f191ebf38fabc4439 (patch)
treeab874d250746aea8a1cc53b4b7cf50c30d7a3974 /meta
parent5003d147617eed64532f2d7f7d12689622f99723 (diff)
downloadpoky-0da1d71809b3248cc91f1d8f191ebf38fabc4439.tar.gz
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. (From OE-Core rev: cece583d58f82a50c3a4eac876eb326ac3b8f5e5) 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 () {
68 68
69USE_NLS = "no" 69USE_NLS = "no"
70 70
71deltask package 71inherit nopackages
72deltask packagedata
73deltask package_qa
74deltask package_write_ipk
75deltask package_write_deb
76deltask package_write_rpm
77deltask package_write
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 () {
169addhandler native_virtclass_handler 169addhandler native_virtclass_handler
170native_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" 170native_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
171 171
172deltask package 172inherit nopackages
173deltask packagedata
174deltask package_qa
175deltask package_write_ipk
176deltask package_write_deb
177deltask package_write_rpm
178deltask package_write
179 173
180do_packagedata[stamp-extra-info] = "" 174do_packagedata[stamp-extra-info] = ""
181do_populate_sysroot[stamp-extra-info] = "" 175do_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 @@
1deltask do_package
2deltask do_package_write_rpm
3deltask do_package_write_ipk
4deltask do_package_write_deb
5deltask do_package_qa
6deltask 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}/"
74do_evacuate_scripts () { 74do_evacuate_scripts () {
75 : 75 :
76} 76}
77
78inherit 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() {
98do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/ ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}/" 98do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/ ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}/"
99do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/ ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}/" 99do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/ ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}/"
100 100
101inherit 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 @@
1deltask do_configure 1deltask do_configure
2deltask do_compile 2deltask do_compile
3deltask do_package
4deltask do_package_write_rpm
5deltask do_package_write_ipk
6deltask do_package_write_deb
7deltask do_install 3deltask do_install
8deltask do_populate_sysroot 4deltask do_populate_sysroot
9deltask do_populate_lic 5deltask do_populate_lic
10deltask do_package_qa
11deltask do_packagedata
12deltask do_rm_work 6deltask do_rm_work
13 7
8inherit nopackages
9
14PN = "gcc-source-${PV}" 10PN = "gcc-source-${PV}"
15WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" 11WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}"
16SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" 12SSTATE_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-"
16 16
17do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/" 17do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
18 18
19inherit nopackages