diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-10-22 00:06:20 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-10-22 00:06:20 +0000 |
| commit | c65955aa6a15b044fcdb98b09544536a57a6692c (patch) | |
| tree | a24ab49da85d53a681590386f6607a72660a29fd /openwrt/target/linux/linux-2.6 | |
| parent | 9c4caa1e7a14df7eed795618fbd4254a8b09ee4a (diff) | |
large build system cleanup. added some stuff to control the verbosity level, but not complete, yet.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2221 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/linux/linux-2.6')
| -rw-r--r-- | openwrt/target/linux/linux-2.6/Makefile | 13 | ||||
| -rw-r--r-- | openwrt/target/linux/linux-2.6/broadcom.mk | 3 |
2 files changed, 3 insertions, 13 deletions
diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile index 544b5c5c7..b61adf625 100644 --- a/openwrt/target/linux/linux-2.6/Makefile +++ b/openwrt/target/linux/linux-2.6/Makefile @@ -25,7 +25,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2 LINUX_SOURCE_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR) -TARGET_MODULES_DIR := $(TARGET_DIR)/lib/modules/$(LINUX_VERSION) +TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/lib/modules/$(LINUX_VERSION) IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules @@ -47,10 +47,6 @@ include $(LINUX_KCONFIG) INSTALL_TARGETS := $(KERNEL_IPKG) TARGETS := -ifeq ($(BOARD),brcm) -include ./broadcom.mk -endif - $(eval $(call KMOD_template,ATM,atm,\ $(MODULES_DIR)/kernel/net/atm/atm.ko \ $(MODULES_DIR)/kernel/net/atm/br2684.ko \ @@ -238,18 +234,15 @@ source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured compile: $(LINUX_DIR)/.modules_done $(TARGETS) ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR) + @$(TRACE) target/linux/package $(MAKE) -C $(TOPDIR)/target/linux/package \ $(KPKG_MAKEOPTS) \ compile install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) rm -rf $(LINUX_BUILD_DIR)/root* + cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/ echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf - $(MAKE) -C $(TOPDIR)/package \ - TARGET_DIR="$(LINUX_TARGET_DIR)" \ - IPKG_CONF="$(LINUX_BUILD_DIR)" \ - BOARD="$(BOARD)" \ - install $(MAKE) -C $(TOPDIR)/target/linux/package \ $(KPKG_MAKEOPTS) \ install diff --git a/openwrt/target/linux/linux-2.6/broadcom.mk b/openwrt/target/linux/linux-2.6/broadcom.mk deleted file mode 100644 index f34fe6ac6..000000000 --- a/openwrt/target/linux/linux-2.6/broadcom.mk +++ /dev/null @@ -1,3 +0,0 @@ -# $Id$ -# -# broadcom specific kmod packages |