diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-10 22:51:19 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-10 22:51:19 +0000 |
| commit | f07b1a2756879848ca4501fb1323a68861ab9cc2 (patch) | |
| tree | c52dc74ea5ecd9fee2f1bee85deeb7226daeb635 | |
| parent | 05053efa86e457fd08785d1401365bd763342477 (diff) | |
| download | poky-f07b1a2756879848ca4501fb1323a68861ab9cc2.tar.gz | |
Drop variables that do nothing
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/staging.bbclass | 1 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | meta/recipes-core/meta/external-poky-toolchain.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-native.inc | 2 |
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 |
| 82 | addtask populate_sysroot after do_install | 82 | addtask populate_sysroot after do_install |
| 83 | 83 | ||
| 84 | PSTAGING_ACTIVE = "0" | ||
| 85 | SYSROOT_PREPROCESS_FUNCS ?= "" | 84 | SYSROOT_PREPROCESS_FUNCS ?= "" |
| 86 | SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" | 85 | SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir/" |
| 87 | SYSROOT_LOCK = "${STAGING_DIR}/staging.lock" | 86 | SYSROOT_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 |
| 667 | CACHE := "${CACHE}" | 667 | CACHE := "${CACHE}" |
| 668 | 668 | ||
| 669 | # Default to disabling packaged staging code | ||
| 670 | export 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-*" | |||
| 14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
| 15 | PR = "r1" | 15 | PR = "r1" |
| 16 | 16 | ||
| 17 | PSTAGING_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 |
| 20 | LICENSE = "MIT" | 18 | LICENSE = "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 () { | |||
| 26 | PARALLEL_MAKE = "" | 26 | PARALLEL_MAKE = "" |
| 27 | 27 | ||
| 28 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
| 29 | NATIVE_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 | ||
| 56 | NATIVE_INSTALL_WORKS = "1" | ||
| 57 | |||
| 58 | do_install() { | 56 | do_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 |
