Use modules for wifi and usb

[openwrt.git] / target / imagebuilder / files / Makefile

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index e8bd28f..b72e3f1 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -1,6 +1,6 @@
 # Makefile for OpenWrt
 #
 # Makefile for OpenWrt
 #

-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -24,6 +24,9 @@ include rules.mk
 include $(INCLUDE_DIR)/debug.mk
 include $(INCLUDE_DIR)/depends.mk
 
 include $(INCLUDE_DIR)/debug.mk
 include $(INCLUDE_DIR)/depends.mk
 

+include $(INCLUDE_DIR)/version.mk
+export REVISION
+

 define Helptext
 Available Commands:
        help:   This help text
 define Helptext
 Available Commands:
        help:   This help text


@@ -59,8 +62,8 @@ IPKG:= \
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))

-  ifeq ($(PROFILE),)
-    PROFILE:=$(1)
+  ifeq ($(USER_PROFILE),)
+    USER_PROFILE:=$(1)

   endif
   $(1)_NAME:=$(NAME)
   $(1)_PACKAGES:=$(PACKAGES)
   endif
   $(1)_NAME:=$(NAME)
   $(1)_PACKAGES:=$(PACKAGES)


@@ -70,7 +73,7 @@ endef
 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

-info: FORCE
+_call_info: FORCE

        echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"'
        echo 'Default Packages: $(DEFAULT_PACKAGES)'
        echo 'Available Profiles:'
        echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"'
        echo 'Default Packages: $(DEFAULT_PACKAGES)'
        echo 'Available Profiles:'


@@ -81,29 +84,19 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE
        @echo 'dest root /' > $@
        @echo 'src packages file:$(PACKAGE_DIR)' >> $@
 
        @echo 'dest root /' > $@
        @echo 'src packages file:$(PACKAGE_DIR)' >> $@
 

-BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
-ifeq ($(KERNEL),2.4)
-BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES))
-else
-BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD),$(BUILD_PACKAGES))
-endif
+BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)

 # "-pkgname" in the package list means remove "pkgname" from the package list
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
 
 # "-pkgname" in the package list means remove "pkgname" from the package list
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
 

-image:
-       if [ -z "$($(PROFILE)_NAME)" ]; then \
-               echo Profile $(PROFILE) not found.; \
-               echo 'Use "make info" to get a list of available target profiles'; \
-               false; \
-       fi
-       echo 'Building images for $(BOARD) - $($(PROFILE)_NAME)'
+_call_image:
+       echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'

        echo 'Packages: $(BUILD_PACKAGES)'
        echo
        rm -rf $(TARGET_DIR)
        mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR)
        $(MAKE) package_index
        $(MAKE) package_install
        echo 'Packages: $(BUILD_PACKAGES)'
        echo
        rm -rf $(TARGET_DIR)
        mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR)
        $(MAKE) package_index
        $(MAKE) package_install

-ifneq ($(FILES),)
+ifneq ($(USER_FILES),)

        $(MAKE) copy_files
 endif
        $(MAKE) package_postinst
        $(MAKE) copy_files
 endif
        $(MAKE) package_postinst


@@ -125,16 +118,16 @@ package_install: FORCE
 copy_files: FORCE
        @echo
        @echo Copying extra files
 copy_files: FORCE
        @echo
        @echo Copying extra files

-       $(CP) $(FILES)/* $(TARGET_DIR)/
+       $(CP) $(USER_FILES)/* $(TARGET_DIR)/

 
 package_postinst: FORCE
        @echo
        @echo Activating init scripts
        @( \
 
 package_postinst: FORCE
        @echo
        @echo Activating init scripts
        @( \

-               cd $(BUILD_DIR)/root; \
+               cd $(TARGET_DIR); \

                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \

-                       IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+                       IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \

                done || true; \
        )
 
                done || true; \
        )
 


@@ -147,5 +140,15 @@ clean:
        rm -rf tmp $(TARGET_DIR) $(BIN_DIR)
 
 
        rm -rf tmp $(TARGET_DIR) $(BIN_DIR)
 
 

+info:
+       (unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info)
+
+image:
+       (unset PROFILE FILES PACKAGES MAKEFLAGS; \
+       $(MAKE) _call_image \
+               $(if $(PROFILE),USER_PROFILE="$(PROFILE)") \
+               $(if $(FILES),USER_FILES="$(FILES)") \
+               $(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)"))
+

 .SILENT: help info image
 
 .SILENT: help info image