aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/kernel-build.mk15
-rw-r--r--include/kernel.mk7
-rw-r--r--package/kernel/modules/network.mk15
-rw-r--r--target/linux/ar531x-2.4/Makefile1
-rw-r--r--target/linux/ar7-2.4/Makefile1
-rw-r--r--target/linux/aruba-2.6/Makefile1
-rw-r--r--target/linux/au1000-2.6/Makefile1
-rw-r--r--target/linux/brcm-2.4/Makefile1
-rw-r--r--target/linux/brcm-2.6/Makefile1
-rw-r--r--target/linux/brcm63xx-2.6/Makefile1
-rw-r--r--target/linux/magicbox-2.6/Makefile1
-rw-r--r--target/linux/rb532-2.6/Makefile1
-rw-r--r--target/linux/rdc-2.6/Makefile1
-rw-r--r--target/linux/sibyte-2.6/Makefile1
-rw-r--r--target/linux/uml-2.6/Makefile1
-rw-r--r--target/linux/x86-2.6/Makefile1
-rw-r--r--target/linux/xscale-2.6/Makefile1
17 files changed, 22 insertions, 29 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 0697b79a53..04c3c7f8e6 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -4,7 +4,10 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+KERNEL_BUILD:=1
+
include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/kernel.mk
LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
@@ -43,7 +46,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
touch $@
ifeq ($(KERNEL),2.4)
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
+$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(LINUX_DIR)/.config
$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
touch $@
@@ -73,25 +76,22 @@ else
echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
endif
-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile ramdisk-config
+$(LINUX_DIR)/vmlinux: ramdisk-config
$(MAKE) -j$(CONFIG_JLEVEL) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
touch -c $(LINUX_KERNEL)
-$(LINUX_DIR)/.modules_done:
+$(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.config
rm -rf $(KERNEL_BUILD_DIR)/modules
$(MAKE) -j$(CONFIG_JLEVEL) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
touch $(LINUX_DIR)/.modules_done
-modules: $(LINUX_DIR)/.modules_done
-
-$(LINUX_DIR)/.linux-compile:
+$(LINUX_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
@rm -f $(BUILD_DIR)/linux
ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
- @$(MAKE) modules
touch $@
$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
@@ -106,7 +106,6 @@ prepare: $(LINUX_DIR)/.configured
@mkdir -p $(LINUX_DIR)
compile: prepare $(LINUX_DIR)/.linux-compile
-
install: compile $(LINUX_KERNEL)
mostlyclean: FORCE
diff --git a/include/kernel.mk b/include/kernel.mk
index af5d9455fa..42c9cdf3a1 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -18,11 +18,14 @@ else
LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE)
LINUX_KARCH:=$(CONFIG_LINUX_KARCH)
- else
+ else
# oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
$(warning rebuilding .kernel.mk)
$(TOPDIR)/.kernel.mk: FORCE
- @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null
+ ifneq ($(KERNEL_BUILD),1)
+ $(TOPDIR)/.kernel.mk:
+ @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null
+ endif
endif
ifeq ($(KERNEL),2.6)
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 4c82c4cc04..f3ab2ff700 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -66,7 +66,8 @@ define KernelPackage/ipsec
- xfrm_user
SUBMENU:=$(NSMENU)
DEPENDS:=@LINUX_2_6
- FILES:=\
+ KCONFIG:=$(CONFIG_NET_KEY)
+ FILES:= \
$(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
$(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
endef
@@ -82,9 +83,11 @@ define KernelPackage/ipsec4
- ipcomp\\\
- xfrm4_tunnel
SUBMENU:=$(NSMENU)
+ KCONFIG:=$(CONFIG_INET_AH)
DEPENDS:=kmod-ipsec
- FILES:=\
- $(MODULES_DIR)/kernel/net/ipv4/{ah4,esp4,ipcomp,xfrm4_tunnel}.$(LINUX_KMOD_SUFFIX)
+ FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
+ $(MODULES_DIR)/kernel/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
+ )
endef
$(eval $(call KernelPackage,ipsec4))
@@ -98,9 +101,11 @@ define KernelPackage/ipsec6
- ipcomp6\\\
- xfrm6_tunnel
SUBMENU:=$(NSMENU)
+ KCONFIG:=$(CONFIG_INET6_AH)
DEPENDS:=kmod-ipsec
- FILES:=\
- $(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX)
+ FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \
+ $(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) \
+ )
endef
$(eval $(call KernelPackage,ipsec6))
diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile
index 33cb47cf50..14b73f8f5c 100644
--- a/target/linux/ar531x-2.4/Makefile
+++ b/target/linux/ar531x-2.4/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile
index 92e49d2020..b220b4c977 100644
--- a/target/linux/ar7-2.4/Makefile
+++ b/target/linux/ar7-2.4/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile
index 7ffd11c668..b10715ae77 100644
--- a/target/linux/aruba-2.6/Makefile
+++ b/target/linux/aruba-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index 5d2711cb30..ca85b73bca 100644
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 33cb47cf50..14b73f8f5c 100644
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile
index 0437338e8e..178a2a79c2 100644
--- a/target/linux/brcm-2.6/Makefile
+++ b/target/linux/brcm-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
diff --git a/target/linux/brcm63xx-2.6/Makefile b/target/linux/brcm63xx-2.6/Makefile
index 0437338e8e..178a2a79c2 100644
--- a/target/linux/brcm63xx-2.6/Makefile
+++ b/target/linux/brcm63xx-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
diff --git a/target/linux/magicbox-2.6/Makefile b/target/linux/magicbox-2.6/Makefile
index 7ffd11c668..b10715ae77 100644
--- a/target/linux/magicbox-2.6/Makefile
+++ b/target/linux/magicbox-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile
index 30fa1a85a1..4daa728a5a 100644
--- a/target/linux/rb532-2.6/Makefile
+++ b/target/linux/rb532-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile
index 59f02b3340..5dc19cf679 100644
--- a/target/linux/rdc-2.6/Makefile
+++ b/target/linux/rdc-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile
index 30fa1a85a1..4daa728a5a 100644
--- a/target/linux/sibyte-2.6/Makefile
+++ b/target/linux/sibyte-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml-2.6/Makefile
index 59f02b3340..5dc19cf679 100644
--- a/target/linux/uml-2.6/Makefile
+++ b/target/linux/uml-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index 59f02b3340..5dc19cf679 100644
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/xscale-2.6/Makefile
index 59f02b3340..5dc19cf679 100644
--- a/target/linux/xscale-2.6/Makefile
+++ b/target/linux/xscale-2.6/Makefile
@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 18:08:49 +0000