Changeset 22722


Ignore:
Timestamp:
2010-08-19T14:49:46+02:00 (6 years ago)
Author:
nbd
Message:

speed up the ipkg build process some more by reordering commands

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/package-ipkg.mk

    r22720 r22722  
    7878 
    7979    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) 
    80         @rm -f $(PACKAGE_DIR)/$(1)_* 
    81         rm -rf $$(IDIR_$(1)) 
    82         mkdir -p $$(IDIR_$(1))/CONTROL 
    83         echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control 
    84         echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control 
     80        @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1)) 
     81        mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL 
     82        $(call Package/$(1)/install,$$(IDIR_$(1))) 
     83        -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf 
     84        $(RSTRIP) $$(IDIR_$(1)) 
     85        SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \ 
    8586        ( \ 
     87                echo "Package: $(1)"; \ 
     88                echo "Version: $(VERSION)"; \ 
    8689                DEPENDS='$(EXTRA_DEPENDS)'; \ 
    8790                for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ 
     
    9598                echo "Maintainer: $(MAINTAINER)"; \ 
    9699                echo "Architecture: $(PKGARCH)"; \ 
    97                 echo "Installed-Size: 1"; \ 
     100                echo "Installed-Size: $$$$SIZE"; \ 
    98101                echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ 
    99         ) >> $$(IDIR_$(1))/CONTROL/control 
     102        ) > $$(IDIR_$(1))/CONTROL/control 
    100103        chmod 644 $$(IDIR_$(1))/CONTROL/control 
    101104        (cd $$(IDIR_$(1))/CONTROL; \ 
    102105                $($(1)_COMMANDS) \ 
    103106        ) 
    104         $(call Package/$(1)/install,$$(IDIR_$(1))) 
    105         mkdir -p $(PACKAGE_DIR) 
    106         -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf 
    107         $(RSTRIP) $$(IDIR_$(1)) 
    108         SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \ 
    109         $(SED) "s|^\(Installed-Size:\).*|\1 $$$$SIZE|g" $$(IDIR_$(1))/CONTROL/control 
    110107        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) 
    111         @[ -f $$(IPKG_$(1)) ] || false  
     108        @[ -f $$(IPKG_$(1)) ] 
    112109 
    113110    $$(INFO_$(1)): $$(IPKG_$(1)) 
Note: See TracChangeset for help on using the changeset viewer.