From 6116dbfcecc9499e230a90ebfe31dfb1c51239a4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Mar 2018 20:55:41 +0200 Subject: u-boot: refresh patches The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 7e8273cb55df71eaaf2cd50db076b73229ef7566) Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch index cea52b79e6..ecaa1796a4 100644 --- a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch +++ b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch @@ -5,15 +5,15 @@ Upstream-Status: Pending Signed-off-by: Ed Bartosh -diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig -index 4e2b705..b02ab1f 100644 ---- a/configs/MPC8315ERDB_defconfig -+++ b/configs/MPC8315ERDB_defconfig -@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y - CONFIG_CMD_I2C=y +Index: git/configs/MPC8315ERDB_defconfig +=================================================================== +--- git.orig/configs/MPC8315ERDB_defconfig ++++ git/configs/MPC8315ERDB_defconfig +@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y + CONFIG_CMD_SATA=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y - CONFIG_CMD_EXT2=y + CONFIG_CMD_DATE=y -- cgit v1.2.3-54-g00ecf