Changeset 16744


Ignore:
Timestamp:
2009-07-08T16:12:10+02:00 (8 years ago)
Author:
nico
Message:

[8.09] fix ImageBuilder

Location:
branches/8.09/target/imagebuilder
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/target/imagebuilder/Makefile

    r12370 r16744  
    11#  
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    3535        $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/ 
    3636        $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/ 
    37         $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ 
     37        mkdir -p $(PKG_BUILD_DIR)/target/linux 
     38        $(CP) $(TOPDIR)/target/linux/$(BOARD) $(PKG_BUILD_DIR)/target/linux/ 
    3839        rm -rf \ 
     40                $(PKG_BUILD_DIR)/target/linux/*/files \ 
    3941                $(PKG_BUILD_DIR)/target/linux/*/patches \ 
    4042                $(PKG_BUILD_DIR)/target/linux/*/*/patches 
    4143        -cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here 
    4244        find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf 
    43         find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf 
    4445        find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf 
     46        echo -e 'KERNEL:=$(KERNEL)\nLINUX_VERSION:=$(LINUX_VERSION)\nREVISION:=$(REVISION)' \ 
     47                >$(PKG_BUILD_DIR)/include/version.mk 
    4548        $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@ 
    4649 
  • branches/8.09/target/imagebuilder/files/Makefile

    r15320 r16744  
    11# Makefile for OpenWrt 
    22# 
    3 # Copyright (C) 2007-2008 OpenWrt.org 
     3# Copyright (C) 2007-2009 OpenWrt.org 
    44# 
    55# This is free software, licensed under the GNU General Public License v2. 
     
    2424include $(INCLUDE_DIR)/debug.mk 
    2525include $(INCLUDE_DIR)/depends.mk 
     26include $(INCLUDE_DIR)/version.mk 
    2627 
    2728define Helptext 
     
    8384 
    8485BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) 
    85 ifeq ($(KERNEL),2.4) 
    86 BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES)) 
    87 else 
    8886BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD),$(BUILD_PACKAGES)) 
    89 endif 
    9087# "-pkgname" in the package list means remove "pkgname" from the package list 
    9188BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) 
Note: See TracChangeset for help on using the changeset viewer.