diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-08-22 19:38:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:35:54 +0100 |
commit | 06300055fa7a4501fc001d3a8360d8bbc91afcc1 (patch) | |
tree | f31ff987559403dfbd6345f77028da9cbef731f5 /meta/conf | |
parent | 36e8f935a139efc877dd2aee84f07771325dfad0 (diff) | |
download | poky-06300055fa7a4501fc001d3a8360d8bbc91afcc1.tar.gz |
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
(From OE-Core rev: cf2383a63975ac7a51729a313fe0a52b559d2c61)
(From OE-Core rev: 394f0d61d1211a0562a3b4d9d78e8984abd3b28f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 21f1698c2b..c382c58b2d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | # Standard target filesystem paths. | 2 | # Standard target filesystem paths. |
3 | ################################################################## | 3 | ################################################################## |
4 | # | 4 | # |
5 | # If changing these values, beware that native/cross/nativesdk bbclass | 5 | # If changing these values, beware that native/cross/nativesdk bbclass |
6 | # files may also need changes to keep in sync. | 6 | # files may also need changes to keep in sync. |
7 | # | 7 | # |
8 | 8 | ||
@@ -161,7 +161,7 @@ DATETIME = "${DATE}${TIME}" | |||
161 | # Openembedded Software Prerequisites. | 161 | # Openembedded Software Prerequisites. |
162 | ################################################################## | 162 | ################################################################## |
163 | 163 | ||
164 | # python-native should be here but python relies on building | 164 | # python-native should be here but python relies on building |
165 | # its own in staging | 165 | # its own in staging |
166 | ASSUME_PROVIDED = "\ | 166 | ASSUME_PROVIDED = "\ |
167 | bzip2-native \ | 167 | bzip2-native \ |
@@ -417,7 +417,7 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" | |||
417 | # This option allows for a percentage overage of the actual image size rather than a | 417 | # This option allows for a percentage overage of the actual image size rather than a |
418 | # fixed extra space, this is space needed for initial startup and basic operations. | 418 | # fixed extra space, this is space needed for initial startup and basic operations. |
419 | IMAGE_OVERHEAD_FACTOR ?= "1.3" | 419 | IMAGE_OVERHEAD_FACTOR ?= "1.3" |
420 | # This option allows for adding additional space in K above and beyond what the | 420 | # This option allows for adding additional space in K above and beyond what the |
421 | # IMAGE_OVERHEAD_FACTOR might add. This space is for additional packages, user data, ... | 421 | # IMAGE_OVERHEAD_FACTOR might add. This space is for additional packages, user data, ... |
422 | # To set a fixed size then overriding IMAGE_ROOTFS_SIZE with the max size one wants | 422 | # To set a fixed size then overriding IMAGE_ROOTFS_SIZE with the max size one wants |
423 | # should do the trick | 423 | # should do the trick |
@@ -646,18 +646,18 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" | |||
646 | ### Config file processing | 646 | ### Config file processing |
647 | ### | 647 | ### |
648 | 648 | ||
649 | # An empty distro leads to :: entries in OVERRIDES and FILEOVERRIDES which | 649 | # An empty distro leads to :: entries in OVERRIDES and FILEOVERRIDES which |
650 | # is a bad idea. Setting a dummy value is better than a ton of anonymous python. | 650 | # is a bad idea. Setting a dummy value is better than a ton of anonymous python. |
651 | DISTRO ??= "nodistro" | 651 | DISTRO ??= "nodistro" |
652 | 652 | DISTRO_NAME ??= "OpenEmbedded" | |
653 | # Overrides are processed left to right, so the ones that are named later take precedence. | 653 | # Overrides are processed left to right, so the ones that are named later take precedence. |
654 | # You generally want them to go from least to most specific. | 654 | # You generally want them to go from least to most specific. |
655 | # | 655 | # |
656 | # This means that an envionment variable named '<foo>_arm' overrides an | 656 | # This means that an envionment variable named '<foo>_arm' overrides an |
657 | # environment variable '<foo>' (when ${TARGET_ARCH} is arm). | 657 | # environment variable '<foo>' (when ${TARGET_ARCH} is arm). |
658 | # An environment variable '<foo>_qemuarm' overrides '<foo>' and overrides | 658 | # An environment variable '<foo>_qemuarm' overrides '<foo>' and overrides |
659 | # '<foo>_arm' when ${MACHINE} is 'qemuarm'. | 659 | # '<foo>_arm' when ${MACHINE} is 'qemuarm'. |
660 | # If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override | 660 | # If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override |
661 | # '<foo>_qemuarm' and then '<foo>' will be overriden with that value from '<foo>_qemuarm'. | 661 | # '<foo>_qemuarm' and then '<foo>' will be overriden with that value from '<foo>_qemuarm'. |
662 | # And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority. | 662 | # And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority. |
663 | # | 663 | # |
@@ -706,7 +706,7 @@ MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" | |||
706 | # and no effect if less than it. | 706 | # and no effect if less than it. |
707 | IMAGE_ROOTFS_SIZE ??= "65536" | 707 | IMAGE_ROOTFS_SIZE ??= "65536" |
708 | 708 | ||
709 | # Forcefully set CACHE now so future changes to things like | 709 | # Forcefully set CACHE now so future changes to things like |
710 | # MACHINE don't change the path to the cache | 710 | # MACHINE don't change the path to the cache |
711 | CACHE := "${CACHE}" | 711 | CACHE := "${CACHE}" |
712 | 712 | ||
@@ -755,7 +755,7 @@ BAD_RECOMMENDATIONS ?= "" | |||
755 | MACHINE[unexport] = "1" | 755 | MACHINE[unexport] = "1" |
756 | 756 | ||
757 | # Make sure TARGET_ARCH isn't exported | 757 | # Make sure TARGET_ARCH isn't exported |
758 | # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this | 758 | # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this |
759 | # in them, undocumented) | 759 | # in them, undocumented) |
760 | TARGET_ARCH[unexport] = "1" | 760 | TARGET_ARCH[unexport] = "1" |
761 | 761 | ||