summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--lib/bb/data.py1
-rw-r--r--lib/bb/shell.py2
3 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ca83a9565..65c5e4bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -174,6 +174,8 @@ Changes in Bitbake 1.9.x:
- Fix wget fetching of urls with parameters specified (from Poky)
- Add username handling to git fetcher (from Poky)
- Set HOME environmental variable when running fetcher commands (from Poky)
+ - Make sure allowed variables inherited from the environment are exported again (from Poky)
+ - When running a stage task in bbshell, run populate_staging, not the stage task (from Poky)
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/data.py b/lib/bb/data.py
index 981b0b218..d3058b9a1 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -329,6 +329,7 @@ def inheritFromOS(d):
for s in os.environ.keys():
try:
setVar(s, os.environ[s], d)
+ setVarFlag(s, "export", True, d)
except TypeError:
pass
diff --git a/lib/bb/shell.py b/lib/bb/shell.py
index 55bae25d4..51dae8457 100644
--- a/lib/bb/shell.py
+++ b/lib/bb/shell.py
@@ -510,7 +510,7 @@ SRC_URI = ""
def stage( self, params ):
"""Execute 'stage' on a providee"""
- self.build( params, "stage" )
+ self.build( params, "populate_staging" )
stage.usage = "<providee>"
def status( self, params ):