diff options
| -rw-r--r-- | meta-poky/conf/distro/poky.conf | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index c9079695d4..d15e50ed28 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf | |||
| @@ -22,12 +22,6 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" | |||
| 22 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" | 22 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" |
| 23 | 23 | ||
| 24 | PREFERRED_VERSION_linux-yocto ?= "4.10%" | 24 | PREFERRED_VERSION_linux-yocto ?= "4.10%" |
| 25 | PREFERRED_VERSION_linux-yocto_qemux86 ?= "4.10%" | ||
| 26 | PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "4.10%" | ||
| 27 | PREFERRED_VERSION_linux-yocto_qemuarm ?= "4.10%" | ||
| 28 | PREFERRED_VERSION_linux-yocto_qemumips ?= "4.10%" | ||
| 29 | PREFERRED_VERSION_linux-yocto_qemumips64 ?= "4.10%" | ||
| 30 | PREFERRED_VERSION_linux-yocto_qemuppc ?= "4.10%" | ||
| 31 | 25 | ||
| 32 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" | 26 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" |
| 33 | SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" | 27 | SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" |
| @@ -84,9 +78,9 @@ SANITY_TESTED_DISTROS ?= " \ | |||
| 84 | opensuse-42.2 \n \ | 78 | opensuse-42.2 \n \ |
| 85 | " | 79 | " |
| 86 | # | 80 | # |
| 87 | # OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in | 81 | # OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in |
| 88 | # an incompatible way. Such changes should usually be detailed in the commit | 82 | # an incompatible way. Such changes should usually be detailed in the commit |
| 89 | # that breaks the format and have been previously discussed on the mailing list | 83 | # that breaks the format and have been previously discussed on the mailing list |
| 90 | # with general agreement from the core team. | 84 | # with general agreement from the core team. |
| 91 | # | 85 | # |
| 92 | OELAYOUT_ABI = "12" | 86 | OELAYOUT_ABI = "12" |
