From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../conf/machine/beaglebone-yocto.conf | 2 +- poky/meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +- .../conf/machine/include/genericx86-common.inc | 3 +- poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 36 ---------------------- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf (limited to 'poky/meta-yocto-bsp/conf/machine') diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 08dd3a507..5b481434b 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index 6331368f8..d6fd934fa 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index f83ce5c59..a6c396c79 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -20,6 +20,7 @@ GLIBC_ADDONS = "nptl" EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= "genericx86.wks" +WKS_FILE ?= "genericx86.wks.in" +EFI_PROVIDER ??= "grub-efi" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot" do_image_wic[recrdeptask] += "do_bootimg" diff --git a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf deleted file mode 100644 index 538279628..000000000 --- a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ /dev/null @@ -1,36 +0,0 @@ -#@TYPE: Machine -#@NAME: Freescale MPC8315E-RDB -#@DESCRIPTION: Machine configuration for Freescale MPC8315E-RDB - -TARGET_FPU = "" - -require conf/machine/include/tune-ppce300c3.inc - -KERNEL_IMAGETYPE = "uImage" - -EXTRA_IMAGEDEPENDS += "u-boot" -UBOOT_MACHINE = "MPC8315ERDB_config" - -SERIAL_CONSOLES = "115200;ttyS0" - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" - -PREFERRED_VERSION_linux-yocto ?= "5.2%" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xf86-video-fbdev" - -UBOOT_ENTRYPOINT = "0x00000000" - -KERNEL_DEVICETREE = "mpc8315erdb.dtb" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" - -IMAGE_FSTYPES ?= "jffs2 tar.bz2" -JFFS2_ERASEBLOCK = "0x4000" - -IMAGE_FSTYPES += "wic wic.bmap" -WKS_FILE ?= 'mpc8315e-rdb.wks' -IMAGE_BOOT_FILES ?= "u-boot.bin uImage mpc8315erdb.dtb;dtb" -- cgit v1.2.3