domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
SVN-Revision: 5224
This commit is contained in:
Felix Fietkau
2006-10-19 05:01:04 +00:00
parent edc69c912b
commit 87e6a7e4f2
17 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/kernel-build.mk
View File

@@ -4,7 +4,10 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
KERNEL_BUILD:=1
include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/kernel.mk
LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
@@ -43,7 +46,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
touch $@ touch $@
ifeq ($(KERNEL),2.4) 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 $(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 $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
touch $@ touch $@
@@ -73,25 +76,22 @@ else
echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
endif 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) $(MAKE) -j$(CONFIG_JLEVEL) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
touch -c $(LINUX_KERNEL) touch -c $(LINUX_KERNEL)
$(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.config
rm -rf $(KERNEL_BUILD_DIR)/modules 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) -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 $(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 touch $(LINUX_DIR)/.modules_done
modules: $(LINUX_DIR)/.modules_done $(LINUX_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
$(LINUX_DIR)/.linux-compile:
@rm -f $(BUILD_DIR)/linux @rm -f $(BUILD_DIR)/linux
ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
@$(MAKE) modules
touch $@ touch $@
$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile $(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
@@ -106,7 +106,6 @@ prepare: $(LINUX_DIR)/.configured
@mkdir -p $(LINUX_DIR) @mkdir -p $(LINUX_DIR)
compile: prepare $(LINUX_DIR)/.linux-compile compile: prepare $(LINUX_DIR)/.linux-compile
install: compile $(LINUX_KERNEL) install: compile $(LINUX_KERNEL)
mostlyclean: FORCE mostlyclean: FORCE

3
include/kernel.mk
View File

@@ -22,8 +22,11 @@ else
# oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
$(warning rebuilding .kernel.mk) $(warning rebuilding .kernel.mk)
$(TOPDIR)/.kernel.mk: FORCE $(TOPDIR)/.kernel.mk: FORCE
ifneq ($(KERNEL_BUILD),1)
$(TOPDIR)/.kernel.mk:
@$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null
endif endif
endif
ifeq ($(KERNEL),2.6) ifeq ($(KERNEL),2.6)
LINUX_KMOD_SUFFIX=ko LINUX_KMOD_SUFFIX=ko

13
package/kernel/modules/network.mk
View File

@@ -66,6 +66,7 @@ define KernelPackage/ipsec
- xfrm_user - xfrm_user
SUBMENU:=$(NSMENU) SUBMENU:=$(NSMENU)
DEPENDS:=@LINUX_2_6 DEPENDS:=@LINUX_2_6
KCONFIG:=$(CONFIG_NET_KEY)
FILES:= \ FILES:= \
$(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \ $(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
$(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
@@ -82,9 +83,11 @@ define KernelPackage/ipsec4
- ipcomp\\\ - ipcomp\\\
- xfrm4_tunnel - xfrm4_tunnel
SUBMENU:=$(NSMENU) SUBMENU:=$(NSMENU)
KCONFIG:=$(CONFIG_INET_AH)
DEPENDS:=kmod-ipsec DEPENDS:=kmod-ipsec
FILES:=\ FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
$(MODULES_DIR)/kernel/net/ipv4/{ah4,esp4,ipcomp,xfrm4_tunnel}.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
)
endef endef
$(eval $(call KernelPackage,ipsec4)) $(eval $(call KernelPackage,ipsec4))
@@ -98,9 +101,11 @@ define KernelPackage/ipsec6
- ipcomp6\\\ - ipcomp6\\\
- xfrm6_tunnel - xfrm6_tunnel
SUBMENU:=$(NSMENU) SUBMENU:=$(NSMENU)
KCONFIG:=$(CONFIG_INET6_AH)
DEPENDS:=kmod-ipsec DEPENDS:=kmod-ipsec
FILES:=\ FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \
$(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) \
)
endef endef
$(eval $(call KernelPackage,ipsec6)) $(eval $(call KernelPackage,ipsec6))

1
target/linux/ar531x-2.4/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/ar7-2.4/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/aruba-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/au1000-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/brcm-2.4/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/brcm-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk

1
target/linux/brcm63xx-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk

1
target/linux/magicbox-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/rb532-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/rdc-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/sibyte-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/uml-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/x86-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked

1
target/linux/xscale-2.6/Makefile
View File

@@ -11,7 +11,6 @@ LINUX_RELEASE:=1
LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
include ./config include ./config
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/kernel-build.mk include $(INCLUDE_DIR)/kernel-build.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked