Changeset 433

Show
Ignore:
Timestamp:
07/27/06 12:19:37 (2 years ago)
Author:
tg
Message:

update-patches for tools/

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/rules.mk

    r432 r433  
    11# $FreeWRT$ 
    22 
    3 ifneq (${PKG_SOURCE_URL},) 
    4 ifeq (${PKG_SOURCE},) 
    5 PKG_SOURCE:=    ${PKG_NAME}-${PKG_VERSION}.tar.gz 
    6 endif 
    7 endif 
    8 ifneq (${PKG_SOURCE},) 
    9 DISTFILES?=     ${DL_DIR}/${PKG_SOURCE} 
    10 endif 
     3WRKDIR_BASE:=   ${BUILD_DIR} 
    114 
    12 WRKDIR?=        ${BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE} 
    13 WRKSRC?=        ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} 
    14 WRKBUILD?=      ${WRKSRC} 
    15 WRKINST?=       ${WRKDIR}/ipkg-install 
     5include buildhlp.mk 
    166 
    177define PKG_template 
    …… 
    4939endef 
    5040 
    51  
    52 ifneq (${PKG_SOURCE_URL},) 
    53 $(DL_DIR)/$(PKG_SOURCE): 
    54         @$(CMD_TRACE) "downloading... " 
    55         $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE)  
    56 endif 
    57  
    58 ifneq (${DISTFILES}${PKG_SOURCE},) 
    59 $(WRKBUILD)/.prepared: ${DISTFILES} 
    60         rm -rf ${WRKSRC} ${WRKBUILD} 
    61         ${EXTRACT_CMD} 
    62         [ ! -d ./patches ] || $(PREVENT_PATCH) $(PATCH) $(WRKSRC) ./patches \ 
    63             '{patch-*,*.patch}' 
    64         [ ! -d ./patches ] || (fgrep -q '@@ -0,0 ' patches/{patch-*,*.patch} \ 
    65             >/dev/null 2>&1 && touch ${WRKSRC}/.patched-newfiles || :) 
    66         [ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) pax -rw . ${WRKSRC}/) 
    67         touch $(WRKBUILD)/.prepared 
    68 endif 
    6941 
    7042all: compile 
    …… 
    10577        rm -rf ${WRKDIR} 
    10678 
    107 update-patches: 
    108         @test ! -d ${WRKDIR}.orig || rm -rf ${WRKDIR}.orig 
    109         @test ! -d ${WRKDIR}.orig 
    110         @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: 
    111         @toedit=$$(WRKDIST='${WRKSRC}' CURDIR=$$(pwd) \ 
    112             PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \ 
    113             ${BASH} ${TOPDIR}/scripts/update-patches); \ 
    114             if [[ -n $$toedit && $$toedit != FAIL ]]; then \ 
    115                 echo -n 'edit patches: '; read i; \ 
    116                 cd patches && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit; \ 
    117             fi; \ 
    118             rm -rf ${WRKDIR}.orig; \ 
    119             [[ $$toedit != FAIL ]] 
    12079 
    121 .PHONY: all source prepare compile install clean update-patches 
     80.PHONY: all source prepare compile install clean 

  • trunk/freewrt/tools/ipkg-utils/Makefile

    r314 r433  
    1010include ../rules.mk 
    1111 
    12 $(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
    13         ${EXTRACT_CMD} 
    14         touch $(WRKBUILD)/.unpacked 
    15  
    16 $(WRKBUILD)/.patched: $(WRKBUILD)/.unpacked 
    17         $(PATCH) $(WRKBUILD) patches/ \*.patch 
    18         touch $(WRKBUILD)/.patched 
    19  
    20 $(STAGING_DIR)/usr/bin/ipkg-build: $(WRKBUILD)/.patched 
     12$(STAGING_DIR)/usr/bin/ipkg-build: ${WRKBUILD}/.prepared 
    2113        mkdir -p $(STAGING_DIR)/etc 
    2214        echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf 
    …… 
    3022source: $(DL_DIR)/$(PKG_SOURCE) 
    3123 
    32 prepare: $(WRKBUILD)/.patched 
     24prepare: ${WRKBUILD}/.prepared 
    3325 
    3426compile: 

  • trunk/freewrt/tools/jffs2/Makefile

    r316 r433  
    1212include ../rules.mk 
    1313 
    14 $(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
    15         mkdir -p $(STAGING_DIR)/bin 
    16         ${EXTRACT_CMD} 
    17         $(PATCH) $(WRKBUILD) patches/ \*.patch 
     14$(WRKBUILD)/util/mkfs.jffs2: ${WRKBUILD}/.prepared 
    1815        cd $(TOPDIR)/scripts && cp byteswap.h endian.h param.h \ 
    1916            $(WRKBUILD)/include/ 
    2017        cp $(TOPDIR)/scripts/getline.c $(WRKBUILD)/util/ 
    21         touch $@ 
    22  
    23 $(WRKBUILD)/util/mkfs.jffs2: $(WRKBUILD)/.unpacked 
    2418        $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(WRKBUILD)/util 
    2519 
    2620$(STAGING_DIR)/bin/mkfs.jffs2: $(WRKBUILD)/util/mkfs.jffs2 
     21        mkdir -p $(STAGING_DIR)/bin 
    2722        $(CP) $< $@ 
    2823 
    2924source: $(DL_DIR)/$(PKG_SOURCE) 
    30 prepare: $(WRKBUILD)/.unpacked 
     25prepare: ${WRKBUILD}/.prepared 
    3126compile: $(WRKBUILD)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 
    3227install: $(STAGING_DIR)/bin/mkfs.jffs2 

  • trunk/freewrt/tools/lzma/Makefile

    r316 r433  
    1515include ../rules.mk 
    1616 
    17 $(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)  
    18         ${EXTRACT_CMD} 
    19         $(PATCH) $(WRKBUILD) patches/ \*.patch 
    20         touch $@ 
    21          
    2217$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKBUILD)/.built 
    23 $(WRKBUILD)/.built: $(WRKBUILD)/.unpacked 
     18$(WRKBUILD)/.built: ${WRKBUILD}/.prepared 
    2419        $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE) 
    2520        $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE) 
    …… 
    4136############################################################# 
    4237 
    43 prepare: $(WRKBUILD)/.unpacked 
     38prepare: ${WRKBUILD}/.prepared 
    4439compile: lzma 
    4540install: lzma 

  • trunk/freewrt/tools/rules.mk

    r339 r433  
    11# $FreeWRT$ 
    22 
    3 WRKDIR?=                ${TOOLS_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION} 
    4 WRKSRC?=                ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} 
    5 WRKBUILD?=              ${WRKSRC} 
     3WRKDIR_BASE:=           ${TOOLS_BUILD_DIR} 
    64 
    7 ifneq (${PKG_SOURCE_URL},) 
    8 PKG_SOURCE?=            ${PKG_NAME}-${PKG_VERSION}.tar.gz 
    9 DISTFILES?=             ${DL_DIR}/${PKG_SOURCE} 
    10 endif 
    11  
    12 ifneq (${PKG_SOURCE_URL},) 
    13 ${DL_DIR}/${PKG_SOURCE}: 
    14         mkdir -p ${DL_DIR} 
    15         perl ${SCRIPT_DIR}/download.pl ${DL_DIR} ${PKG_SOURCE} \ 
    16             ${PKG_MD5SUM} ${PKG_SOURCE_URL} 
    17 endif 
     5include ${TOPDIR}/package/buildhlp.mk 
    186 
    197install-lbin: 
     8 
     9.PHONY: install-lbin 

  • trunk/freewrt/tools/sed/Makefile

    r339 r433  
    1010include ../rules.mk 
    1111 
    12 $(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) 
     12$(WRKBUILD)/.configured: ${WRKBUILD}/.prepared 
    1313        @mkdir -p $(STAGING_DIR)/bin 
    14         ${EXTRACT_CMD} 
    15         touch $@ 
    16  
    17 $(WRKBUILD)/.configured: $(WRKBUILD)/.unpacked 
    1814        (cd $(WRKBUILD); rm -rf config.cache; \ 
    1915                ac_cv_header_wctype_h=no \ 
    …… 
    2925 
    3026source:  
    31 prepare: $(WRKBUILD)/.unpacked 
     27prepare: ${WRKBUILD}/.prepared 
    3228 
    3329compile: $(WRKBUILD)/sed/sed 

  • trunk/freewrt/tools/squashfs/Makefile

    r317 r433  
    1111include ../rules.mk 
    1212 
    13 $(WRKBUILD)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)  
     13$(WRKBUILD)/squashfs-tools/mksquashfs-lzma: ${WRKBUILD}/.prepared 
    1414        mkdir -p $(STAGING_DIR)/bin 
    15         ${EXTRACT_CMD} 
    16         $(PATCH) $(WRKBUILD) patches/ \*.patch 
    17         touch $@ 
    18  
    19 $(WRKBUILD)/squashfs-tools/mksquashfs-lzma: $(WRKBUILD)/.unpacked 
    2015        $(MAKE) CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \ 
    2116            -C $(WRKBUILD)/squashfs-tools \ 
    …… 
    2722 
    2823source: $(DL_DIR)/$(PKG_SOURCE) 
    29 prepare: $(WRKBUILD)/.unpacked 
     24prepare: ${WRKBUILD}/.prepared 
    3025compile: $(WRKBUILD)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma 
    3126install: $(STAGING_DIR)/bin/mksquashfs-lzma 

  • trunk/freewrt/tools/squashfs/patches/100-lzma.patch

    r115 r433  
    44        * fix CFLAGS abuse 
    55 
    6 --- squashfs3.0/squashfs-tools/Makefile.orig   Sun Jun 18 19:37:35 2006 
    7 +++ squashfs3.0/squashfs-tools/Makefile Sun Jun 18 19:38:08 2006 
    8 @@ -1,6 +1,7 @@ 
     6--- squashfs3.0.orig/squashfs-tools/Makefile   Wed Mar 15 21:35:57 2006 
     7+++ squashfs3.0/squashfs-tools/Makefile Thu Jul 27 10:16:13 2006 
     8@@ -1,12 +1,16 @@ 
    99 INCLUDEDIR = . 
    1010+#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib 
    …… 
    1515 all: mksquashfs unsquashfs 
    1616  
    17 @@ -7,6 +8,9 @@ all: mksquashfs unsquashfs 
    1817 mksquashfs: mksquashfs.o read_fs.o sort.o 
    1918        $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@