summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-06 10:35:02 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-06 10:35:02 (GMT)
commitd9c9f5dfecc6d6cb24d45d478e0e7147d9c6f2dc (patch)
tree818208226a811658df9f5b496b741f9ff7eba7f5 /mk
parent65b27b644c5817eb63fe7b8392236c37e0386f9b (diff)
update some packages, fix some kernel module dependencies
- update tinc, openssl and xinetd - fix openssh and dropbear coexistence - fix some kernel module load orders
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk1
-rw-r--r--mk/modules.mk26
2 files changed, 15 insertions, 12 deletions
diff --git a/mk/build.mk b/mk/build.mk
index df4add9..b5881ab 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -15,6 +15,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_STATIC=n \
ADK_FORCE_PARALLEL=n \
BUSYBOX_SELINUX=n \
+ BUSYBOX_MODPROBE_SMALL=n \
BUSYBOX_EJECT=n \
BUSYBOX_BUILD_LIBBUSYBOX=n \
BUSYBOX_LOCALE_SUPPORT=n \
diff --git a/mk/modules.mk b/mk/modules.mk
index 92156e5..faf25ba 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -249,8 +249,8 @@ $(eval $(call KMOD_template,INET_ESP,net-ipsec-esp,\
,65))
$(eval $(call KMOD_template,INET_IPCOMP,net-ipsec-comp,\
- $(MODULES_DIR)/kernel/net/ipv4/ipcomp \
$(MODULES_DIR)/kernel/net/xfrm/xfrm_ipcomp \
+ $(MODULES_DIR)/kernel/net/ipv4/ipcomp \
,70))
$(eval $(call KMOD_template,INET_XFRM_MODE_TRANSPORT,net-ipsec-transport,\
@@ -603,6 +603,7 @@ $(eval $(call KMOD_template,MD_RAID1,md-raid1,\
,35))
$(eval $(call KMOD_template,MD_RAID456,md-raid456,\
+ $(MODULES_DIR)/kernel/crypto/xor \
$(MODULES_DIR)/kernel/crypto/async_tx/async_tx \
$(MODULES_DIR)/kernel/crypto/async_tx/async_xor \
$(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \
@@ -640,8 +641,8 @@ $(eval $(call KMOD_template,CRYPTO_DEV_GEODE,crypto-hw-geode,\
,10))
$(eval $(call KMOD_template,CRYPTO_ALGAPI,crypto-algapi,\
- $(MODULES_DIR)/kernel/crypto/pcompress \
$(MODULES_DIR)/kernel/crypto/crypto_algapi \
+ $(MODULES_DIR)/kernel/crypto/pcompress \
,02))
$(eval $(call KMOD_template,CRYPTO_AEAD,crypto-aead,\
@@ -780,6 +781,7 @@ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
,10))
$(eval $(call KMOD_template,CRYPTO_LZO,crypto-lzo,\
+ $(MODULES_DIR)/kernel/lib/lzo/lzo_compress \
$(MODULES_DIR)/kernel/lib/lzo/lzo_decompress \
$(MODULES_DIR)/kernel/crypto/lzo \
,10))
@@ -1020,43 +1022,43 @@ $(eval $(call KMOD_template,USB_ACM,usb-acm,\
$(eval $(call KMOD_template,USB_HID,usb-hid,\
$(MODULES_DIR)/kernel/drivers/hid/usbhid/usbhid \
-,60))
+,70))
$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\
$(foreach mod,$(USB_PRINTER_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
-,60))
+,70))
$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\
$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial \
-,60))
+,70))
$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\
$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_FTDI_SIO,usb-serial-ftdi,\
$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\
$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232 \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\
$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303 \
-,61))
+,71))
$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\
$(MODULES_DIR)/kernel/drivers/usb/serial/visor \
-,61))
+,71))
$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
$(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage \
-,65))
+,75))
$(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\
$(MODULES_DIR)/kernel/drivers/net/usb/pegasus \
-,65))
+,75))
#
# Bluetooth