On Tuesday 01 April 2008, Frans Pop wrote: > Alternative could be to have just blkcipher (~ 8kB) in > crypto-core-modules and then have just add arc4 and ecb to > nic-wireless-modules as these don't seem to be needed for other things.
After some more thinking I've decided on this solution. See attached patch. > However this would not work in the long run if there are other wireless > drivers/implementations that require other crypto modules that are also > used for encrypted file systems. Such modules could legitimately be added to crypto-core, so no real problem. If that does happen, all arches should start using crypto-core-modules. For now I think it's best to just let crypto-modules pull in blkcipher on arches that don't have nic-wireless. I'll wait until tomorrow for comments, but will then upload and start a massbuild so that ath5k is added and all already uploaded arches are updated against latest kernel and l-m-e. Cheers, FJP
commit a9d10471990acb467ec28c0f4c109128c0f4419e
Author: Frans Pop <[EMAIL PROTECTED]>
Date: Tue Apr 1 15:41:49 2008 +0200
Add ath5k wireless module and restructure crypto modules for that
WEP support requires the ecb and arc4 modules. As these are only
used for wireless, they can be added in nic-wireless-modules.
Since ecb depends on blkcipher that module now needs to be split
out from crypto-modules into a new udeb crypto-core-modules on which
both nic-wireless and crypto depend. At the moment only architectures
that have nic-wireless need this new udeb.
diff --git a/packages/kernel/kernel-wedge/debian/changelog b/packages/kernel/kernel-wedge/debian/changelog
index 7e1c4c8..d30897e 100644
--- a/packages/kernel/kernel-wedge/debian/changelog
+++ b/packages/kernel/kernel-wedge/debian/changelog
@@ -1,3 +1,14 @@
+kernel-wedge (2.43) UNRELEASED; urgency=low
+
+ * Add new Atheros wireless module (ath5k) to nic-wireless-modules.
+ * Move ecb from crypto-modules to nic-wireless-modules (and fix typo: ebc
+ should be ecb), and add arc4 to nic-wireless-modules. These crypto modules
+ are only relevant for WEP.
+ * Split blkcipher out into separate crypto-core-modules as it is needed for
+ both wireless and other crypto usage.
+
+ -- Frans Pop <[EMAIL PROTECTED]> Tue, 01 Apr 2008 15:55:43 +0200
+
kernel-wedge (2.42) unstable; urgency=low
[ Otavio Salvador ]
diff --git a/packages/kernel/kernel-wedge/modules/crypto-core-modules b/packages/kernel/kernel-wedge/modules/crypto-core-modules
new file mode 100644
index 0000000..b83fed1
--- /dev/null
+++ b/packages/kernel/kernel-wedge/modules/crypto-core-modules
@@ -0,0 +1 @@
+blkcipher
diff --git a/packages/kernel/kernel-wedge/modules/crypto-modules b/packages/kernel/kernel-wedge/modules/crypto-modules
index 0168ba3..1c1b122 100644
--- a/packages/kernel/kernel-wedge/modules/crypto-modules
+++ b/packages/kernel/kernel-wedge/modules/crypto-modules
@@ -6,4 +6,3 @@ serpent
sha256 ?
sha256_generic ?
cbc ?
-ebc ?
diff --git a/packages/kernel/kernel-wedge/modules/nic-wireless-modules b/packages/kernel/kernel-wedge/modules/nic-wireless-modules
index 3ffd426..d3035b4 100644
--- a/packages/kernel/kernel-wedge/modules/nic-wireless-modules
+++ b/packages/kernel/kernel-wedge/modules/nic-wireless-modules
@@ -14,3 +14,8 @@ p54pci
p54usb
wavelan ?
usb8xxx ?
+ath5k ?
+
+# Crypto modules needed for ieee80211 WEP support
+ecb ?
+arc4 ?
diff --git a/packages/kernel/kernel-wedge/package-list b/packages/kernel/kernel-wedge/package-list
index ea0956b..8509edb 100644
--- a/packages/kernel/kernel-wedge/package-list
+++ b/packages/kernel/kernel-wedge/package-list
@@ -22,10 +22,11 @@ Description: Rare NIC drivers
This package contains rare NIC drivers for the Linux kernel.
Package: nic-wireless-modules
-Depends: kernel-image, nic-shared-modules, core-modules, usb-modules
+Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, crypto-core-modules
Priority: standard
Description: Wireless NIC drivers
This package contains wireless NIC drivers for the Linux kernel.
+ Includes crypto modules only needed for wireless (WEP).
Package: nic-shared-modules
Depends: kernel-image
@@ -339,9 +340,16 @@ Priority: extra
Description: CRC modules
This package contains CRC support modules.
-Package: crypto-modules
+Package: crypto-core-modules
Depends: kernel-image
Priority: extra
+Description: Core crypto modules
+ This package contains crypto modules needed for both encrypted file systems
+ and wireless networking (WEP).
+
+Package: crypto-modules
+Depends: kernel-image, crypto-core-modules
+Priority: extra
Description: crypto modules
This package contains crypto modules.
diff --git a/packages/kernel/linux-kernel-di-alpha-2.6/debian/changelog b/packages/kernel/linux-kernel-di-alpha-2.6/debian/changelog
index ac12628..9ef90c0 100644
--- a/packages/kernel/linux-kernel-di-alpha-2.6/debian/changelog
+++ b/packages/kernel/linux-kernel-di-alpha-2.6/debian/changelog
@@ -7,7 +7,10 @@ linux-kernel-di-alpha-2.6 (0.24) UNRELEASED; urgency=low
* Include zlib-modules udeb.
* Drop cdrom-modules udeb since its content isn't built anymore.
- -- Otavio Salvador <[EMAIL PROTECTED]> Fri, 21 Mar 2008 16:17:29 -0300
+ [ Frans Pop ]
+ * Add new crypto-core-modules udeb.
+
+ -- Frans Pop <[EMAIL PROTECTED]> Tue, 01 Apr 2008 16:17:59 +0200
linux-kernel-di-alpha-2.6 (0.23) unstable; urgency=low
diff --git a/packages/kernel/linux-kernel-di-alpha-2.6/debian/control.stub b/packages/kernel/linux-kernel-di-alpha-2.6/debian/control.stub
index a8e6cc0..5522840 100644
--- a/packages/kernel/linux-kernel-di-alpha-2.6/debian/control.stub
+++ b/packages/kernel/linux-kernel-di-alpha-2.6/debian/control.stub
@@ -3,5 +3,5 @@ Section: debian-installer
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <[EMAIL PROTECTED]>, Steve Langasek <[EMAIL PROTECTED]>
-Build-Depends: kernel-wedge (>= 2.39)
+Build-Depends: kernel-wedge (>= 2.43)
Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/kernel/linux-kernel-di-alpha-2.6
diff --git a/packages/kernel/linux-kernel-di-alpha-2.6/modules/alpha/crypto-core-modules b/packages/kernel/linux-kernel-di-alpha-2.6/modules/alpha/crypto-core-modules
new file mode 100644
index 0000000..eb5b4df
--- /dev/null
+++ b/packages/kernel/linux-kernel-di-alpha-2.6/modules/alpha/crypto-core-modules
@@ -0,0 +1 @@
+#include <crypto-core-modules>
diff --git a/packages/kernel/linux-kernel-di-amd64-2.6/debian/changelog b/packages/kernel/linux-kernel-di-amd64-2.6/debian/changelog
index b92f88f..984051b 100644
--- a/packages/kernel/linux-kernel-di-amd64-2.6/debian/changelog
+++ b/packages/kernel/linux-kernel-di-amd64-2.6/debian/changelog
@@ -1,3 +1,9 @@
+linux-kernel-di-amd64-2.6 (1.37) UNRELEASED; urgency=low
+
+ * Add new crypto-core-modules udeb.
+
+ -- Frans Pop <[EMAIL PROTECTED]> Tue, 01 Apr 2008 16:14:41 +0200
+
linux-kernel-di-amd64-2.6 (1.36) unstable; urgency=low
* Include zlib-modules udeb.
diff --git a/packages/kernel/linux-kernel-di-amd64-2.6/debian/control.stub b/packages/kernel/linux-kernel-di-amd64-2.6/debian/control.stub
index 69fe9ca..0bf5c25 100644
--- a/packages/kernel/linux-kernel-di-amd64-2.6/debian/control.stub
+++ b/packages/kernel/linux-kernel-di-amd64-2.6/debian/control.stub
@@ -3,5 +3,5 @@ Section: debian-installer
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <[EMAIL PROTECTED]>, Frederik Schüler <[EMAIL PROTECTED]>
-Build-Depends: kernel-wedge (>= 2.37)
+Build-Depends: kernel-wedge (>= 2.43)
Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/kernel/linux-kernel-di-amd64-2.6
diff --git a/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/crypto-core-modules b/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/crypto-core-modules
new file mode 100644
index 0000000..eb5b4df
--- /dev/null
+++ b/packages/kernel/linux-kernel-di-amd64-2.6/modules/amd64/crypto-core-modules
@@ -0,0 +1 @@
+#include <crypto-core-modules>
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog b/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
index 22f6071..0d98fbc 100644
--- a/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
+++ b/packages/kernel/linux-kernel-di-i386-2.6/debian/changelog
@@ -1,3 +1,10 @@
+linux-kernel-di-i386-2.6 (1.59) UNRELEASED; urgency=low
+
+ [ Frans Pop ]
+ * Add new crypto-core-modules udeb.
+
+ -- Frans Pop <[EMAIL PROTECTED]> Tue, 01 Apr 2008 16:16:19 +0200
+
linux-kernel-di-i386-2.6 (1.58) unstable; urgency=low
* Include zlib-modules udeb.
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/debian/control.stub b/packages/kernel/linux-kernel-di-i386-2.6/debian/control.stub
index df75468..f5bc5dc 100644
--- a/packages/kernel/linux-kernel-di-i386-2.6/debian/control.stub
+++ b/packages/kernel/linux-kernel-di-i386-2.6/debian/control.stub
@@ -3,5 +3,5 @@ Section: debian-installer
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Joey Hess <[EMAIL PROTECTED]>, Frans Pop <[EMAIL PROTECTED]>
-Build-Depends: kernel-wedge (>= 2.39)
+Build-Depends: kernel-wedge (>= 2.43)
Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/kernel/linux-kernel-di-i386-2.6
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/crypto-core-modules b/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/crypto-core-modules
new file mode 100644
index 0000000..eb5b4df
--- /dev/null
+++ b/packages/kernel/linux-kernel-di-i386-2.6/modules/i386/crypto-core-modules
@@ -0,0 +1 @@
+#include <crypto-core-modules>
signature.asc
Description: This is a digitally signed message part.
