diff options
Diffstat (limited to 'poky/meta-poky')
-rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 4 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 7 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 20 |
3 files changed, 10 insertions, 21 deletions
diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 243d49291..a82d043e4 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -78,8 +78,8 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \ DISTRO_FEATURES_append_libc-uclibc = " largefile" DISTRO_FEATURES_append_libc-musl = " largefile" -DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" -DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" +DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" +DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" # enable mdev/busybox for init VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 6544c0339..78621e6db 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,6 +1,6 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.6+snapshot-${DATE}" +DISTRO_VERSION = "2.7+snapshot-${DATE}" DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" @@ -19,7 +19,7 @@ POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" -DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" +DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" PREFERRED_VERSION_linux-yocto ?= "5.0%" @@ -50,11 +50,12 @@ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" SANITY_TESTED_DISTROS ?= " \ - poky-2.5 \n \ poky-2.6 \n \ + poky-2.7 \n \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ fedora-28 \n \ + fedora-29 \n \ centos-7 \n \ debian-8 \n \ debian-9 \n \ diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 87d211db3..26603debe 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -24,22 +24,10 @@ # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. - -# glibc configurability is used to reduce minimal image's size. -# the all supported glibc options are listed in DISTRO_FEATURES_LIBC -# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC -# and DISTRO_FEATURES definitions to local.conf to enable the options. -#DISTRO_FEATURES_LIBC = "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ -# libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ -# libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-locales libc-locale-code \ -# libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \ -# libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ -# libc-posix-wchar-io" - -#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}" - -# If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf -#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}" +# If you want to get an image based on directfb without x11 alter +# DISTRO_FEATURES: +DISTRO_FEATURES_append = " directfb" +DISTRO_FEATURES_remove = "x11" # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale # packages at build time using qemu-native. Disabling it (by setting it to 0) |