[oe-commits] Khem Raj : bitbake.conf: Define fallback DISTRO_NAME

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 39fe7b88a892b89f38af3c5ca8e73de94ea66fc4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=39fe7b88a892b89f38af3c5ca8e73de94ea66fc4

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Aug 22 19:38:55 2015 -0700

bitbake.conf: Define fallback DISTRO_NAME

When using OE-Core only we miss this define and its now used in recipes
like os-release, which goes undefined and when booting we see messages
like

Welcome to ${DISTRO_NAME} nodistro.0!

This would change to
Welcome to OpenEmbedded nodistro.0!

Remove all trailing whitespaces while touching this file

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/conf/bitbake.conf | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 21f1698..c382c58 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -2,7 +2,7 @@
 # Standard target filesystem paths.
 ##################################################################
 #
-# If changing these values, beware that native/cross/nativesdk bbclass 
+# If changing these values, beware that native/cross/nativesdk bbclass
 # files may also need changes to keep in sync.
 #
 
@@ -161,7 +161,7 @@ DATETIME = "${DATE}${TIME}"
 # Openembedded Software Prerequisites.
 ##################################################################
 
-# python-native should be here but python relies on building 
+# python-native should be here but python relies on building
 # its own in staging
 ASSUME_PROVIDED = "\
     bzip2-native \
@@ -417,7 +417,7 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 # This option allows for a percentage overage of the actual image size rather than a
 # fixed extra space, this is space needed for initial startup and basic operations.
 IMAGE_OVERHEAD_FACTOR ?= "1.3"
-# This option allows for adding additional space in K above and beyond what the 
+# This option allows for adding additional space in K above and beyond what the
 # IMAGE_OVERHEAD_FACTOR might add. This space is for additional packages, user data, ...
 # To set a fixed size then overriding IMAGE_ROOTFS_SIZE with the max size one wants
 # should do the trick
@@ -646,18 +646,18 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 ### Config file processing
 ###
 
-# An empty distro leads to :: entries in OVERRIDES and FILEOVERRIDES which 
+# An empty distro leads to :: entries in OVERRIDES and FILEOVERRIDES which
 # is a bad idea. Setting a dummy value is better than a ton of anonymous python.
 DISTRO ??= "nodistro"
-
+DISTRO_NAME ??= "OpenEmbedded"
 # Overrides are processed left to right, so the ones that are named later take precedence.
 # You generally want them to go from least to most specific.
-# 
+#
 # This means that an envionment variable named '<foo>_arm' overrides an
 # environment variable '<foo>' (when ${TARGET_ARCH} is arm).
 # An environment variable '<foo>_qemuarm' overrides '<foo>' and overrides
-# '<foo>_arm' when ${MACHINE} is 'qemuarm'. 
-# If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override 
+# '<foo>_arm' when ${MACHINE} is 'qemuarm'.
+# If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override
 # '<foo>_qemuarm' and then '<foo>' will be overriden with that value from '<foo>_qemuarm'.
 # And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority.
 #
@@ -706,7 +706,7 @@ MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
 # and no effect if less than it.
 IMAGE_ROOTFS_SIZE ??= "65536"
 
-# Forcefully set CACHE now so future changes to things like 
+# Forcefully set CACHE now so future changes to things like
 # MACHINE don't change the path to the cache
 CACHE := "${CACHE}"
 
@@ -755,7 +755,7 @@ BAD_RECOMMENDATIONS ?= ""
 MACHINE[unexport] = "1"
 
 # Make sure TARGET_ARCH isn't exported
-# (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this 
+# (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this
 # in them, undocumented)
 TARGET_ARCH[unexport] = "1"