diff options
Diffstat (limited to 'poky/meta-poky/conf')
| -rw-r--r-- | poky/meta-poky/conf/distro/include/poky-world-exclude.inc | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 4 | ||||
| -rw-r--r-- | poky/meta-poky/conf/layer.conf | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 5 |
6 files changed, 11 insertions, 6 deletions
diff --git a/poky/meta-poky/conf/distro/include/poky-world-exclude.inc b/poky/meta-poky/conf/distro/include/poky-world-exclude.inc index 1a2dea585..f3ac59c51 100644 --- a/poky/meta-poky/conf/distro/include/poky-world-exclude.inc +++ b/poky/meta-poky/conf/distro/include/poky-world-exclude.inc @@ -1,4 +1,4 @@ # -# Things we exlude fromw world testing within the reference distro +# Things we exlude from world testing within the reference distro # diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 5a867b1de..e4ff9752e 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -26,7 +26,7 @@ # [ ] Drop ldconfig from the installation # [ ] Modify the runqemu scripts to work with ext2 parameter: # runqemu qemux86 qemuparams="-nographic" bootparams="console=ttyS0,115200 root=0800" -# [ ] Modify busybox to allow for DISTRO_FEATURES-like confiruration +# [ ] Modify busybox to allow for DISTRO_FEATURES-like configuration require conf/distro/poky.conf require conf/distro/include/gcsections.inc diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 623f39da6..4e416c0c8 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -25,8 +25,8 @@ PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" -DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" -DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" +DISTRO_EXTRA_RDEPENDS += "${POKY_DEFAULT_EXTRA_RDEPENDS}" +DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" TCLIBCAPPEND = "" diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index 7241af02e..22f7fe27c 100644 --- a/poky/meta-poky/conf/layer.conf +++ b/poky/meta-poky/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" -LAYERSERIES_COMPAT_yocto = "gatesgarth" +LAYERSERIES_COMPAT_yocto = "hardknott" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 096359ee8..a94b613ba 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -206,7 +206,7 @@ BB_DISKMON_DIRS ??= "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index ba1d0973b..c241caa86 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -390,3 +390,8 @@ DISTRO_FEATURES_remove = "x11" # #require conf/distro/include/lto.inc #DISTRO_FEATURES_append = " lto" + +# +# Set PS1 for SDK +# +#SDK_PS1 ?= "${SDK_NAME}${SDK_VENDOR}:\$ " |