diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-10-07 00:16:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-10-07 00:16:50 +0000 |
| commit | ceb283be2a6e3eff6fb15ddfbef0563d789d66a7 (patch) | |
| tree | 4dadd9ea20e6eb68f19c7128fc0e4692915c8f11 | |
| parent | cad1b620581f190548505014c91c17729fabac94 (diff) | |
| download | upstream-ceb283be2a6e3eff6fb15ddfbef0563d789d66a7.tar.gz upstream-ceb283be2a6e3eff6fb15ddfbef0563d789d66a7.tar.bz2 upstream-ceb283be2a6e3eff6fb15ddfbef0563d789d66a7.zip | |
fix accidental double slash in prefixed quilt patchsets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9166 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/quilt.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/quilt.mk b/include/quilt.mk index 1b191ddcba..04ebfc3490 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -23,8 +23,8 @@ endef define PatchDir/Quilt @if [ -s $(1)/series ]; then \ - mkdir -p $(PKG_BUILD_DIR)/patches$(if $(2),/$(2)); \ - cp $(1)/series $(PKG_BUILD_DIR)/patches$(if $(2),/$(2))/; \ + mkdir -p $(PKG_BUILD_DIR)/patches/$(2); \ + cp $(1)/series $(PKG_BUILD_DIR)/patches/$(2); \ fi @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); \ @@ -110,10 +110,10 @@ $(STAMP_PATCHED): $(STAMP_PREPARED) for file in $$(cat .subdirs); do \ if [ -f $$file/series ]; then \ 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 \ 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; \ done; \ else \ |