summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-27 12:33:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-28 23:32:16 +0000
commit60662a2117373648a0a41b3556e180f7a7350a47 (patch)
tree3464da324e8cd57835ac2d7c644caef5d40a1ef7
parent48f79758ea1a4a2abac38566e411e8d0a6f66ac5 (diff)
downloadpoky-60662a2117373648a0a41b3556e180f7a7350a47.tar.gz
image/kernelsrc/packagegroups/recipes: Remove uneeded noexec tasks
We used to have issues removing tasks like do_fetch due to implications for targets like world and universe. These have now been resolved. Removing uneeded tasks has advantages compared to noexec since it means that accidentally left in dependencies are no longer needed/processed (e.g. do_patch depends on quilt-native). This cleans up a number of cases which local analysis highlighted as being unneeded leading to slightly cleaner task graphs. (From OE-Core rev: 4e6ee37e09c60e83c0dfd844ba9cf8a07507f099) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/kernelsrc.bbclass6
-rw-r--r--meta/classes/packagegroup.bbclass12
-rw-r--r--meta/recipes-core/glibc/glibc-collateral.inc6
-rw-r--r--meta/recipes-core/meta/meta-environment.bb6
-rw-r--r--meta/recipes-core/meta/meta-world-pkgdata.bb12
-rw-r--r--meta/recipes-core/meta/package-index.bb24
7 files changed, 34 insertions, 34 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 76146c92cd..71b7ebc958 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -623,7 +623,7 @@ do_compile[noexec] = "1"
623do_install[noexec] = "1" 623do_install[noexec] = "1"
624deltask do_populate_sysroot 624deltask do_populate_sysroot
625do_package[noexec] = "1" 625do_package[noexec] = "1"
626do_package_qa[noexec] = "1" 626deltask do_package_qa
627do_packagedata[noexec] = "1" 627do_packagedata[noexec] = "1"
628do_package_write_ipk[noexec] = "1" 628do_package_write_ipk[noexec] = "1"
629do_package_write_deb[noexec] = "1" 629do_package_write_deb[noexec] = "1"
diff --git a/meta/classes/kernelsrc.bbclass b/meta/classes/kernelsrc.bbclass
index 9efd46a92d..675d40ec9a 100644
--- a/meta/classes/kernelsrc.bbclass
+++ b/meta/classes/kernelsrc.bbclass
@@ -1,7 +1,7 @@
1S = "${STAGING_KERNEL_DIR}" 1S = "${STAGING_KERNEL_DIR}"
2do_fetch[noexec] = "1" 2deltask do_fetch
3do_unpack[depends] += "virtual/kernel:do_patch" 3deltask do_unpack
4do_unpack[noexec] = "1" 4do_patch[depends] += "virtual/kernel:do_patch"
5do_patch[noexec] = "1" 5do_patch[noexec] = "1"
6do_package[depends] += "virtual/kernel:do_populate_sysroot" 6do_package[depends] += "virtual/kernel:do_populate_sysroot"
7KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}" 7KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}"
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index ad6c8b0e35..4af4a014b0 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -40,12 +40,12 @@ python () {
40DEPCHAIN_DBGDEFAULTDEPS = "1" 40DEPCHAIN_DBGDEFAULTDEPS = "1"
41 41
42# We only need the packaging tasks - disable the rest 42# We only need the packaging tasks - disable the rest
43do_fetch[noexec] = "1" 43deltask do_fetch
44do_unpack[noexec] = "1" 44deltask do_unpack
45do_patch[noexec] = "1" 45deltask do_patch
46do_configure[noexec] = "1" 46deltask do_configure
47do_compile[noexec] = "1" 47deltask do_compile
48do_install[noexec] = "1" 48deltask do_install
49deltask do_populate_sysroot 49deltask do_populate_sysroot
50 50
51python () { 51python () {
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc
index 60655eba3c..6b32e4a815 100644
--- a/meta/recipes-core/glibc/glibc-collateral.inc
+++ b/meta/recipes-core/glibc/glibc-collateral.inc
@@ -9,9 +9,9 @@ HOMEPAGE = "http://www.gnu.org/software/libc/index.html"
9# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html 9# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html
10ARM_INSTRUCTION_SET = "arm" 10ARM_INSTRUCTION_SET = "arm"
11 11
12do_fetch[noexec] = "1" 12deltask do_fetch
13do_unpack[noexec] = "1" 13deltask do_unpack
14do_patch[noexec] = "1" 14deltask do_patch
15do_configure[noexec] = "1" 15do_configure[noexec] = "1"
16do_compile[noexec] = "1" 16do_compile[noexec] = "1"
17 17
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index a2ed229100..1128a56c1e 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -71,9 +71,9 @@ FILES_${PN}= " \
71 ${SDKPATH}/* \ 71 ${SDKPATH}/* \
72 " 72 "
73 73
74do_fetch[noexec] = "1" 74deltask do_fetch
75do_unpack[noexec] = "1" 75deltask do_unpack
76do_patch[noexec] = "1" 76deltask do_patch
77do_configure[noexec] = "1" 77do_configure[noexec] = "1"
78do_compile[noexec] = "1" 78do_compile[noexec] = "1"
79do_populate_sysroot[noexec] = "1" 79do_populate_sysroot[noexec] = "1"
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb b/meta/recipes-core/meta/meta-world-pkgdata.bb
index 617f96a33e..02abd8aff6 100644
--- a/meta/recipes-core/meta/meta-world-pkgdata.bb
+++ b/meta/recipes-core/meta/meta-world-pkgdata.bb
@@ -25,12 +25,12 @@ python do_collect_packagedata() {
25 oe.copy_buildsystem.generate_locked_sigs(sigfile, d) 25 oe.copy_buildsystem.generate_locked_sigs(sigfile, d)
26} 26}
27 27
28do_fetch[noexec] = "1" 28deltask do_fetch
29do_unpack[noexec] = "1" 29deltask do_unpack
30do_patch[noexec] = "1" 30deltask do_patch
31do_configure[noexec] = "1" 31deltask do_configure
32do_compile[noexec] = "1" 32deltask do_compile
33do_install[noexec] = "1" 33deltask do_install
34 34
35do_prepare_recipe_sysroot[deptask] = "" 35do_prepare_recipe_sysroot[deptask] = ""
36 36
diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb
index 3c46b49977..fe022ffeb1 100644
--- a/meta/recipes-core/meta/package-index.bb
+++ b/meta/recipes-core/meta/package-index.bb
@@ -4,18 +4,18 @@ LICENSE = "MIT"
4INHIBIT_DEFAULT_DEPS = "1" 4INHIBIT_DEFAULT_DEPS = "1"
5PACKAGES = "" 5PACKAGES = ""
6 6
7do_fetch[noexec] = "1" 7deltask do_fetch
8do_unpack[noexec] = "1" 8deltask do_unpack
9do_patch[noexec] = "1" 9deltask do_patch
10do_configure[noexec] = "1" 10deltask do_configure
11do_compile[noexec] = "1" 11deltask do_compile
12do_install[noexec] = "1" 12deltask do_install
13do_package[noexec] = "1" 13deltask do_package
14do_packagedata[noexec] = "1" 14deltask do_packagedata
15do_package_write_ipk[noexec] = "1" 15deltask do_package_write_ipk
16do_package_write_rpm[noexec] = "1" 16deltask do_package_write_rpm
17do_package_write_deb[noexec] = "1" 17deltask do_package_write_deb
18do_populate_sysroot[noexec] = "1" 18deltask do_populate_sysroot
19 19
20do_package_index[nostamp] = "1" 20do_package_index[nostamp] = "1"
21do_package_index[depends] += "${PACKAGEINDEXDEPS}" 21do_package_index[depends] += "${PACKAGEINDEXDEPS}"