summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk5
-rw-r--r--mk/image.mk3
-rw-r--r--mk/kernel-build.mk1
-rw-r--r--mk/kernel.mk1
-rw-r--r--mk/modules.mk36
5 files changed, 37 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 3d2b69537..c13694013 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -64,8 +64,9 @@ noconfig_targets:= menuconfig \
POSTCONFIG= -@ \
if [ -f .config.old ];then \
- if [ -f .busyboxcfg ];then \
- rm .busyboxcfg; \
+ if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
+ touch .bbrebuild; \
+ cp .config .config.old; \
fi; \
fi
diff --git a/mk/image.mk b/mk/image.mk
index 53b01d0c2..ef0a626e0 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-imageprepare: kernel-install image-prepare-post extra-install
+imageprepare: image-prepare-post extra-install
# if an extra directory exist in TOPDIR, copy all content over the
# root directory, do the same if make extra=/dir/to/extra is used
@@ -59,6 +59,7 @@ ROOTFSUSERTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
+ cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 11b5a4890..797ad60d4 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -3,7 +3,6 @@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/mk/linux.mk
-#include ${TOPDIR}/mk/buildhlp.mk
include ${TOPDIR}/mk/kernel-vars.mk
KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
diff --git a/mk/kernel.mk b/mk/kernel.mk
index 33fbf5c2a..d09425e44 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -1,7 +1,6 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-
LINUX_KMOD_SUFFIX=ko
MODULES_SUBDIR := lib/modules/$(KERNEL_VERSION)
LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ARCH)-$(ADK_TARGET)
diff --git a/mk/modules.mk b/mk/modules.mk
index be49a9395..7dd4b232a 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -4,6 +4,7 @@
#
# Virtualization
#
+
$(eval $(call KMOD_template,KVM,kvm,\
$(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm \
,90))
@@ -16,10 +17,10 @@ $(eval $(call KMOD_template,KVM_INTEL,kvm-intel,\
$(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm-intel \
,95))
-
#
# Serial ATA devices
#
+
$(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
$(MODULES_DIR)/kernel/drivers/ata/ahci \
,10))
@@ -27,6 +28,7 @@ $(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
#
# Ethernet network devices
#
+
$(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\
$(MODULES_DIR)/kernel/drivers/net/8390 \
$(MODULES_DIR)/kernel/drivers/net/ne2k-pci \
@@ -52,10 +54,10 @@ $(eval $(call KMOD_template,SKY2,sky2,\
$(MODULES_DIR)/kernel/drivers/net/sky2 \
,20))
-
#
# Wireless network devices
#
+
$(eval $(call KMOD_template,MAC80211,mac80211,\
$(MODULES_DIR)/kernel/net/wireless/cfg80211 \
$(MODULES_DIR)/kernel/net/mac80211/mac80211 \
@@ -102,6 +104,7 @@ $(eval $(call KMOD_template,RT61PCI,rt61pci,\
#
# Networking
#
+
$(eval $(call KMOD_template,ATM,atm,\
$(MODULES_DIR)/kernel/net/atm/atm \
,50))
@@ -170,6 +173,7 @@ $(eval $(call KMOD_template,BONDING,bonding,\
#
# Traffic scheduling
#
+
$(eval $(call KMOD_template,NET_SCH_CBQ,net-sch-cbq,\
$(MODULES_DIR)/kernel/net/sched/sch_cbq \
,40))
@@ -222,6 +226,7 @@ $(eval $(call KMOD_template,NET_SCH_INGRESS,net-sch-ingress,\
#
# classifications
#
+
$(eval $(call KMOD_template,NET_CLS_BASIC,net-cls-basic,\
$(MODULES_DIR)/kernel/net/sched/cls_basic \
,40))
@@ -245,6 +250,7 @@ $(eval $(call KMOD_template,NET_CLS_U32,net-cls-u32,\
#
# actions
#
+
$(eval $(call KMOD_template,NET_ACT_POLICE,net-act-police,\
$(MODULES_DIR)/kernel/net/sched/act_police \
,45))
@@ -268,6 +274,7 @@ $(eval $(call KMOD_template,NET_ACT_PEDIT,net-act-pedit,\
#
# IPsec
#
+
$(eval $(call KMOD_template,NET_KEY,net-key,\
$(MODULES_DIR)/kernel/net/key/af_key \
,60))
@@ -300,9 +307,11 @@ $(eval $(call KMOD_template,INET_XFRM_MODE_BEET,inet-xfrm-mode-beet,\
##
## Filtering / Firewalling
##
+
#
# Ethernet Bridging firewall
#
+
$(eval $(call KMOD_template,BRIDGE_NF_EBTABLES,bridge-nf-ebtables,\
$(MODULES_DIR)/kernel/net/bridge/netfilter/ebtables \
,55))
@@ -342,6 +351,7 @@ $(eval $(call KMOD_template,BRIDGE_EBT_REDIRECT,bridge-ebt-redirect,\
#
# Netfilter Core
#
+
$(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-classify,\
$(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \
,50))
@@ -369,6 +379,7 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NOTRACK,netfilter-xt-target-notr
#
# IP: Netfilter
#
+
$(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\
$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack \
,45))
@@ -480,6 +491,7 @@ $(eval $(call KMOD_template,IP_NF_MATCH_MULTIPORT,ip-nf-match-multiport,\
#
# Filtering
#
+
$(eval $(call KMOD_template,IP_NF_FILTER,ip-nf-filter,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_filter \
,55))
@@ -515,6 +527,7 @@ $(eval $(call KMOD_template,IP_NF_TARGET_NETMAP,ip-nf-target-netmap,\
#
# Mangle
#
+
$(eval $(call KMOD_template,IP_NF_MANGLE,ip-nf-mangle,\
$(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_mangle \
,60))
@@ -534,6 +547,7 @@ $(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\
#
# IPv6: Netfilter
#
+
$(eval $(call KMOD_template,NF_CONNTRACK_IPV6,nf-conntrack-ipv6,\
$(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_conntrack_ipv6 \
,50))
@@ -577,6 +591,7 @@ $(eval $(call KMOD_template,IP6_NF_TARGET_LOG,ip6-nf-target-log,\
#
# IPv6: Filtering
#
+
$(eval $(call KMOD_template,IP6_NF_FILTER,ip6-nf-filter,\
$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_filter \
,55))
@@ -588,6 +603,7 @@ $(eval $(call KMOD_template,IP6_NF_TARGET_REJECT,ip6-nf-target-reject,\
#
# IPv6: Mangle
#
+
$(eval $(call KMOD_template,IP6_NF_MANGLE,ip6-nf-mangle,\
$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_mangle \
,60))
@@ -649,6 +665,7 @@ $(eval $(call KMOD_template,IP_VS_FTP,ip-vs-ftp,\
#
# Block devices
#
+
$(eval $(call KMOD_template,BLK_DEV_LOOP,blk-dev-loop,\
$(MODULES_DIR)/kernel/drivers/block/loop \
,20))
@@ -674,6 +691,7 @@ $(eval $(call KMOD_template,BLK_DEV_SR,blk-dev-sr,\
#
# RAID
#
+
$(eval $(call KMOD_template,BLK_DEV_MD,blk-dev-md,\
$(MODULES_DIR)/kernel/drivers/md/md-mod \
,30))
@@ -699,6 +717,7 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\
#
# Device Mapper
#
+
$(eval $(call KMOD_template,BLK_DEV_DM,blk-dev-dm,\
$(MODULES_DIR)/kernel/drivers/md/dm-mod \
,35))
@@ -717,7 +736,6 @@ $(eval $(call KMOD_template,DM_SNAPSHOT,dm-snapshot,\
$(MODULES_DIR)/kernel/drivers/md/dm-snapshot \
,40))
-
#
# Crypto
#
@@ -902,6 +920,7 @@ $(eval $(call KMOD_template,OCF_TALITOS,ocf-talitos,\
#
# Filesystems
#
+
$(eval $(call KMOD_template,AUFS_FS,aufs-fs,\
$(MODULES_DIR)/kernel/fs/aufs/aufs \
,30))
@@ -1001,6 +1020,7 @@ $(eval $(call KMOD_template,UDF_FS,udf-fs,\
#
# Multimedia
#
+
$(eval $(call KMOD_template,SOUND,sound,\
$(MODULES_DIR)/kernel/sound/soundcore \
,30))
@@ -1057,6 +1077,7 @@ $(eval $(call KMOD_template,PWC,pwc,\
#
# PCMCIA/CardBus
#
+
$(eval $(call KMOD_template,PCCARD,pccard,\
$(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \
,40))
@@ -1233,10 +1254,10 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\
$(MODULES_DIR)/kernel/net/netfilter/xt_LED \
,90))
-
#
# NLS
#
+
$(eval $(call KMOD_template,NLS,nls,\
$(MODULES_DIR)/kernel/fs/nls/nls_base \
,10))
@@ -1403,7 +1424,10 @@ $(eval $(call KMOD_template,NLS_UTF8,nls-utf8, \
$(MODULES_DIR)/kernel/fs/nls/nls_utf8 \
,20))
+#
# ISDN
+#
+
ISDN_MODULES=drivers/isdn/i4l/isdn
$(eval $(call KMOD_template,ISDN,isdn, \
@@ -1460,7 +1484,10 @@ $(eval $(call KMOD_template,MISDN_SPEEDFAX,misdn-speedfax, \
$(MODULES_DIR)/kernel/drivers/isdn/hardware/mISDN/sedlfax \
,80))
+#
# Library modules
+#
+
$(eval $(call KMOD_template,CRC_CCITT,crc-ccitt, \
$(MODULES_DIR)/kernel/lib/crc-ccitt \
,01))
@@ -1483,6 +1510,7 @@ $(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \
#
# parallel port support
+#
$(eval $(call KMOD_template,LP,lp,\
$(MODULES_DIR)/kernel/drivers/char/lp \