Changeset 2687

Show
Ignore:
Timestamp:
06/04/07 13:14:08 (2 years ago)
Author:
tg
Message:

• mysql: switch to update-patches
• *.mk: fix update-patches ./. checksum

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/buildhlp.mk

    r2678 r2687  
    2424WRKINST?=               ${WRKDIR}/fake-${ARCH}/root 
    2525 
     26ifeq ($(strip ${NO_CHECKSUM}),) 
     27_CHECKSUM_COOKIE=       ${WRKDIR}/.checksum_done 
     28else 
     29_CHECKSUM_COOKIE= 
     30endif 
     31 
     32 
     33 
    2634post-extract: 
    2735 
    …… 
    2937include ${TOPDIR}/mk/fetch.mk 
    3038 
    31 ${WRKDIST}/.extract_done: ${WRKDIR}/.checksum_done 
     39${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE} 
    3240        rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD} 
    3341        ${EXTRACT_CMD} 
    …… 
    6876        @test ! -d ${WRKDIR}.orig 
    6977ifeq ($(strip ${_IN_PACKAGE}),1) 
    70         @$(MAKE) -s V=0 patch WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: 
     78        @$(MAKE) -s V=0 patch WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1 
    7179else 
    72         @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: 
     80        @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1 
    7381endif 
    7482        @toedit=$$(WRKDIST='${WRKDIST}' CURDIR=$$(pwd) \ 

  • trunk/freewrt/mk/fetch.mk

    r2686 r2687  
    3131        ${MAKE} fetch 
    3232 
    33 _CHECKSUM_COOKIE=       ${WRKDIR}/.checksum_done 
    34  
    3533# XXX for now 
    3634checksum: ${_CHECKSUM_COOKIE} 
     35ifeq ($(strip ${NO_CHECKSUM}),) 
    3736${_CHECKSUM_COOKIE}: ${FULLDISTFILES} 
    3837        @OK=n; \ 
    …… 
    5554        mkdir -p ${WRKDIR} 
    5655        touch ${_CHECKSUM_COOKIE} 
     56endif 
    5757 
    5858# GNU make's poor excuse for loops 

  • trunk/freewrt/mk/kernel-build.mk

    r2679 r2687  
    1616KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg 
    1717 
    18 $(LINUX_BUILD_DIR)/.extract: ${WRKDIR}/.checksum_done 
     18$(LINUX_BUILD_DIR)/.extract: ${_CHECKSUM_COOKIE} 
    1919        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-prepare 
    2020        -mkdir -p $(LINUX_BUILD_DIR)