summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk28
-rw-r--r--mk/cpu.mk20
-rw-r--r--mk/image.mk49
-rw-r--r--mk/kernel-build.mk15
-rw-r--r--mk/kernel.mk2
-rw-r--r--mk/mirrors.mk2
-rw-r--r--mk/modules.mk89
-rw-r--r--mk/package.mk5
-rw-r--r--mk/vars.mk6
9 files changed, 131 insertions, 85 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 3d2b69537..793145be0 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -16,6 +16,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_MAKE_PARALLEL=y \
ADK_MAKE_JOBS=4 \
ADK_FORCE_PARALLEL=n \
+ ADK_PACKAGE_BZR=n \
ADK_PACKAGE_GRUB=n \
ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \
ADK_PACKAGE_AUFS2_UTIL=n \
@@ -28,6 +29,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
BUSYBOX_BBCONFIG=n \
BUSYBOX_SELINUX=n \
+ BUSYBOX_INSTALL_NO_USR=n \
BUSYBOX_MODPROBE_SMALL=n \
BUSYBOX_EJECT=n \
BUSYBOX_BUILD_LIBBUSYBOX=n \
@@ -64,8 +66,17 @@ noconfig_targets:= menuconfig \
POSTCONFIG= -@ \
if [ -f .config.old ];then \
- if [ -f .busyboxcfg ];then \
- rm .busyboxcfg; \
+ rebuild=0; \
+ if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
+ touch .rebuild.busybox;\
+ rebuild=1;\
+ fi; \
+ if [ "$$(grep ^ADK_RUNTIME_PASSWORD .config|md5sum)" != "$$(grep ^ADK_RUNTIME_PASSWORD .config.old|md5sum)" ];then \
+ touch .rebuild.base-files;\
+ rebuild=1;\
+ fi; \
+ if [ $$rebuild -eq 1 ];then \
+ cp .config .config.old; \
fi; \
fi
@@ -89,12 +100,12 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
ifeq ($(ADK_NATIVE),y)
- $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+ $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
else
ifeq ($(ADK_TOOLCHAIN_ONLY),y)
- $(MAKE) -f mk/build.mk toolchain/install package/compile
+ $(MAKE) -f mk/build.mk toolchain/install tools/install package/compile
else
- $(MAKE) -f mk/build.mk toolchain/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+ $(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
endif
endif
@@ -135,6 +146,9 @@ target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG
toolchain/%: ${STAGING_DIR}
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+tools/%:
+ $(MAKE) -C tools $(patsubst tools/%,%,$@)
+
image:
$(MAKE) -C target image
@@ -163,7 +177,7 @@ newpackage:
$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
@echo "Edit package/$(PKG)/Makefile to complete"
- @echo "Do not forget to add package to package/Config.in"
+ @echo "choose PKG_SECTION to add it to an existent submenu"
#############################################################
#
@@ -471,10 +485,12 @@ bulkallmod:
done <${TOPDIR}/target/bulk.lst
menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
+ @echo "Generating menu structure ..."
mksh $(TOPDIR)/package/pkgmaker
@:>.menu
dep:
+ @echo "Generating dependencies ..."
mksh $(TOPDIR)/package/depmaker
.PHONY: menu dep
diff --git a/mk/cpu.mk b/mk/cpu.mk
deleted file mode 100644
index 1678e9311..000000000
--- a/mk/cpu.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-#
-# optimization configure options for CPU features
-
-ifeq ($(ADK_TARGET),alix1c)
-CONFIGURE_CPU_OPTS:= --disable-ssse3 \
- --disable-sse \
- --enable-amd3dnow \
- --enable-amd3dnowext \
- --enable-mmx \
- --enable-mmx2
-else
-CONFIGURE_CPU_OPTS:= --disable-ssse3 \
- --disable-sse \
- --disable-amd3dnow \
- --disable-amd3dnowext \
- --disable-mmx \
- --disable-mmx2
-endif
diff --git a/mk/image.mk b/mk/image.mk
index 53b01d0c2..b548aac29 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
@@ -13,37 +13,6 @@ image-prepare-post:
rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \
dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
chmod 600 ${TARGET_DIR}/etc/.rnd
- @cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \
- sed -e "s/*//" | \
- while read sum name; do \
- inode=$$(ls -i "$$name"); \
- echo "$$sum $${inode%% *} $$name"; \
- done | sort | while read sum inode name; do \
- if [[ $$sum = $$ls ]]; then \
- [[ $$li = $$inode ]] && continue; \
- case $$x in \
- 1) echo 'WARNING: duplicate files found' \
- 'in filesystem! Please fix them.' >&2; \
- echo -n "> $$ln "; \
- ;; \
- 2) echo -n "> $$ln "; \
- ;; \
- 3) echo -n ' '; \
- ;; \
- esac; \
- echo -n "$$name"; \
- x=3; \
- else \
- case $$x in \
- 3) echo; \
- x=2; \
- ;; \
- esac; \
- fi; \
- ls=$$sum; \
- ln=$$name; \
- li=$$inode; \
- done
chmod 4511 ${TARGET_DIR}/bin/busybox
chmod 1777 ${TARGET_DIR}/tmp
@if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \
@@ -52,13 +21,27 @@ image-prepare-post:
done; \
fi
+KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
+KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX)
+
+kernel-package: $(LINUX_DIR)/vmlinux
+ $(TRACE) target/$(ADK_TARGET)-create-kernel-package
+ rm -rf $(KERNEL_PKGDIR)
+ @mkdir -p $(KERNEL_PKGDIR)/boot
+ cp $(KERNEL) $(KERNEL_PKGDIR)/boot/vmlinuz-adk
+ @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
+ ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH}
+ $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
+ $(TRACE) target/$(ADK_TARGET)-install-kernel-package
+ $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE)
+
INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img
ROOTFSTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}+kernel.tar.gz
ROOTFSUSERTARBALL= ${ADK_TARGET}-${ADK_LIBC}-${FS}.tar.gz
INITRAMFS_PIGGYBACK= ${ADK_TARGET}-${ADK_LIBC}-${FS}.cpio
-${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
+${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
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..8ee6d1ac3 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -3,11 +3,8 @@
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
-
$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
$(TRACE) target/$(ADK_TARGET)-kernel-patch
$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
@@ -37,17 +34,11 @@ $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
modules_install $(MAKE_TRACE)
$(TRACE) target/$(ADK_TARGET)-create-packages
- $(MAKE) $(KERNEL_PKG) $(TARGETS)
+ifneq ($(strip $(TARGETS)),)
+ $(MAKE) $(TARGETS)
+endif
touch -c $(LINUX_DIR)/vmlinux
-$(KERNEL_PKG):
- $(TRACE) target/$(ADK_TARGET)-create-kernel-package
- rm -rf $(KERNEL_PKGDIR)
- @mkdir -p $(KERNEL_PKGDIR)/etc
- ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
- ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH}
- $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
-
prepare:
compile: $(LINUX_DIR)/vmlinux
install: compile
diff --git a/mk/kernel.mk b/mk/kernel.mk
index 33fbf5c2a..a8b3884da 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)
@@ -9,7 +8,6 @@ KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
-KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(ADK_TARGET)-$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX)
INSTALL_TARGETS:= $(KERNEL_PKG)
NOINSTALL_TARGETS:=
TARGETS:=
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index c7e0ac623..a57cb8ec8 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.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.
-MASTER_SITE_BACKUP?= ${MASTER_SITE_OPENADK}
+MASTER_SITE_BACKUP?= http://${ADK_HOST}/distfiles/
MASTER_SITE_OPENADK?= \
http://www.openadk.org/distfiles/ \
diff --git a/mk/modules.mk b/mk/modules.mk
index be49a9395..032f0a85c 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,10 +274,15 @@ $(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))
+$(eval $(call KMOD_template,XFRM_USER,xfrm-user,\
+ $(MODULES_DIR)/kernel/net/xfrm/xfrm_user \
+,61))
+
$(eval $(call KMOD_template,INET_AH,inet-ah,\
$(MODULES_DIR)/kernel/net/ipv4/ah4 \
,65))
@@ -300,9 +311,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 +355,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 +383,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 +495,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 +531,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 +551,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 +595,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 +607,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 +669,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 +695,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 +721,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 +740,6 @@ $(eval $(call KMOD_template,DM_SNAPSHOT,dm-snapshot,\
$(MODULES_DIR)/kernel/drivers/md/dm-snapshot \
,40))
-
#
# Crypto
#
@@ -755,6 +777,10 @@ $(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\
$(MODULES_DIR)/kernel/crypto/chainiv \
,07))
+$(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\
+ $(MODULES_DIR)/kernel/crypto/authenc \
+,11))
+
$(eval $(call KMOD_template,CRYPTO_HMAC,crypto-hmac,\
$(MODULES_DIR)/kernel/crypto/hmac \
,11))
@@ -791,6 +817,18 @@ $(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tgr192,\
$(MODULES_DIR)/kernel/crypto/tgr192 \
,11))
+$(eval $(call KMOD_template,CRYPTO_SEQIV,crypto-seqiv,\
+ $(MODULES_DIR)/kernel/crypto/seqiv \
+,5))
+
+$(eval $(call KMOD_template,CRYPTO_CTR,crypto-ctr,\
+ $(MODULES_DIR)/kernel/crypto/ctr \
+,10))
+
+$(eval $(call KMOD_template,CRYPTO_CCM,crypto-ccm,\
+ $(MODULES_DIR)/kernel/crypto/ccm \
+,10))
+
$(eval $(call KMOD_template,CRYPTO_ECB,crypto-ecb,\
$(MODULES_DIR)/kernel/crypto/ecb \
,10))
@@ -862,6 +900,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
$(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
$(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
+ $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
$(MODULES_DIR)/kernel/crypto/deflate \
,10))
@@ -902,6 +941,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 +1041,7 @@ $(eval $(call KMOD_template,UDF_FS,udf-fs,\
#
# Multimedia
#
+
$(eval $(call KMOD_template,SOUND,sound,\
$(MODULES_DIR)/kernel/sound/soundcore \
,30))
@@ -1040,9 +1081,13 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
,55))
+V4L_COMPAT:=drivers/media/video/v4l1-compat
+ifeq ($(ADK_LINUX_64),y)
+V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
+endif
+
$(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
- $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \
- $(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \
+ $(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \
$(MODULES_DIR)/kernel/drivers/media/video/videodev \
,65))
@@ -1057,6 +1102,7 @@ $(eval $(call KMOD_template,PWC,pwc,\
#
# PCMCIA/CardBus
#
+
$(eval $(call KMOD_template,PCCARD,pccard,\
$(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \
,40))
@@ -1156,6 +1202,10 @@ $(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\
$(MODULES_DIR)/kernel/drivers/net/usb/pegasus \
,75))
+$(eval $(call KMOD_template,USB_HSO,usb-hso,\
+ $(MODULES_DIR)/kernel/drivers/net/usb/hso \
+,75))
+
$(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
$(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \
$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \
@@ -1233,10 +1283,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 +1453,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 +1513,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 +1539,7 @@ $(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \
#
# parallel port support
+#
$(eval $(call KMOD_template,LP,lp,\
$(MODULES_DIR)/kernel/drivers/char/lp \
@@ -1499,3 +1556,23 @@ $(eval $(call KMOD_template,PARPORT,parport,\
$(eval $(call KMOD_template,PLIP,plip,\
$(MODULES_DIR)/kernel/drivers/net/plip \
,51))
+
+#
+# Profiling
+#
+$(eval $(call KMOD_template,OPROFILE,oprofile,\
+ $(MODULES_DIR)/kernel/arch/x86/oprofile/oprofile \
+,10))
+
+#
+# I2C
+#
+$(eval $(call KMOD_template,I2C,i2c,\
+ $(MODULES_DIR)/kernel/drivers/i2c/i2c-core \
+ $(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \
+,20))
+
+$(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\
+ $(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \
+,25))
+
diff --git a/mk/package.mk b/mk/package.mk
index b4b02d8a5..acc387a48 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -143,6 +143,7 @@ ALL_PKGOPTS+= $(1)
PKGNAME_$(1)= $(2)
PKGDEPS_$(1)= $(4)
PKGDESC_$(1)= $(5)
+PKGSECT_$(1)= $(6)
IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
@@ -160,7 +161,7 @@ IDEPEND_$(1):= $$(strip $(4))
_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control
ICONTROL_$(1)?= $(WRKDIR)/.$(2).control
$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
- @echo "Package: $(2)" > $(WRKDIR)/.$(2).control
+ @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control
@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
@@ -177,7 +178,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
comma=", "; \
last=$$$$dep; \
done; \
- echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \
+ echo "Depends: $$$$deps" | tr '_' '-' >>$${IDIR_$(1)}/CONTROL/control; \
fi
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 42c534071..78b37fbbe 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -37,8 +37,8 @@ PACKAGE_DIR:= $(BIN_DIR)/packages
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
-REAL_GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux-$(ADK_TARGET_SUFFIX)
-GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux
+REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev
ifeq ($(ADK_NATIVE),y)
TARGET_CROSS:=
@@ -127,6 +127,6 @@ QUIET:=
else
QUIET:= --quiet
endif
-FETCH_CMD?= wget -t1 --timeout=30 $(QUIET)
+FETCH_CMD?= wget --tries=1 --timeout=30 $(QUIET)
include $(TOPDIR)/mk/mirrors.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 13:42:57 +0000