Changeset 71b4d1c in freewrt


Ignore:
Timestamp:
Jun 11, 2006, 6:29:15 PM (20 years ago)
Author:
Thorsten Glaser <tg@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
ac7563a
Parents:
aaafd63
Message:

use pax to extract if it exists, instead of tar,
because it handles certain archives created by
GNU tar better (on BSD), no change on Linux

ok wbx@

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

Files:
17 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    raaafd63 r71b4d1c  
    3737all: prereq
    3838        ${GMAKE_INV} all
     39
     40v: prereq
     41        ${GMAKE_INV} all V=99
    3942
    4043verbose: prereq

  • package/bluez-libs/Makefile

    raaafd63 r71b4d1c  
    2020
    2121$(PKG_BUILD_DIR)/.source: $(DL_DIR)/$(PKG_SOURCE)
    22         zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
     22        zcat $(DL_DIR)/$(PKG_SOURCE) | (cd $(BUILD_DIR); $(TAR_EXTRACT) )
    2323        touch $(BLUEZLIBS_DIR)/.source
    2424

  • package/bluez-utils/Makefile

    raaafd63 r71b4d1c  
    2020
    2121$(PKG_BUILD_DIR)/.source: $(DL_DIR)/$(PKG_SOURCE)
    22         zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
     22        zcat $(DL_DIR)/$(PKG_SOURCE) | (cd $(BUILD_DIR); $(TAR_EXTRACT) )
    2323        touch $(BLUEZLIBS_DIR)/.source
    2424

  • package/gcom/Makefile

    raaafd63 r71b4d1c  
    2323        mkdir -p $(PKG_BUILD_DIR)
    2424        # the .tgz is different - no subdirectory, so do this manually
    25         zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -
     25        zcat $(DL_DIR)/$(PKG_SOURCE) | (cd $(PKG_BUILD_DIR); $(TAR_EXTRACT) )
    2626        if [ -d ./patches ]; then $(PATCH) $(PKG_BUILD_DIR) ./patches ; fi
    2727        touch $@

  • package/microcom/Makefile

    raaafd63 r71b4d1c  
    2323        mkdir -p $(PKG_BUILD_DIR)
    2424        # the .tar.gz is different - no subdirectory, so do this manually
    25         zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -
     25        zcat $(DL_DIR)/$(PKG_SOURCE) | (cd $(PKG_BUILD_DIR); $(TAR_EXTRACT) )
    2626        touch $@
    2727

  • package/rules.mk

    raaafd63 r71b4d1c  
    4949                unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
    5050        else \
    51                 $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
     51                $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | \
     52                ( cd $(PKG_BUILD_DIR)/.. ; $(TAR_EXTRACT) ); \
    5253        fi                                               
    5354        if [ -d ./patches ]; then \

  • rules.mk

    raaafd63 r71b4d1c  
    7070else
    7171TAR_OPTIONS=-xf
     72endif
     73
     74ifeq ($(shell which pax 2>/dev/null),)
     75TAR_EXTRACT=    tar $(TAR_OPTIONS) -
     76else
     77TAR_EXTRACT=    pax -r -pma
    7278endif
    7379

  • target/linux/ar7-2.4/Makefile

    raaafd63 r71b4d1c  
    5656$(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
    5757        -mkdir -p $(BUILD_DIR)
    58         zcat $(DL_DIR)/$(ATM_FIRMWARE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
     58        zcat $(DL_DIR)/$(ATM_FIRMWARE_FILE) | (cd $(BUILD_DIR); $(TAR_EXTRACT) )
    5959        touch $@
    6060

  • target/linux/brcm-2.4/Makefile

    raaafd63 r71b4d1c  
    5050$(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
    5151        -mkdir -p $(BUILD_DIR)
    52         zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
     52        zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | (cd $(BUILD_DIR); $(TAR_EXTRACT) )
    5353        # copy binary wlan driver
    5454        mkdir -p $(LINUX_DIR)/drivers/net/wl

  • target/linux/kernel.mk

    raaafd63 r71b4d1c  
    1818$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
    1919        -mkdir -p $(LINUX_BUILD_DIR)
    20         bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
     20        bzcat $(DL_DIR)/$(LINUX_SOURCE) | (cd $(LINUX_BUILD_DIR); $(TAR_EXTRACT) )
    2121        rm -f $(BUILD_DIR)/linux
    2222        ln -s $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux

  • toolchain/binutils/Makefile

    raaafd63 r71b4d1c  
    3737$(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
    3838        mkdir -p $(TOOL_BUILD_DIR)
    39         $(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
     39        $(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) )
    4040        touch $(BINUTILS_DIR)/.unpacked
    4141

  • toolchain/gcc/Makefile

    raaafd63 r71b4d1c  
    6262$(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
    6363        mkdir -p $(TOOL_BUILD_DIR)
    64         $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
     64        $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) )
    6565        touch $(GCC_DIR)/.unpacked
    6666

  • toolchain/gdb/Makefile

    raaafd63 r71b4d1c  
    1515
    1616$(GDB_DIR)/.patched: $(DL_DIR)/$(GDB_SOURCE)
    17         $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
     17        $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) )
    1818        $(PATCH) $(GDB_DIR) ./patches
    1919        # Copy a config.sub from gcc.  This is only necessary until

  • toolchain/ipkg-utils/Makefile

    raaafd63 r71b4d1c  
    2323$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
    2424        mkdir -p $(BUILD_DIR)
    25         $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
     25        $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | (cd $(BUILD_DIR); $(TAR_EXTRACT) )
    2626        touch $(PKG_BUILD_DIR)/.unpacked
    2727

  • toolchain/kernel-headers/Makefile

    raaafd63 r71b4d1c  
    2626$(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
    2727        mkdir -p $(TOOL_BUILD_DIR)
    28         bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
     28        bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) \
    2929                linux-$(LINUX_HEADERS_VERSION)/include \
    3030                linux-$(LINUX_HEADERS_VERSION)/Makefile \
    … …  
    3434                linux-$(LINUX_HEADERS_VERSION)/arch/$(LINUX_HEADERS_ARCH)/config*.in \
    3535                linux-$(LINUX_HEADERS_VERSION)/*/*/Config.in \
    36                 linux-$(LINUX_HEADERS_VERSION)/*/Config.in
     36                linux-$(LINUX_HEADERS_VERSION)/*/Config.in )
    3737        (cd $(LINUX_HEADERS_DIR)-$(LINUX_HEADERS_VERSION) ; patch -p1 < $(TOPDIR)/toolchain/kernel-headers/patches/include.patch)
    3838        ln -sf $(LINUX_HEADERS_DIR)-$(LINUX_HEADERS_VERSION) $(LINUX_HEADERS_DIR)

  • toolchain/sed/Makefile

    raaafd63 r71b4d1c  
    3232        mkdir -p $(TOOL_BUILD_DIR)
    3333        mkdir -p $(STAGING_DIR)/bin;
    34         $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
     34        $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) )
    3535        touch $(SED_DIR1)/.unpacked
    3636

  • toolchain/uClibc/Makefile

    raaafd63 r71b4d1c  
    4242$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
    4343        mkdir -p $(TOOL_BUILD_DIR)
    44         bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
     44        bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | (cd $(TOOL_BUILD_DIR); $(TAR_EXTRACT) )
    4545        $(PATCH) $(UCLIBC_DIR) ./patches
    4646        touch $(UCLIBC_DIR)/.unpacked
Note: See TracChangeset for help on using the changeset viewer.