Apologies all, I forgot to add [meta-raspberrypi] to the subject line.
Andrei, Please let me know if you'd like me to resend. Assuming you don't have a fix for this in flight already. Regards, Ryan. On 9 May 2018 at 19:07, Ryan Harkin <ryan.har...@linaro.org> wrote: > This reverts commit 72bc798ff548ba610e8dea53c80e39a37de8e043 > > The following error was encountered when building the Yocto master: > > ERROR: u-boot-1_2018.03-r0 do_patch: Command Error: 'quilt --quiltrc > /linaro/mbl/workspace-linaro/build-mbl/tmp-mbl-glibc/work/ > raspberrypi3-oe-linux-gnueabi/u-boot/1_2018.03-r0/recipe- > sysroot-native/etc/quiltrc > push' exited with 0 Output: > Applying patch 0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch > patching file configs/rpi_0_w_defconfig > Hunk #1 FAILED at 12. > 1 out of 1 hunk FAILED -- rejects in file configs/rpi_0_w_defconfig > Patch 0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch does not apply > (enforce with -f) > ERROR: u-boot-1_2018.03-r0 do_patch: Function failed: patch_do_patch > ERROR: Logfile of failure stored in: > /linaro/mbl/workspace-linaro/build-mbl/tmp-mbl-glibc/work/ > raspberrypi3-oe-linux-gnueabi/u-boot/1_2018.03-r0/temp/log.do_patch.13706 > ERROR: Task > (/linaro/mbl/workspace-linaro/build-mbl/conf/../../layers/ > openembedded-core/meta/recipes-bsp/u-boot/u-boot_2018.03.bb:do_patch) > failed with exit code '1' > > The u-boot patch the original commit was attempting to apply has gone > upstream, so remove this commit as it is no longer necessary. > > Signed-off-by: Ryan Harkin <ryan.har...@linaro.org> > --- > ...-rpi_0_w-Add-configs-consistent-with-RpI3.patch | 41 > ---------------------- > recipes-bsp/u-boot/u-boot_%.bbappend | 8 +---- > 2 files changed, 1 insertion(+), 48 deletions(-) > delete mode 100644 recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs- > consistent-with-RpI3.patch > > diff --git > a/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch > b/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs- > consistent-with-RpI3.patch > deleted file mode 100644 > index e98fd85..0000000 > --- a/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs- > consistent-with-RpI3.patch > +++ /dev/null > @@ -1,41 +0,0 @@ > -From 5d113dc0130ea2ea9faaa000fba9c737266b9747 Mon Sep 17 00:00:00 2001 > -From: Drew Moseley <drew.mose...@northern.tech> > -Date: Fri, 9 Feb 2018 18:10:09 -0500 > -Subject: [PATCH] rpi_0_w: Add configs consistent with RpI3 > - > -Upstream-Status: Accepted [https://patchwork.ozlabs.org/patch/856572/] > - > -Signed-off-by: Drew Moseley <drew.mose...@northern.tech> > ---- > - configs/rpi_0_w_defconfig | 7 +++++++ > - 1 file changed, 7 insertions(+) > - > -diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig > -index 9a6d24b..1248294 100644 > ---- a/configs/rpi_0_w_defconfig > -+++ b/configs/rpi_0_w_defconfig > -@@ -12,14 +12,21 @@ CONFIG_SYS_PROMPT="U-Boot> " > - CONFIG_CMD_GPIO=y > - CONFIG_CMD_MMC=y > - CONFIG_CMD_USB=y > -+CONFIG_OF_EMBED=y > -+CONFIG_ENV_FAT_INTERFACE="mmc" > -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" > -+CONFIG_DM_KEYBOARD=y > - CONFIG_DM_MMC=y > - CONFIG_MMC_SDHCI=y > - CONFIG_MMC_SDHCI_BCM2835=y > - CONFIG_DM_ETH=y > - CONFIG_USB=y > - CONFIG_DM_USB=y > -+CONFIG_USB_DWC2=y > - CONFIG_USB_STORAGE=y > - CONFIG_USB_KEYBOARD=y > -+CONFIG_USB_HOST_ETHER=y > -+CONFIG_USB_ETHER_SMSC95XX=y > - CONFIG_DM_VIDEO=y > - CONFIG_SYS_WHITE_ON_BLACK=y > - CONFIG_CONSOLE_SCROLL_LINES=10 > --- > -2.7.4 > - > diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend > b/recipes-bsp/u-boot/u-boot_%.bbappend > index 7d4a49e..3781666 100644 > --- a/recipes-bsp/u-boot/u-boot_%.bbappend > +++ b/recipes-bsp/u-boot/u-boot_%.bbappend > @@ -1,7 +1 @@ > -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:" > - > -SRC_URI_append_rpi = " \ > - file://0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch \ > -" > - > -DEPENDS_append_rpi = " rpi-u-boot-scr" > +RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr" > -- > 2.7.4 > >
-- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
