summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/staging.bbclass1
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/recipes-core/meta/external-poky-toolchain.bb2
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb1
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-native.inc2
5 files changed, 0 insertions, 9 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index e82db83892..843256545f 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -81,7 +81,6 @@ do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGE
81# Could be compile but populate_sysroot and do_install shouldn't run at the same time 81# Could be compile but populate_sysroot and do_install shouldn't run at the same time
82addtask populate_sysroot after do_install 82addtask populate_sysroot after do_install
83 83
84PSTAGING_ACTIVE = "0"
85SYSROOT_PREPROCESS_FUNCS ?= "" 84SYSROOT_PREPROCESS_FUNCS ?= ""
86SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" 85SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/"
87SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" 86SYSROOT_LOCK = "${STAGING_DIR}/staging.lock"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d3fd26dcfb..7c7dde5563 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -666,9 +666,6 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
666# MACHINE don't change the path to the cache 666# MACHINE don't change the path to the cache
667CACHE := "${CACHE}" 667CACHE := "${CACHE}"
668 668
669# Default to disabling packaged staging code
670export PSTAGING_ACTIVE = "0"
671
672################################################################## 669##################################################################
673# Magic Cookie for SANITY CHECK 670# Magic Cookie for SANITY CHECK
674################################################################## 671##################################################################
diff --git a/meta/recipes-core/meta/external-poky-toolchain.bb b/meta/recipes-core/meta/external-poky-toolchain.bb
index a387ab3e60..55077461e4 100644
--- a/meta/recipes-core/meta/external-poky-toolchain.bb
+++ b/meta/recipes-core/meta/external-poky-toolchain.bb
@@ -14,8 +14,6 @@ PACKAGES_DYNAMIC = "glibc-gconv-*"
14INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"
15PR = "r1" 15PR = "r1"
16 16
17PSTAGING_DISABLED = "1"
18
19# License applies to this recipe code, not the toolchain itself 17# License applies to this recipe code, not the toolchain itself
20LICENSE = "MIT" 18LICENSE = "MIT"
21 19
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb b/meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb
index 12e1c75e31..e73cf2dbe4 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb
@@ -26,4 +26,3 @@ do_install () {
26PARALLEL_MAKE = "" 26PARALLEL_MAKE = ""
27 27
28BBCLASSEXTEND = "native" 28BBCLASSEXTEND = "native"
29NATIVE_INSTALL_WORKS = "1"
diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-tools-native.inc
index 9c78e7cd5e..6dca218578 100644
--- a/meta/recipes-qt/qt4/qt4-tools-native.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-native.inc
@@ -53,8 +53,6 @@ do_compile() {
53 done 53 done
54} 54}
55 55
56NATIVE_INSTALL_WORKS = "1"
57
58do_install() { 56do_install() {
59 install -d ${D}${bindir}/ 57 install -d ${D}${bindir}/
60 install -m 0755 bin/qmake ${D}${bindir}/qmake2 58 install -m 0755 bin/qmake ${D}${bindir}/qmake2