Changeset 20597


Ignore:
Timestamp:
2010-03-30T13:41:51+02:00 (8 years ago)
Author:
nico
Message:

imagebuilder: various fixes

  • only copy host tools from $(STAGING_DIR_HOST)/bin
  • remove more target patches, and also target files
  • combine the 3 find commands into a single one
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/imagebuilder/Makefile

    r20064 r20597  
    3232                $(PKG_BUILD_DIR)/ 
    3333        $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages 
    34         $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/ 
    35         $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/ 
     34        $(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/ 
    3635        $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ 
    3736        rm -rf \ 
    38                 $(PKG_BUILD_DIR)/target/linux/*/patches \ 
    39                 $(PKG_BUILD_DIR)/target/linux/*/*/patches 
     37                $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \ 
     38                $(PKG_BUILD_DIR)/target/linux/*/patches{,-*} 
    4039        -cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here 
    4140        echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk 
    42         find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf 
    43         find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf 
    44         find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf 
     41        find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \ 
     42          | $(XARGS) rm -rf 
    4543        $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@ 
    4644 
Note: See TracChangeset for help on using the changeset viewer.