Changeset 424
- Timestamp:
- Oct 10, 2012, 2:29:19 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/contrib/openwrt/openwrt.mk
r418 r424 102 102 while read pat ; \ 103 103 do \ 104 pati=$$(echo $${pat} | sed 's!$(OPENWRT_PATCHES_DIR)/!!') ; \104 pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \ 105 105 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -N < $${pat} ; \ 106 106 then \ 107 107 echo ">> fail: $${pati}" > /dev/stderr ; \ 108 #rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \ 109 [ $(FORCE_PATCH) != "1" ] && exit 1 || true ; \ 108 [ "$(FORCE_PATCH)" = "1" ] || ( \ 109 rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \ 110 exit 1 ); \ 110 111 else \ 111 112 echo ">> success: $${pati}" ; \ … … 130 131 while read pat ; \ 131 132 do \ 132 pati=$$(echo $${pat} | sed 's!$(OPENWRT_PATCHES_DIR)/!!') ; \133 pati=$$(echo $${pat} | sed -e's!$(TOPDIR)/!!') ; \ 133 134 if ! patch -d "$(OPENWRT_BUILD_DIR)" -p 0 -R < $${pat} ; \ 134 135 then \ 135 136 echo ">> fail: $${pati}" > /dev/stderr ; \ 136 #rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \ 137 [ $(FORCE_PATCH) != "1" ] && exit 1 || true; \ 137 [ "$(FORCE_PATCH)" = "1" ] || ( \ 138 rm -f openwrt/checkout "$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp" ; \ 139 exit 1 ); \ 138 140 else \ 139 141 echo ">> success: $${pati}" ; \
Note: See TracChangeset
for help on using the changeset viewer.