mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-23 23:23:31 +00:00
fix accidental double slash in prefixed quilt patchsets
SVN-Revision: 9166
This commit is contained in:
parent
c3847b8e5d
commit
4af66e8866
@ -23,8 +23,8 @@ endef
|
|||||||
|
|
||||||
define PatchDir/Quilt
|
define PatchDir/Quilt
|
||||||
@if [ -s $(1)/series ]; then \
|
@if [ -s $(1)/series ]; then \
|
||||||
mkdir -p $(PKG_BUILD_DIR)/patches$(if $(2),/$(2)); \
|
mkdir -p $(PKG_BUILD_DIR)/patches/$(2); \
|
||||||
cp $(1)/series $(PKG_BUILD_DIR)/patches$(if $(2),/$(2))/; \
|
cp $(1)/series $(PKG_BUILD_DIR)/patches/$(2); \
|
||||||
fi
|
fi
|
||||||
@for patch in $$$$( (cd $(1) && if [ -f series ]; then $(call filter_series,series); else ls; fi; ) 2>/dev/null ); do ( \
|
@for patch in $$$$( (cd $(1) && if [ -f series ]; then $(call filter_series,series); else ls; fi; ) 2>/dev/null ); do ( \
|
||||||
cp "$(1)/$$$$patch" $(PKG_BUILD_DIR); \
|
cp "$(1)/$$$$patch" $(PKG_BUILD_DIR); \
|
||||||
@ -110,10 +110,10 @@ $(STAMP_PATCHED): $(STAMP_PREPARED)
|
|||||||
for file in $$(cat .subdirs); do \
|
for file in $$(cat .subdirs); do \
|
||||||
if [ -f $$file/series ]; then \
|
if [ -f $$file/series ]; then \
|
||||||
echo "Converting $$file/series"; \
|
echo "Converting $$file/series"; \
|
||||||
$(call filter_series,$$file/series) | awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' >> series; \
|
$(call filter_series,$$file/series) | awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' | sed -e s,//,/,g >> series; \
|
||||||
else \
|
else \
|
||||||
echo "Sorting patches in $$file"; \
|
echo "Sorting patches in $$file"; \
|
||||||
find $$file/* -type f \! -name series | sort >> series; \
|
find $$file/* -type f \! -name series | sed -e s,//,/,g | sort >> series; \
|
||||||
fi; \
|
fi; \
|
||||||
done; \
|
done; \
|
||||||
else \
|
else \
|
||||||
|
Loading…
Reference in New Issue
Block a user