diff options
Diffstat (limited to 'external/poky/meta-poky/conf')
11 files changed, 99 insertions, 91 deletions
diff --git a/external/poky/meta-poky/conf/conf-notes.txt b/external/poky/meta-poky/conf/conf-notes.txt index f1a4f4da..67c177db 100644 --- a/external/poky/meta-poky/conf/conf-notes.txt +++ b/external/poky/meta-poky/conf/conf-notes.txt @@ -10,3 +10,8 @@ Common targets are: meta-ide-support You can also run generated qemu images with a command like 'runqemu qemux86' + +Other commonly useful commands are: + - 'devtool' and 'recipetool' handle common recipe tasks + - 'bitbake-layers' handles common layer tasks + - 'oe-pkgdata-util' handles common target package tasks diff --git a/external/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/external/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc new file mode 100644 index 00000000..0b0412e6 --- /dev/null +++ b/external/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -0,0 +1,8 @@ +# Add an extra DISTRO_FEATURE +DISTRO_FEATURES_append = " pam" + +# Use the LTSI Kernel +PREFERRED_VERSION_linux-yocto ?= "5.4%" + +# Ensure the kernel nfs server is enabled +KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/external/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc b/external/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc index a3da043d..1fc50459 100644 --- a/external/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/external/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -26,8 +26,6 @@ SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" SRCREV_pn-oh-puzzles ?= "${AUTOREV}" SRCREV_pn-libowl ?= "${AUTOREV}" -SRCREV_pn-fstests ?= "${AUTOREV}" -SRCREV_pn-xvideo-tests ?= "${AUTOREV}" SRCREV_pn-clutter ?= "${AUTOREV}" SRCREV_pn-clutter-gst ?= "${AUTOREV}" SRCREV_pn-libmatchbox ?= "${AUTOREV}" diff --git a/external/poky/meta-poky/conf/distro/poky-altcfg.conf b/external/poky/meta-poky/conf/distro/poky-altcfg.conf new file mode 100644 index 00000000..177bf8d1 --- /dev/null +++ b/external/poky/meta-poky/conf/distro/poky-altcfg.conf @@ -0,0 +1,15 @@ +# +# An example of subclassing a distro, primarily used for testing alternate configuration +# combinations on the Yocto Project autobuilder +# +require conf/distro/poky.conf + +DISTRO = "poky-altcfg" +DISTROOVERRIDES = "poky:poky-altcfg" +#DISTROOVERRIDES = "poky:linuxstdbase" + +INIT_MANAGER ?= "systemd" +# systemd isn't suitable with musl +INIT_MANAGER_libc-musl ?= "sysvinit" + +require conf/distro/include/poky-distro-alt-test-config.inc diff --git a/external/poky/meta-poky/conf/distro/poky-lsb.conf b/external/poky/meta-poky/conf/distro/poky-lsb.conf deleted file mode 100644 index 1c426bae..00000000 --- a/external/poky/meta-poky/conf/distro/poky-lsb.conf +++ /dev/null @@ -1,14 +0,0 @@ - -require conf/distro/poky.conf - -DISTRO = "poky-lsb" -DISTROOVERRIDES = "poky:linuxstdbase" - -DISTRO_FEATURES_append = " pam largefile opengl" -PREFERRED_PROVIDER_virtual/libx11 = "libx11" - -# Ensure the kernel nfs server is enabled -KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" - -# Use the LTSI Kernel for LSB Testing -PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.14%" diff --git a/external/poky/meta-poky/conf/distro/poky-tiny.conf b/external/poky/meta-poky/conf/distro/poky-tiny.conf index 690cb0d5..c6d4b88f 100644 --- a/external/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/external/poky/meta-poky/conf/distro/poky-tiny.conf @@ -38,7 +38,7 @@ TCLIBC = "musl" # Distro config is evaluated after the machine config, so we have to explicitly # set the kernel provider to override a machine config. PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" -PREFERRED_VERSION_linux-yocto-tiny ?= "4.18%" +PREFERRED_VERSION_linux-yocto-tiny ?= "5.0%" # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" @@ -60,7 +60,7 @@ USE_NLS="no" # Comment out any of the lines below to disable them in the build # DISTRO_FEATURES options: -# alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci +# alsa bluetooth ext2 pcmcia usbgadget usbhost wifi nfs zeroconf pci DISTRO_FEATURES_TINY = "pci" DISTRO_FEATURES_NET = "ipv4 ipv6" DISTRO_FEATURES_USB = "usbhost" @@ -78,16 +78,11 @@ 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" -VIRTUAL-RUNTIME_login_manager = "busybox" -VIRTUAL-RUNTIME_init_manager = "busybox" -VIRTUAL-RUNTIME_initscripts = "initscripts" -VIRTUAL-RUNTIME_keymaps = "keymaps" -DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" +INIT_MANAGER ?= "mdev-busybox" # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and @@ -117,9 +112,6 @@ PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" PNBLACKLIST[core-image-clutter] = "not buildable with poky-tiny" PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb-dev] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-lsb-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" diff --git a/external/poky/meta-poky/conf/distro/poky.conf b/external/poky/meta-poky/conf/distro/poky.conf index 2d060e3f..7c77ebfe 100644 --- a/external/poky/meta-poky/conf/distro/poky.conf +++ b/external/poky/meta-poky/conf/distro/poky.conf @@ -1,11 +1,11 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.6.4" -DISTRO_CODENAME = "thud" +DISTRO_VERSION = "3.1.2" +DISTRO_CODENAME = "dunfell" SDK_VENDOR = "-pokysdk" -SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" +SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" -MAINTAINER = "Poky <poky@yoctoproject.org>" +MAINTAINER = "Poky <poky@lists.yoctoproject.org>" TARGET_VENDOR = "-poky" @@ -19,11 +19,11 @@ 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 ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" -SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" +SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" @@ -39,9 +39,6 @@ DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}" TCLIBCAPPEND = "" -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el nios2 ppc x86_64" -# Other QEMU_TARGETS "sh4" - PREMIRRORS ??= "\ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ @@ -52,27 +49,23 @@ osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" -MIRRORS =+ "\ -ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -http://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" - -# The CONNECTIVITY_CHECK_URI's are used to test whether we can succesfully -# fetch from the network (and warn you if not). To disable the test set -# the variable to be empty. -# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" - SANITY_TESTED_DISTROS ?= " \ - poky-2.5 \n \ - poky-2.6 \n \ + poky-2.7 \n \ + poky-3.0 \n \ + poky-3.1 \n \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ - fedora-28 \n \ + ubuntu-19.04 \n \ + ubuntu-20.04 \n \ + fedora-30 \n \ + fedora-31 \n \ + fedora-32 \n \ centos-7 \n \ + centos-8 \n \ debian-8 \n \ debian-9 \n \ - opensuse-42.3 \n \ + debian-10 \n \ + opensuseleap-15.1 \n \ " # # OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in @@ -97,3 +90,8 @@ require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc require conf/distro/include/security_flags.inc INHERIT += "uninative" + +INHERIT += "reproducible_build" + +BB_SIGNATURE_HANDLER ?= "OEEquivHash" +BB_HASHSERVE ??= "auto" diff --git a/external/poky/meta-poky/conf/layer.conf b/external/poky/meta-poky/conf/layer.conf index b9b26371..234be132 100644 --- a/external/poky/meta-poky/conf/layer.conf +++ b/external/poky/meta-poky/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" -LAYERSERIES_COMPAT_yocto = "thud" +LAYERSERIES_COMPAT_yocto = "dunfell" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/external/poky/meta-poky/conf/local.conf.sample b/external/poky/meta-poky/conf/local.conf.sample index cf965988..b555f1d2 100644 --- a/external/poky/meta-poky/conf/local.conf.sample +++ b/external/poky/meta-poky/conf/local.conf.sample @@ -31,11 +31,10 @@ #MACHINE ?= "beaglebone-yocto" #MACHINE ?= "genericx86" #MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" #MACHINE ?= "edgerouter" # -# This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "qemux86" +# This sets the default machine to be qemux86-64 if no other machine is selected: +MACHINE ??= "qemux86-64" # # Where to place downloads @@ -124,6 +123,8 @@ PACKAGE_CLASSES ?= "package_rpm" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -235,14 +236,31 @@ BB_DISKMON_DIRS ??= "\ # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl2-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG_append_pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. #ASSUME_PROVIDED += "libsdl2-native" +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. diff --git a/external/poky/meta-poky/conf/local.conf.sample.extended b/external/poky/meta-poky/conf/local.conf.sample.extended index 3ba99f48..dc92a16f 100644 --- a/external/poky/meta-poky/conf/local.conf.sample.extended +++ b/external/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) @@ -282,7 +270,7 @@ # # By including the security_flags include file you enable flags # to the compiler and linker that cause them to generate more secure -# code, this is enabled by default in the poky-lsb distro. +# code. # This does affect compile speed slightly. # # Use the following line to enable the security compiler and linker flags to your build @@ -290,18 +278,18 @@ # Image level user/group configuration. # Inherit extrausers to make the setting of EXTRA_USERS_PARAMS effective. -#INHERIT += "extrausers" +#IMAGE_CLASSES += "extrausers" # User / group settings -# The settings are sperated by the ; character. +# The settings are separated by the ; character. # Each setting is actually a command. The supported commands are useradd, # groupadd, userdel, groupdel, usermod and groupmod. #EXTRA_USERS_PARAMS = "\ -#useradd -p '' tester; \ -#groupadd developers; \ -#userdel nobody; \ -#groupdel video; \ -#groupmod -g 1020 developers; \ -#usermod -s /bin/sh tester; \ +# useradd -p '' tester; \ +# groupadd developers; \ +# userdel nobody; \ +# groupdel video; \ +# groupmod -g 1020 developers; \ +# usermod -s /bin/sh tester; \ #" # Various packages dynamically add users and groups to the system at package @@ -333,7 +321,6 @@ # show an example of how it can be done # You'll also need your fortran recipe to depend on libgfortran #FORTRAN_forcevariable = ",fortran" -#RUNTIMETARGET_append_pn-gcc-runtime = " libquadmath" # # Kernel image features @@ -395,5 +382,6 @@ # #DISTRO_FEATURES_append = " systemd" #DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" +#VIRTUAL-RUNTIME_login_manager = "shadow-base" #VIRTUAL-RUNTIME_init_manager = "systemd" #VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" diff --git a/external/poky/meta-poky/conf/site.conf.sample b/external/poky/meta-poky/conf/site.conf.sample index a4c2f9fe..5164fedf 100644 --- a/external/poky/meta-poky/conf/site.conf.sample +++ b/external/poky/meta-poky/conf/site.conf.sample @@ -26,7 +26,7 @@ SCONF_VERSION = "1" # If you wish to use certain hosts without the proxy, specify them in NO_PROXY. # See the script for details on syntax. The script oe-git-proxy uses some tools # that may not be included on HOSTTOOLS, thus add them manually through -# HOSTTOOLS += "getent seq" +# HOSTTOOLS += "getent" # Uncomment this to use a shared download directory #DL_DIR = "/some/shared/download/directory/" |