Patchwork bitbake.conf: remove some redundant/unnecessary variable exports

login
register
mail settings
Submitter Phil Blundell
Date Jan. 4, 2012, 1:09 p.m.
Message ID <1325682549.28005.46.camel@phil-desktop>
Download mbox | patch
Permalink /patch/18293/
State Accepted
Commit 3dcbc8a700a3e7474026e858b1d20e9ff89a5eb1
Headers show

Comments

Phil Blundell - Jan. 4, 2012, 1:09 p.m.
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>
---
 meta/classes/qmake_base.bbclass |    1 +
 meta/classes/sip.bbclass        |    2 ++
 meta/conf/bitbake.conf          |    7 -------
 3 files changed, 3 insertions(+), 7 deletions(-)
Richard Purdie - Jan. 4, 2012, 2:52 p.m.
On Wed, 2012-01-04 at 13:09 +0000, Phil Blundell wrote:
> 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>
> ---
>  meta/classes/qmake_base.bbclass |    1 +
>  meta/classes/sip.bbclass        |    2 ++
>  meta/conf/bitbake.conf          |    7 -------
>  3 files changed, 3 insertions(+), 7 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index b61b84c..d1008b6 100644
--- 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 de0e2ef..3a00e4d 100644
--- 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 1c21616..b858364 100644
--- 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}"