From 84babf1c1a5fb26d56ee5c534b2ac2c3f9825af2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 2 Feb 2012 16:02:48 +0100 Subject: [PATCH] lpc32xxcdl: fix patch step The lpc32xxcdl files have dos newlines, which our patch infrastructure doesn't handle. Work around it by converting the affected files to unix newlines before patching. Signed-off-by: Peter Korsgaard --- boot/lpc32xxcdl/lpc32xxcdl.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk index 80f3493a2e..d11be6cf2c 100644 --- a/boot/lpc32xxcdl/lpc32xxcdl.mk +++ b/boot/lpc32xxcdl/lpc32xxcdl.mk @@ -42,6 +42,16 @@ LPC32XXCDL_BUILD_FLAGS = \ LPC32XXCDL_BOARD_STARTUP_DIR = \ csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/ +# Source files are with dos newlines, which our patch infrastructure doesn't +# handle. Work around it by converting the affected files to unix newlines +# before patching +define LPC32XXCDL_DOS2UNIX_FOR_PATCH + sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \ + boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//' +endef + +LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH + define LPC32XXCDL_BUILD_CMDS $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D) $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)