瀏覽代碼

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 <jacmet@sunsite.dk>
Peter Korsgaard 13 年之前
父節點
當前提交
84babf1c1a
共有 1 個文件被更改,包括 10 次插入0 次删除
  1. 10 0
      boot/lpc32xxcdl/lpc32xxcdl.mk

+ 10 - 0
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)