Changeset 407

Show
Ignore:
Timestamp:
07/25/06 15:09:10 (2 years ago)
Author:
tg
Message:

allow automatic copy of a hierarchy rooted in extra/
into ${WRKSRC} (and prevent these from being included
in patches)

agreed wbx@ on the phone

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/rules.mk

    r404 r407  
    6060        rm -rf ${WRKSRC} ${WRKBUILD} 
    6161        ${EXTRACT_CMD} 
    62         [ ! -d ./patches ] || $(PATCH) $(WRKSRC) ./patches 
     62        [ ! -d ./patches ] || $(PREVENT_PATCH) $(PATCH) $(WRKSRC) ./patches 
     63        [ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) pax -rw . ${WRKSRC}/) 
    6364        touch $(WRKBUILD)/.prepared 
    6465endif 
    …… 
    104105        @test ! -d ${WRKDIR}.orig || rm -rf ${WRKDIR}.orig 
    105106        @test ! -d ${WRKDIR}.orig 
    106         @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PATCH=: 
    107         @toedit=$$(WRKDIST='${WRKSRC}' PATCHDIR=$$(pwd)/patches \ 
     107        @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: 
     108        @toedit=$$(WRKDIST='${WRKSRC}' CURDIR=$$(pwd) \ 
    108109            PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \ 
    109110            ${BASH} ${TOPDIR}/scripts/update-patches); \ 

  • trunk/freewrt/scripts/update-patches

    r406 r407  
    5252 
    5353TRANSFORM='sed s/[.+]/\\\\&/g' 
     54PATCHDIR=$CURDIR/patches 
     55EXTRADIR=$CURDIR/extra 
    5456 
    5557mkdir -p $PATCHDIR 
    …… 
    6870fi 
    6971ORGDIST=${D_BASE}/${D_SUB}.orig 
     72 
     73[[ -d $EXTRADIR ]] && \ 
     74    (cd $EXTRADIR; find . -print0) | \ 
     75    (cd $WRKDIST; pax -rw -0 -d $ORGDIST/) >/dev/null 2>&1 
    7076 
    7177DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUB.orig/ | $TRANSFORM)@@  .*\""