1 files changed, 7 insertions, 1 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e08a2be2d2..3cff42c138 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -714,9 +714,15 @@ def base_after_parse_two(d):
 def base_after_parse(d):
     import bb, os
 
-    # Make sure MACHINE *isn't* exported
+    # Make sure MACHINE isn't exported
+    # (breaks binutils at least)
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
+    
+    # Make sure DISTRO isn't exported
+    # (breaks sysvinit at least)
+    bb.data.delVarFlag('DISTRO', 'export', d)
+    bb.data.setVarFlag('DISTRO', 'unexport', 1, d)
 
     mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
     old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1)