[RFC] kernel update to 2.6.26
[ added debian-kernel on Cc so they can comment on the doubts I have ]
Hello,
I've prepared the patches needed to get i386 and amd64 ready for
2.6.26. The diff is attached for review.
There are some doubts against 2.6.26 from my side, here goes:
- sata-sis droped
kernel team pointed #485609 to me however the bug talks about
sis5513 module not sata-sis
- dpt-i2o added (amd64)
system has been used i2o-block for it. I didn't include it since
I'm unsure if we should use it or not
- isofs droped (mips)
- pata modules droped (armel)
I've opt to use atl2-modules instead of nic-lme-modules as suggested
on the atl2 bug report to follow same schema we have been doing for
external modules. It looks more logical for me.
Otavio Salvador (10):
Add support to atl2 package building to massbuild script
Add atl2 modules. Closes: #490354.
Add atl2-modules (build-depends on kernel-wedge >= 2.49)
Add atl2-modules (build-depends on kernel-wedge >= 2.49)
Add 686-bigmem flavour
Add pata-sch to pata-modules.
Move sata-sis from pata-modules to sata-modules (uh?).
Add acenic, atl1e and sfc to nic-extra-modules.
Add spcp8x5 to usb-serial-modules.
Replace rtc with rtc-cmos on rtc-modules.
kernel-wedge/debian/changelog | 11 +++++++++++
kernel-wedge/modules/atl2-modules | 1 +
kernel-wedge/modules/nic-extra-modules | 3 +++
kernel-wedge/modules/pata-modules | 2 +-
kernel-wedge/modules/rtc-modules | 3 ++-
kernel-wedge/modules/sata-modules | 1 +
kernel-wedge/modules/usb-serial-modules | 1 +
kernel-wedge/package-list | 6 ++++++
linux-modules-di-amd64-2.6/debian/changelog | 6 ++++++
linux-modules-di-amd64-2.6/debian/control.stub | 2 +-
linux-modules-di-amd64-2.6/kernel-versions | 2 +-
linux-modules-di-amd64-2.6/modules/amd64/atl2-modules | 1 +
linux-modules-di-i386-2.6/debian/changelog | 7 +++++++
linux-modules-di-i386-2.6/debian/control.stub | 2 +-
linux-modules-di-i386-2.6/kernel-versions | 3 ++-
linux-modules-di-i386-2.6/modules/i386/atl2-modules | 1 +
massbuild | 4 ++++
17 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/packages/kernel/kernel-wedge/debian/changelog b/packages/kernel/kernel-wedge/debian/changelog
index 24e9969..bee0817 100644
--- a/packages/kernel/kernel-wedge/debian/changelog
+++ b/packages/kernel/kernel-wedge/debian/changelog
@@ -1,3 +1,14 @@
+kernel-wedge (2.49) UNRELEASED; urgency=low
+
+ * Add atl2 modules. Closes: #490354.
+ * Add pata-sch to pata-modules.
+ * Move sata-sis from pata-modules to sata-modules (uh?).
+ * Add acenic, atl1e and sfc to nic-extra-modules.
+ * Add spcp8x5 to usb-serial-modules.
+ * Replace rtc with rtc-cmos on rtc-modules.
+
+ -- Otavio Salvador <otavio@debian.org> Sat, 02 Aug 2008 10:35:10 -0300
+
kernel-wedge (2.48) unstable; urgency=low
* Add raid10 to md-modules.
diff --git a/packages/kernel/kernel-wedge/modules/atl2-modules b/packages/kernel/kernel-wedge/modules/atl2-modules
new file mode 100644
index 0000000..f7aaa50
--- /dev/null
+++ b/packages/kernel/kernel-wedge/modules/atl2-modules
@@ -0,0 +1 @@
+atl2
diff --git a/packages/kernel/kernel-wedge/modules/nic-extra-modules b/packages/kernel/kernel-wedge/modules/nic-extra-modules
index 53ea0a5..6b06512 100644
--- a/packages/kernel/kernel-wedge/modules/nic-extra-modules
+++ b/packages/kernel/kernel-wedge/modules/nic-extra-modules
@@ -1,5 +1,6 @@
# Note that this is an incomplete list that tries to be a common subset
# that is right for most kernels. Suppliment with any others.
+acenic
82596 ?
abyss ?
ac3200 ?
@@ -95,4 +96,6 @@ qla3xxx ?
arl1 ?
cxgb3 ?
atl1 ?
+atl1e ?
r6040
+sfc
diff --git a/packages/kernel/kernel-wedge/modules/pata-modules b/packages/kernel/kernel-wedge/modules/pata-modules
index a3571b9..6ff9173 100644
--- a/packages/kernel/kernel-wedge/modules/pata-modules
+++ b/packages/kernel/kernel-wedge/modules/pata-modules
@@ -32,7 +32,7 @@ pata_sc1200 ?
pata_serverworks ?
pata_sil680 ?
pata_sis ?
-sata_sis ?
+pata_sch ?
pata_sl82c105 ?
pata_triflex ?
pata_via ?
diff --git a/packages/kernel/kernel-wedge/modules/rtc-modules b/packages/kernel/kernel-wedge/modules/rtc-modules
index 4f24fc6..0a78e78 100644
--- a/packages/kernel/kernel-wedge/modules/rtc-modules
+++ b/packages/kernel/kernel-wedge/modules/rtc-modules
@@ -1 +1,2 @@
-rtc
+rtc ?
+rtc-cmos
diff --git a/packages/kernel/kernel-wedge/modules/sata-modules b/packages/kernel/kernel-wedge/modules/sata-modules
index b8808dc..c0ad780 100644
--- a/packages/kernel/kernel-wedge/modules/sata-modules
+++ b/packages/kernel/kernel-wedge/modules/sata-modules
@@ -3,6 +3,7 @@ ata_piix ?
sata_nv ?
sata_promise ?
sata_sil ?
+sata_sis ?
sata_sil24 ?
sata_svw ?
sata_sx4 ?
diff --git a/packages/kernel/kernel-wedge/modules/usb-serial-modules b/packages/kernel/kernel-wedge/modules/usb-serial-modules
index 725d06e..1f9d675 100644
--- a/packages/kernel/kernel-wedge/modules/usb-serial-modules
+++ b/packages/kernel/kernel-wedge/modules/usb-serial-modules
@@ -6,3 +6,4 @@ cp2101 ?
ftdi_sio ?
mct_u232 ?
pl2303 ?
+spcp8x5 ?
diff --git a/packages/kernel/kernel-wedge/package-list b/packages/kernel/kernel-wedge/package-list
index 4d303dd..8a86202 100644
--- a/packages/kernel/kernel-wedge/package-list
+++ b/packages/kernel/kernel-wedge/package-list
@@ -432,3 +432,9 @@ Depends: kernel-image
Priority: extra
Description: virtio modules
This packages contains virtio modules.
+
+Package: atl2-modules
+Depends: kernel-image!
+Priority: standard
+Description: atl2 NIC modules
+ This package contains atl2 NIC modules.
diff --git a/packages/kernel/linux-modules-di-amd64-2.6/debian/changelog b/packages/kernel/linux-modules-di-amd64-2.6/debian/changelog
index ea73c5e..5dfaffb 100644
--- a/packages/kernel/linux-modules-di-amd64-2.6/debian/changelog
+++ b/packages/kernel/linux-modules-di-amd64-2.6/debian/changelog
@@ -1,3 +1,9 @@
+linux-modules-di-amd64-2.6 (1.14) UNRELEASED; urgency=low
+
+ * Add atl2-modules (build-depends on kernel-wedge >= 2.49)
+
+ -- Otavio Salvador <otavio@debian.org> Sat, 02 Aug 2008 10:40:21 -0300
+
linux-modules-di-amd64-2.6 (1.13) unstable; urgency=low
[ Otavio Salvador ]
diff --git a/packages/kernel/linux-modules-di-amd64-2.6/debian/control.stub b/packages/kernel/linux-modules-di-amd64-2.6/debian/control.stub
index 37f33db..98ea255 100644
--- a/packages/kernel/linux-modules-di-amd64-2.6/debian/control.stub
+++ b/packages/kernel/linux-modules-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: Max Vozeler <xam@debian.org>, Frans Pop <fjp@debian.org>
-Build-Depends: kernel-wedge (>= 2.45)
+Build-Depends: kernel-wedge (>= 2.49)
Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/kernel/linux-modules-di-amd64-2.6
diff --git a/packages/kernel/linux-modules-di-amd64-2.6/kernel-versions b/packages/kernel/linux-modules-di-amd64-2.6/kernel-versions
index 18994f9..d610c37 100644
--- a/packages/kernel/linux-modules-di-amd64-2.6/kernel-versions
+++ b/packages/kernel/linux-modules-di-amd64-2.6/kernel-versions
@@ -1,2 +1,2 @@
# arch abi flavour installedname suffix build-depends
-amd64 2.6.25-2 amd64 2.6.25-2-amd64 - loop-aes-modules-2.6.25-2-amd64, squashfs-modules-2.6.25-2-amd64, speakup-modules-2.6.25-2-amd64
+amd64 2.6.25-2 amd64 2.6.25-2-amd64 - loop-aes-modules-2.6.25-2-amd64, squashfs-modules-2.6.25-2-amd64, speakup-modules-2.6.25-2-amd64, atl2-modules-2.6.25-2-amd64
diff --git a/packages/kernel/linux-modules-di-amd64-2.6/modules/amd64/atl2-modules b/packages/kernel/linux-modules-di-amd64-2.6/modules/amd64/atl2-modules
new file mode 100644
index 0000000..ac0a59e
--- /dev/null
+++ b/packages/kernel/linux-modules-di-amd64-2.6/modules/amd64/atl2-modules
@@ -0,0 +1 @@
+#include <atl2-modules>
diff --git a/packages/kernel/linux-modules-di-i386-2.6/debian/changelog b/packages/kernel/linux-modules-di-i386-2.6/debian/changelog
index 465060b..88eb291 100644
--- a/packages/kernel/linux-modules-di-i386-2.6/debian/changelog
+++ b/packages/kernel/linux-modules-di-i386-2.6/debian/changelog
@@ -1,3 +1,10 @@
+linux-modules-di-i386-2.6 (1.14) UNRELEASED; urgency=low
+
+ * Add atl2-modules (build-depends on kernel-wedge >= 2.49)
+ * Add 686-bigmem flavour
+
+ -- Otavio Salvador <otavio@debian.org> Sat, 02 Aug 2008 10:44:48 -0300
+
linux-modules-di-i386-2.6 (1.13) unstable; urgency=low
[ Otavio Salvador ]
diff --git a/packages/kernel/linux-modules-di-i386-2.6/debian/control.stub b/packages/kernel/linux-modules-di-i386-2.6/debian/control.stub
index 7ed9e23..cdd37e0 100644
--- a/packages/kernel/linux-modules-di-i386-2.6/debian/control.stub
+++ b/packages/kernel/linux-modules-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: Max Vozeler <xam@debian.org>, Frans Pop <fjp@debian.org>
-Build-Depends: kernel-wedge (>= 2.45)
+Build-Depends: kernel-wedge (>= 2.49)
Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/kernel/linux-modules-di-i386-2.6
diff --git a/packages/kernel/linux-modules-di-i386-2.6/kernel-versions b/packages/kernel/linux-modules-di-i386-2.6/kernel-versions
index 3dc8b34..50f12b7 100644
--- a/packages/kernel/linux-modules-di-i386-2.6/kernel-versions
+++ b/packages/kernel/linux-modules-di-i386-2.6/kernel-versions
@@ -1,2 +1,3 @@
# arch version flavour installedname suffix build-depends
-i386 2.6.25-2 486 2.6.25-2-486 - loop-aes-modules-2.6.25-2-486, squashfs-modules-2.6.25-2-486, speakup-modules-2.6.25-2-486
+i386 2.6.25-2 486 2.6.25-2-486 - loop-aes-modules-2.6.25-2-486, squashfs-modules-2.6.25-2-486, speakup-modules-2.6.25-2-486, atl2-modules-2.6.25-2-486
+i386 2.6.25-2 686-bigmem 2.6.25-2-686-bigmem - loop-aes-modules-2.6.25-2-686-bigmem, squashfs-modules-2.6.25-2-686-bigmem, speakup-modules-2.6.25-2-686-bigmem, atl2-modules-2.6.25-2-686-bigmem
diff --git a/packages/kernel/linux-modules-di-i386-2.6/modules/i386/atl2-modules b/packages/kernel/linux-modules-di-i386-2.6/modules/i386/atl2-modules
new file mode 100644
index 0000000..ac0a59e
--- /dev/null
+++ b/packages/kernel/linux-modules-di-i386-2.6/modules/i386/atl2-modules
@@ -0,0 +1 @@
+#include <atl2-modules>
diff --git a/packages/kernel/massbuild b/packages/kernel/massbuild
index bf20dae..79f0a6d 100755
--- a/packages/kernel/massbuild
+++ b/packages/kernel/massbuild
@@ -288,6 +288,10 @@ select_source() {
BDEP_BINARY_BASE=linux-2.6
;;
# Out of tree modules (Debian packages)
+ atl2-modules-2.6*)
+ BDEP_SOURCE=linux-modules-extra-2.6
+ BDEP_BINARY_BASE=atl2-modules-2.6
+ ;;
squashfs-modules-2.6*)
BDEP_SOURCE=linux-modules-extra-2.6
BDEP_BINARY_BASE=squashfs-modules-2.6
--
O T A V I O S A L V A D O R
---------------------------------------------
E-mail: otavio@debian.org UIN: 5906116
GNU/Linux User: 239058 GPG ID: 49A5F855
Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
you the whole house."
Reply to: