summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/Makefile3
-rw-r--r--target/linux/Makefile2
-rw-r--r--target/linux/kernel.mk24
-rw-r--r--target/linux/rules.mk9
4 files changed, 2 insertions, 36 deletions
diff --git a/target/Makefile b/target/Makefile
index b039214860..58fc5eb874 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -16,9 +16,6 @@ clean: linux-clean utils-clean lzma-clean image_clean
image_clean:
rm -f $(BIN_DIR)/openwrt-*
-linux/package/%:
- $(MAKE) -C $(TOPDIR)/target/linux $(patsubst linux/%,%,$@)
-
%-clean:
$(MAKE) -C $(patsubst %-clean,%,$@) clean
%-prepare:
diff --git a/target/linux/Makefile b/target/linux/Makefile
index bea43514a7..46b162c7e6 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -38,8 +38,6 @@ compile: $(1)/$(2)-compile
rebuild: $(1)/$(2)-rebuild
$(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
install-ib: $(1)/$(2)-install-ib
-package/%:
- $(MAKE) -C $(2)-$(1) BOARD="$(2)" $$@
endif
.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index 371ea3366d..e710d7d9c9 100644
--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -40,7 +40,7 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
touch $@
endif
-$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile
+$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile FORCE
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
@@ -56,22 +56,8 @@ $(LINUX_DIR)/.modules_done:
$(STAMP_DIR)/.linux-compile:
@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
- $(MAKE) -C $(TOPDIR)/target/linux/package \
- $(KPKG_MAKEOPTS) \
- compile
touch $@
-.PHONY: pkg-install
-pkg-install:
- @mkdir -p $(TARGET_MODULES_DIR)
- @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)/target/linux/package \
- $(KPKG_MAKEOPTS) \
- install
- [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS)
-
$(KERNEL_IPKG):
rm -rf $(KERNEL_IDIR)
mkdir -p $(KERNEL_IDIR)/etc
@@ -93,9 +79,7 @@ prepare: $(BUILD_DIR)/kernel.mk
compile: prepare $(STAMP_DIR)/.linux-compile
-install: compile
- $(MAKE) $(KPKG_MAKEOPTS) pkg-install
- $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL)
+install: compile $(LINUX_KERNEL)
mostlyclean:
rm -f $(STAMP_DIR)/.linux-compile
@@ -116,7 +100,3 @@ clean:
rm -rf $(LINUX_BUILD_DIR)
rm -f $(TARGETS)
-package/%:
- $(MAKE) -C $(TOPDIR)/target/linux/package \
- $(KPKG_MAKEOPTS) \
- $(patsubst package/%,%,$@)
diff --git a/target/linux/rules.mk b/target/linux/rules.mk
index da32ed8b04..092b81b414 100644
--- a/target/linux/rules.mk
+++ b/target/linux/rules.mk
@@ -23,15 +23,6 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/armeb/arm/' \
)
-KPKG_MAKEOPTS:= IPKG="$(IPKG_KERNEL)" \
- BOARD="$(BOARD)" \
- KERNEL="$(KERNEL)" \
- TARGET_DIR="$(LINUX_TARGET_DIR)" \
- LINUX_BUILD_DIR="$(LINUX_BUILD_DIR)" \
- LINUX_DIR="$(LINUX_DIR)" \
- LINUX_VERSION="$(LINUX_VERSION)" \
- LINUX_RELEASE="$(LINUX_RELEASE)"
-
KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)