Author: luther
Date: 2005-10-23 14:28:55 +0000 (Sun, 23 Oct 2005)
New Revision: 4613
Modified:
dists/trunk/utils/kernel-package/debian/changelog
dists/trunk/utils/kernel-package/kernel/Control
dists/trunk/utils/kernel-package/kernel/image.postinst
Log:
Implemented new resolution plan, finalized Steve's proposal, removed the
conflicts, as we can now handle legacy packages.
Modified: dists/trunk/utils/kernel-package/debian/changelog
===================================================================
--- dists/trunk/utils/kernel-package/debian/changelog 2005-10-23 13:58:56 UTC (rev 4612)
+++ dists/trunk/utils/kernel-package/debian/changelog 2005-10-23 14:28:55 UTC (rev 4613)
@@ -1,3 +1,13 @@
+kernel-package (9.008.2) unstable; urgency=low
+
+ * Second take on the ramdisk generation tool resolution. Thanks go to Jonas
+ Smedegaar and Steve Langasek for proposing this solution, and all others
+ who discussed this.
+ * Removed again conflicts since we can now handle legacy ramdisk generation
+ tools.
+
+ -- Sven Luther <luther at debian.org> Sun, 23 Oct 2005 16:21:46 +0200
+
kernel-package (9.008.1) unstable; urgency=low
* NMU with maintainer's permission.
Modified: dists/trunk/utils/kernel-package/kernel/Control
===================================================================
--- dists/trunk/utils/kernel-package/kernel/Control 2005-10-23 13:58:56 UTC (rev 4612)
+++ dists/trunk/utils/kernel-package/kernel/Control 2005-10-23 14:28:55 UTC (rev 4613)
@@ -43,7 +43,6 @@
Section: base
Priority: optional
Provides: =ST-image, =ST-image-=CV
-Conflicts: initramfs-tools (<< 0.32), yaird (<< 0.0.11-5), initrd-tools (<< 0.1.83)
Depends: =I coreutils | fileutils (>= 4.0)
Suggests: =L fdutils, =ST-doc-=V=SA | =ST-source-=V
Description: Linux kernel binary image for version =V=SA.
Modified: dists/trunk/utils/kernel-package/kernel/image.postinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.postinst 2005-10-23 13:58:56 UTC (rev 4612)
+++ dists/trunk/utils/kernel-package/kernel/image.postinst 2005-10-23 14:28:55 UTC (rev 4613)
@@ -980,16 +980,16 @@
}
if (system ("$ramdisk --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1") != 0) {
if (($ramdisk eq "/usr/sbin/mkinitrd") &&
- (system ("dpkg --compare-versions $version lt 2.6.13") == 1)) {
+ (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.13") == 1)) {
die ("Failed, initrd-tools cannot create ramdisks for kernel version greater than 2.6.12\n");
}
if (($ramdisk eq "/usr/sbin/mkinitrd") &&
- (system ("dpkg --compare-versions $version lt 2.6.12") == 0)) {
- die ("Failed, initramfs-tools cannot create ramdisks for kernel version lesser than 2.6.12\n");
+ (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.12") == 0)) {
+ die ("Failed, initramfs-tools cannot create ramdisks for kernel version prior to 2.6.12\n");
}
if (($ramdisk eq "/usr/sbin/mkinitrd.yaird") &&
- (system ("dpkg --compare-versions $version lt 2.6.8") == 0) &&
- (system ("dpkg --compare-versions $hostversion lt 2.6.8") == 0)) {
+ (system ("dpkg", "--compare-versions", "$version", "lt", "2.6.8") == 0) &&
+ (system ("dpkg", "--compare-versions", "$hostversion", "lt", "2.6.8") == 0)) {
die ("Failed, yaird cannot create ramdisks for kernel version lesser than 2.6.8 or running on kernels older than 2.6.8\n");
}
}