Changeset 9166


Ignore:
Timestamp:
2007-10-07T02:16:50+02:00 (9 years ago)
Author:
nbd
Message:

fix accidental double slash in prefixed quilt patchsets

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/quilt.mk

    r9121 r9166  
    2424define PatchDir/Quilt 
    2525        @if [ -s $(1)/series ]; then \ 
    26                 mkdir -p $(PKG_BUILD_DIR)/patches$(if $(2),/$(2)); \ 
    27                 cp $(1)/series $(PKG_BUILD_DIR)/patches$(if $(2),/$(2))/; \ 
     26                mkdir -p $(PKG_BUILD_DIR)/patches/$(2); \ 
     27                cp $(1)/series $(PKG_BUILD_DIR)/patches/$(2); \ 
    2828        fi 
    2929        @for patch in $$$$( (cd $(1) && if [ -f series ]; then $(call filter_series,series); else ls; fi; ) 2>/dev/null ); do ( \ 
     
    111111                                if [ -f $$file/series ]; then \ 
    112112                                        echo "Converting $$file/series"; \ 
    113                                         $(call filter_series,$$file/series) | awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' >> series; \ 
     113                                        $(call filter_series,$$file/series) | awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' | sed -e s,//,/,g >> series; \ 
    114114                                else \ 
    115115                                        echo "Sorting patches in $$file"; \ 
    116                                         find $$file/* -type f \! -name series | sort >> series; \ 
     116                                        find $$file/* -type f \! -name series | sed -e s,//,/,g | sort >> series; \ 
    117117                                fi; \ 
    118118                        done; \ 
Note: See TracChangeset for help on using the changeset viewer.