From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- .../distro/include/poky-distro-alt-test-config.inc | 8 ++++ .../distro/include/poky-floating-revisions.inc | 2 - .../poky/meta-poky/conf/distro/poky-altcfg.conf | 15 +++++++ external/poky/meta-poky/conf/distro/poky-lsb.conf | 14 ------- external/poky/meta-poky/conf/distro/poky-tiny.conf | 18 +++----- external/poky/meta-poky/conf/distro/poky.conf | 48 +++++++++++----------- 6 files changed, 51 insertions(+), 54 deletions(-) create mode 100644 external/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc create mode 100644 external/poky/meta-poky/conf/distro/poky-altcfg.conf delete mode 100644 external/poky/meta-poky/conf/distro/poky-lsb.conf (limited to 'external/poky/meta-poky/conf/distro') 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 " +MAINTAINER = "Poky " 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" -- cgit 1.2.3-korg