Changeset 8e4e7a3 in freewrt for tools


Ignore:
Timestamp:
Jul 16, 2006, 5:11:43 PM (19 years ago)
Author:
Thorsten Glaser <tg@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
c6ac237
Parents:
807b7c3
Message:

use ${EXTRACT_CMD}

to be tested RSN

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@202 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
tools
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • tools/ipkg-utils/Makefile

    r807b7c3 r8e4e7a3  
    66
    77PKG_SOURCE_SITE := http://handhelds.org/packages/ipkg-utils/
    8 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
     8SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
    99PKG_SOURCE_CAT := zcat
    1010PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
    1111
    1212include $(TOPDIR)/rules.mk
     13include ../rules.mk
    1314
    1415PKG_BUILD_DIR := $(TOOLS_BUILD_DIR)/$(PKG_SOURCE_DIR)
    1516
    16 $(DL_DIR)/$(PKG_SOURCE_FILE):
     17$(DL_DIR)/$(SOURCE):
    1718        mkdir -p $(DL_DIR)
    18         $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
     19        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
    1920
    20 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
    21         $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | (cd $(TOOLS_BUILD_DIR); $(TAR_EXTRACT) )
     21$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(SOURCE)
     22        ${EXTRACT_CMD}
    2223        touch $(PKG_BUILD_DIR)/.unpacked
    2324
    … …  
    3637        install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin
    3738
    38 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
     39source: $(DL_DIR)/$(SOURCE)
    3940
    4041prepare: $(PKG_BUILD_DIR)/.patched

  • tools/lzma/Makefile

    r807b7c3 r8e4e7a3  
    22
    33include $(TOPDIR)/rules.mk
     4include ../rules.mk
    45
    5 LZMA_DIR=$(TOOLCHAIN_BUILD_DIR)/lzma
    6 LZMA_SOURCE=lzma432.tar.bz2
     6WRKDIR=$(TOOLCHAIN_BUILD_DIR)/lzma
     7SOURCE=lzma432.tar.bz2
    78LZMA_SITE=@SF/sevenzip
    89LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
    910
    10 LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib
    11 LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
     11LZMA_LIB_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Lib
     12LZMA_ALONE_DIR=$(WRKDIR)/C/7zip/Compress/LZMA_Alone
    1213
    1314TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
    1415
    15 $(DL_DIR)/$(LZMA_SOURCE):
    16         $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
     16$(DL_DIR)/$(SOURCE):
     17        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
    1718
    18 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
    19         @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
    20         bzcat $^ | (cd $(LZMA_DIR); $(TAR_EXTRACT) )
    21         patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
    22         touch $(LZMA_DIR)/.unpacked
     19$(WRKDIR)/.unpacked: $(DL_DIR)/$(SOURCE)
     20        ${EXTRACT_CMD}
     21        patch -d $(WRKDIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
     22        touch $(WRKDIR)/.unpacked
    2323       
    24 $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
    25 $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
     24$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(WRKDIR)/.built
     25$(WRKDIR)/.built: $(WRKDIR)/.unpacked
    2626        $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
    2727        $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
    … …  
    2929
    3030lzma: $(TARGETS)
    31         $(CP) $^ $(LZMA_DIR)
     31        $(CP) $^ $(WRKDIR)
    3232
    33 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
     33lzma-source: $(DL_DIR)/$(SOURCE)
    3434
    3535lzma-clean:
    3636        -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE)
    3737        -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE)
    38         rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma
     38        rm -f $(WRKDIR)/liblzma.a $(WRKDIR)/lzma
    3939
    4040lzma-dirclean:
    41         rm -rf $(LZMA_DIR)
     41        rm -rf $(WRKDIR)
    4242
    4343#############################################################
    4444
    45 prepare: $(LZMA_DIR)/.unpacked
     45prepare: $(WRKDIR)/.unpacked
    4646compile: lzma
    4747install: lzma
    48         $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/
     48        $(CP) $(WRKDIR)/lzma $(STAGING_DIR)/bin/
    4949clean: lzma-dirclean

  • tools/sed/Makefile

    r807b7c3 r8e4e7a3  
    22
    33include $(TOPDIR)/rules.mk
     4include ../rules.mk
    45
    56SED_VER:=4.1.2
    6 SED_SOURCE:=sed-$(SED_VER).tar.gz
     7SOURCE:=sed-$(SED_VER).tar.gz
    78SED_SITE:=ftp://ftp.gnu.org/gnu/sed
    89SED_MD5SUM:=928f0e06422f414091917401f1a834d0
    … …  
    1516HOST_SED_TARGET=$(shell ./sedcheck.sh)
    1617
    17 $(DL_DIR)/$(SED_SOURCE):
     18$(DL_DIR)/$(SOURCE):
    1819        mkdir -p $(DL_DIR)
    19         $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SED_SOURCE) $(SED_MD5SUM) $(SED_SITE)
     20        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SOURCE) $(SED_MD5SUM) $(SED_SITE)
    2021
    21 $(SED_DIR)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
    22         mkdir -p $(TOOLCHAIN_BUILD_DIR)
    23         mkdir -p $(STAGING_DIR)/bin;
    24         $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | (cd $(TOOLCHAIN_BUILD_DIR); $(TAR_EXTRACT) )
     22$(SED_DIR)/.unpacked: $(DL_DIR)/$(SOURCE)
     23        mkdir -p $(STAGING_DIR)/bin
     24        ${EXTRACT_CMD}
    2525        touch $@
    2626
Note: See TracChangeset for help on using the changeset viewer.