On Mon, Aug 25, 2008 at 04:43:48PM +0200, Maximilian Attems wrote:
On Mon, Aug 25, 2008 at 12:26 PM, Jonas Smedegaard <dr@jones.dk> wrote:
NB! Even if yaird really is "generally too buggy" as judged in bug#457177, the current release in unstable is far better than the version currently in Etch, (contains no known regressions, and actually works out-of-the-box in many cases with recent Linux kernels whereas etch release don't).this diff seems a bit huge for a stable update.
I assume you mean a diff between 0.0.12-18 currently in Etch and 0.0.13-4 currently in Sid.
Agreed, this is too big.Attached is a proposed patch with only patches directly related to support for the newer Linux kernels.
also considering that lenny is about to be released.
This bugreport concerns Etch. Please keep your abandon-the-past approach to the kernel-team - it does not apply here!
as yaird is considered to be working with default etch kernel, that bug doesn't need any further action.
Yaird is (possibly contrary to other ramdisk-generators) not only for "default" kernel, but generally for Linux kernels.
If our ultimate goal for yaird was to deprecate it, then yes, this bug should better bit-rot, to help move all its users to use an alternative ramdisk-generator. But that is not our goal.
- Jonas -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private
diff -u yaird-0.0.12/debian/patches/series yaird-0.0.12/debian/patches/series
--- yaird-0.0.12/debian/patches/series
+++ yaird-0.0.12/debian/patches/series
@@ -12,0 +13,5 @@
+1018_ignore_uniq_hint_in_input_devices.patch
+1021_new-style_firewire.patch
+1022_fix_run_init_dashed-options.patch
+1024_thermal_modules.patch
+1025_resolve_eventX_device_links.patch
diff -u yaird-0.0.12/debian/changelog yaird-0.0.12/debian/changelog
--- yaird-0.0.12/debian/changelog
+++ yaird-0.0.12/debian/changelog
@@ -1,3 +1,22 @@
+yaird (0.0.12-18etch1) stable-proposed-updates; urgency=low
+
+ * Add patch 1018 to ignore "uniq" hint in input devices, added in
+ Linux 2.6.22. Closes: bug#426728, #431534, #434597, #435227,
+ #435268, #435560, thanks to Bin Zhang and lots of others.
+ * Add patch 1021 to support new-style IEEE1394 (Firewire) driver.
+ * Add patch 1022 to fix passing dashed options to run_init. Closes:
+ bug#416927, thanks to Michael Biebl and Roderick Schupp.
+ This may have been the cause of various other problems passing
+ dashed boot options to userspace tools.
+ * Add patch 1024 to load all available thermal modules. Closes:
+ Bug#457459, thanks to maximilian attems.
+ * Add patch 1025 to fix resolving sysfs eventX symlinks for devices
+ introduced in 2.6.23. Closes: bug#443821, thanks to Jan Echternach
+ and others helping to resolve this issue.
+ * Disable local cdbs snippet copyright-check.mk (broken).
+
+ -- Jonas Smedegaard <dr@jones.dk> Mon, 25 Aug 2008 20:57:39 +0200
+
yaird (0.0.12-18) unstable; urgency=low
* Extend patch 1008 to rely only on UUID (not device name) with mdadm
diff -u yaird-0.0.12/debian/rules yaird-0.0.12/debian/rules
--- yaird-0.0.12/debian/rules
+++ yaird-0.0.12/debian/rules
@@ -10,7 +10,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/1/rules/buildinfo.mk
-include debian/cdbs/1/rules/copyright-check.mk
+#include debian/cdbs/1/rules/copyright-check.mk
# Yaird is right in respecting $PATH, but for
# packaging we need to force using packaged perl
only in patch2:
unchanged:
--- yaird-0.0.12.orig/debian/patches/1018_ignore_uniq_hint_in_input_devices.patch
+++ yaird-0.0.12/debian/patches/1018_ignore_uniq_hint_in_input_devices.patch
@@ -0,0 +1,14 @@
+diff -ruN yaird-0.0.12.orig/perl/InputTab.pm yaird-0.0.12/perl/InputTab.pm
+--- yaird-0.0.12.orig/perl/InputTab.pm 2007-08-04 18:00:28.000000000 +0200
++++ yaird-0.0.12/perl/InputTab.pm 2007-08-04 17:58:42.000000000 +0200
+@@ -70,6 +70,10 @@
+ # Do not keep track of this.
+ # $work->{sysfs} = $1;
+ }
++ elsif ($line =~ /^U: Uniq=(.*)$/) {
++ # Do not keep track of this.
++ # $work->{unique} = $1;
++ }
+ elsif ($line =~ /^B: ([A-Z]+)=(.*)$/) {
+ $work->{capabilities}{$1} = $2;
+ }
only in patch2:
unchanged:
--- yaird-0.0.12.orig/debian/patches/1024_thermal_modules.patch
+++ yaird-0.0.12/debian/patches/1024_thermal_modules.patch
@@ -0,0 +1,28 @@
+diff -ruN yaird-0.0.12.orig/templates/Default.cfg.in yaird-0.0.12/templates/Default.cfg.in
+--- yaird-0.0.12.orig/templates/Default.cfg.in 2008-01-15 03:08:35.000000000 +0100
++++ yaird-0.0.12/templates/Default.cfg.in 2008-01-15 05:06:40.000000000 +0100
+@@ -55,6 +55,24 @@
+ # as soon as possible, so that you can see error messages.
+ OPTIONAL MODULE fbcon
+
++ # Load any and all available thermal modules, to avoid
++ # risk of meltdown with broken BIOS default settings.
++ OPTIONAL MODULE fan
++ OPTIONAL MODULE thermal
++ OPTIONAL MODULE therm_pm72
++ OPTIONAL MODULE windfarm_core
++ OPTIONAL MODULE windfarm_cpufreq_clamp
++ OPTIONAL MODULE windfarm_lm75_sensor
++ OPTIONAL MODULE windfarm_max6690_sensor
++ OPTIONAL MODULE windfarm_pid
++ OPTIONAL MODULE windfarm_pm112
++ OPTIONAL MODULE windfarm_pm81
++ OPTIONAL MODULE windfarm_pm91
++ OPTIONAL MODULE windfarm_smu_controls
++ OPTIONAL MODULE windfarm_smu_sat
++ OPTIONAL MODULE windfarm_smu_sensors
++ OPTIONAL MODULE i2c-powermac
++
+ #
+ # INPUT -- Insert all modules needed for keyboard
+ # devices found on the machine where the image is generated.
only in patch2:
unchanged:
--- yaird-0.0.12.orig/debian/patches/1021_new-style_firewire.patch
+++ yaird-0.0.12/debian/patches/1021_new-style_firewire.patch
@@ -0,0 +1,17 @@
+diff -ruNp yaird-0.0.12.orig/perl/Hardware.pm yaird-0.0.12/perl/Hardware.pm
+--- yaird-0.0.12.orig/perl/Hardware.pm 2007-10-20 12:14:47.000000000 +0200
++++ yaird-0.0.12/perl/Hardware.pm 2007-10-20 12:13:40.000000000 +0200
+@@ -181,6 +181,13 @@ sub moduleList ($) {
+ elsif ($abspath =~ m!/fw-host\d+/[[:xdigit:]]+/[[:xdigit:]]+-\d+$!) {
+ # IEEE1394 device(?); harmless(?)
+ }
++ elsif ($abspath =~ m!/fw\d+$!) {
++ # New-style (Linux 2.6.22+) IEEE1394 controller
++ $modules = [ "firewire_sbp2" ];
++ }
++ elsif ($abspath =~ m!/fw\d+/fw\+\.\d+$!) {
++ # New-style (Linux 2.6.22+) IEEE1394 bus(?); harmless(?)
++ }
+
+ elsif ($abspath =~ m!/mmc\d+:[[:xdigit:]]+$!) {
+ # MMC block device
only in patch2:
unchanged:
--- yaird-0.0.12.orig/debian/patches/1022_fix_run_init_dashed-options.patch
+++ yaird-0.0.12/debian/patches/1022_fix_run_init_dashed-options.patch
@@ -0,0 +1,24 @@
+diff -ruNp yaird-0.0.12.orig/templates/Debian.cfg yaird-0.0.12/templates/Debian.cfg
+--- yaird-0.0.12.orig/templates/Debian.cfg 2007-10-22 12:59:23.000000000 +0200
++++ yaird-0.0.12/templates/Debian.cfg 2007-10-22 12:58:42.000000000 +0200
+@@ -143,7 +143,7 @@ TEMPLATE SET
+ ! /bin/umount -n /sys
+ ! /bin/umount -n /proc
+ ! exec <TMPL_VAR NAME=auxDir>/run_init \
+- ! /mnt $init "$@"
++ ! /mnt $init -- "$@"
+ !}
+ !
+ !#
+diff -ruNp yaird-0.0.12.orig/templates/Fedora.cfg yaird-0.0.12/templates/Fedora.cfg
+--- yaird-0.0.12.orig/templates/Fedora.cfg 2005-12-08 23:42:33.000000000 +0100
++++ yaird-0.0.12/templates/Fedora.cfg 2007-10-22 12:59:44.000000000 +0200
+@@ -155,7 +155,7 @@ TEMPLATE SET
+ ! /bin/umount -n /sys
+ ! /bin/umount -n /proc
+ ! exec <TMPL_VAR NAME=auxDir>/run_init \
+- ! /mnt $init "$@"
++ ! /mnt $init -- "$@"
+ !}
+ !
+ !#
only in patch2:
unchanged:
--- yaird-0.0.12.orig/debian/patches/1025_resolve_eventX_device_links.patch
+++ yaird-0.0.12/debian/patches/1025_resolve_eventX_device_links.patch
@@ -0,0 +1,14 @@
+--- yaird-0.0.12.orig/perl/Input.pm.orig 2007-10-22 18:29:27.000000000 +0200
++++ yaird-0.0.12/perl/Input.pm 2007-12-11 15:39:52.000000000 +0100
+@@ -54,6 +54,11 @@
+ my $devLink = Conf::get('sysFs')
+ . "/class/input/$handler/device";
+ my $hw = readlink ($devLink);
++ if (defined ($hw) && $hw =~ s!^(\.\./)+(class/input/input\d+)$!$2!) {
++ # Linux 2.6.23 eventX -> inputX link
++ $devLink = Conf::get('sysFs') . '/' . $hw . '/device';
++ $hw = readlink ($devLink);
++ }
+ if (defined ($hw)) {
+ unless ($hw =~ s!^(\.\./)+devices/!!) {
+ # imagine localised linux (/sys/geraete ...)
Attachment:
signature.asc
Description: Digital signature