cleanup
SVN-Revision: 5224
This commit is contained in:
parent
edc69c912b
commit
87e6a7e4f2
17 changed files with 22 additions and 29 deletions
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -11,7 +11,6 @@ LINUX_RELEASE:=1
|
|||
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
|
||||
|
||||
include ./config
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
include $(INCLUDE_DIR)/kernel-build.mk
|
||||
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ LINUX_RELEASE:=1
|
|||
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
|
||||
|
||||
include ./config
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
include $(INCLUDE_DIR)/kernel-build.mk
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue