Changeset 7472


Ignore:
Timestamp:
2007-06-03T08:54:46+02:00 (10 years ago)
Author:
nbd
Message:

Improve quilt patch handling: All quilt managed patches are checked before the package compile is attempted

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/quilt.mk

    r7471 r7472  
    66# 
    77 
    8 QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_patched && echo y)) 
     8QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y)) 
    99ifneq ($(QUILT),) 
    1010  STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q 
     11  STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched 
    1112  CONFIG_AUTOREBUILD= 
    1213  PATCHES:=$(shell cd ./patches; ls) 
     
    1415        rm -rf $(PKG_BUILD_DIR)/patches 
    1516        mkdir -p $(PKG_BUILD_DIR)/patches 
    16         for patch in $(PATCHES); do ( \ 
     17        @for patch in $(PATCHES); do ( \ 
    1718                cp "./patches/$$$$patch" $(PKG_BUILD_DIR); \ 
    1819                cd $(PKG_BUILD_DIR); \ 
    1920                quilt import -p 1 "$$$$patch"; \ 
    20                 quilt push; \ 
    21                 quilt refresh; \ 
     21                quilt push -f >/dev/null 2>/dev/null; \ 
    2222                rm -f "$$$$patch"; \ 
    2323        ); done 
    24         touch $(PKG_BUILD_DIR)/.quilt_patched 
     24        @echo 
     25        touch $(PKG_BUILD_DIR)/.quilt_used 
    2526  endef 
     27  $(STAMP_CONFIGURED): $(STAMP_PATCHED) 
     28  prepare: $(STAMP_PATCHED) 
    2629else 
    2730  define Build/Patch/Default 
     
    3134  endef 
    3235endif 
     36 
     37$(STAMP_PATCHED): $(STAMP_PREPARED) 
     38        @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true 
     39        cd $(PKG_BUILD_DIR); quilt push -a 
     40        touch $@ 
    3341 
    3442refresh: $(STAMP_PREPARED) 
Note: See TracChangeset for help on using the changeset viewer.