bitbake.conf: remove some redundant/unnecessary variable exports

Specifically...

SLOT: apparently redundant, deleted.
STAGING_IDLDIR: likewise
QMAKE_MKSPEC_PATH: no longer exported, moved to qmake_base.bbclass
STAGING_SIPDIR: no longer exported, moved to sip.bbclass

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index b61b84c7f7b8a8875a4ce0ea65b4a67d991a40fa..d1008b638b7ce5138baac8b8e155d9f51110efd2 100644 (file)
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -1,3 +1,4 @@
+QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/qmake"
 
 OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
 QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"

diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index de0e2effb1f863514ab07c2e6b6b896fee37aac6..3a00e4dbd8d7bd3e5951e8dfb2946dc7d31cd888 100644 (file)
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -1,6 +1,8 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
 #
+STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip"
+
 DEPENDS  =+ "sip-native"
 RDEPENDS += "python-sip"
 

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1c2161682c6f0b65938b6cffe1b14bc85c271aba..b8583646a05771407847295a432f439d56cb4538 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -606,9 +606,6 @@ export PATCH_GET="0"
 # Not sure about the rest of this yet.
 ##################################################################
 
-# slot - currently unused by OE. portage remnants
-SLOT = "0"
-
 # Other
 
 export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}/${libdir}/pkgconfig"
@@ -617,10 +614,6 @@ export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 
-export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
-export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip"
-export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
-
 # library package naming
 AUTO_LIBNAME_PKGS = "${PACKAGES}"