Bug#433322: patch for iscsitarget-source-0.4.16+svn162-2~bpo40+1 against 2.6.18-6-k7/
based on patch from Jeremy Laine,
added the missing compat-* patch, and fixed the patch against current
backport
--- iscsitarget/debian/rules2008-11-25 02:42:03.0 -0800
+++ iscsitarget/debian/rules2009-03-03 18:11:03.0 -0800
@@ -42,6 +42,11 @@
kdist_clean:
dh_clean
$(MAKE) -C $(KSRC) SUBDIRS=$(shell pwd)/kernel clean
+ # Revert patch for kernels < 2.6.23
+ if [ -f debian/stamp-patched ]; then \
+ patch -p1 -R < patches/compat-2.6.14-2.6.23.patch; \
+ rm -f debian/stamp-patched; \
+ fi
# prep-deb-files rewrites the debian/ files as needed. See RATIONALE for
# details
@@ -54,6 +59,11 @@
dh_testdir
dh_testroot
dh_clean -k
+ # Apply patch for kernels < 2.6.23
+ if [ ! -f debian/stamp-patched ] && dpkg --compare-versions $(KVERS) lt
2.6.23; then \
+ patch -p1 < patches/compat-2.6.14-2.6.23.patch; \
+ touch debian/stamp-patched; \
+ fi
#$(MAKE) -C $(KSRC) KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect
KERNEL=linux-$(KVERS) KDIR=$(KSRC) SUBDIRS=$(shell pwd)/kernel modules
$(MAKE) -C $(KSRC) SUBDIRS=$(shell pwd)/kernel modules
@@ -101,10 +111,12 @@
dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/debian
dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/include
dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/kernel
+ dh_installdirs -p$(psource) usr/src/modules/$(PACKAGE)/patches
# Copy only the driver source to the proper location
cp kernel/* debian/$(psource)/usr/src/modules/$(PACKAGE)/kernel/
cp include/* debian/$(psource)/usr/src/modules/$(PACKAGE)/include/
+ cp patches/* debian/$(psource)/usr/src/modules/$(PACKAGE)/patches/
# Copy the needed debian/ pieces to the proper location
cp debian/*-module-* \
diff -uN iscsitarget/patches/compat-2.6.14-2.6.23.patch
iscsitarget/patches/compat-2.6.14-2.6.23.patch
--- iscsitarget/patches/compat-2.6.14-2.6.23.patch 1969-12-31
16:00:00.0 -0800
+++ iscsitarget/patches/compat-2.6.14-2.6.23.patch 2009-03-03
18:11:03.0 -0800
@@ -0,0 +1,344 @@
+diff -uNr iscsitarget/kernel/block-io.c iscsitarget/kernel/block-io.c
+--- iscsitarget/kernel/block-io.c 2008-11-25 02:42:03.0 -0800
iscsitarget/kernel/block-io.c 2009-03-03 18:01:49.0 -0800
+@@ -29,10 +29,15 @@
+ struct completion tio_complete;
+ };
+
+-static void blockio_bio_endio(struct bio *bio, int error)
++static int
++blockio_bio_endio(struct bio *bio, unsigned int bytes_done, int error)
+ {
+ struct tio_work *tio_work = bio->bi_private;
+
++ /* Ignore partials */
++ if (bio->bi_size)
++ return 1;
++
+ error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? error : -EIO;
+
+ if (error)
+@@ -43,6 +48,8 @@
+ complete(&tio_work->tio_complete);
+
+ bio_put(bio);
++
++ return 0;
+ }
+
+ /*
+diff -uNr iscsitarget/kernel/config.c iscsitarget/kernel/config.c
+--- iscsitarget/kernel/config.c2008-11-25 02:42:03.0 -0800
iscsitarget/kernel/config.c2009-03-03 18:01:49.0 -0800
+@@ -40,7 +40,7 @@
+ int i;
+ struct proc_dir_entry *ent;
+
+- if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
++ if (!(proc_iet_dir = proc_mkdir("net/iet", 0)))
+ goto err;
+
+ proc_iet_dir->owner = THIS_MODULE;
+diff -uNr iscsitarget/kernel/digest.c iscsitarget/kernel/digest.c
+--- iscsitarget/kernel/digest.c2008-11-25 02:42:03.0 -0800
iscsitarget/kernel/digest.c2009-03-03 18:02:00.0 -0800
+@@ -12,8 +12,7 @@
+
+ void digest_alg_available(unsigned int *val)
+ {
+- if (*val & DIGEST_CRC32C &&
+- !crypto_has_alg("crc32c", 0, CRYPTO_ALG_ASYNC)) {
++ if (*val & DIGEST_CRC32C && !crypto_alg_available("crc32c", 0)) {
+ printk("CRC32C digest algorithm not available in kernel\n");
+ *val |= ~DIGEST_CRC32C;
+ }
+@@ -37,22 +36,15 @@
+ if (!(conn->ddigest_type & DIGEST_ALL))
+ conn->ddigest_type = DIGEST_NONE;
+
+- if (conn->hdigest_type & DIGEST_CRC32C ||
+- conn->ddigest_type & DIGEST_CRC32C) {
+- conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
+-CRYPTO_ALG_ASYNC);
+- conn->rx_hash.flags = 0;
+- if (IS_ERR(conn->rx_hash.tfm)) {
+- conn->rx_hash.tfm = NULL;
++ if (conn->hdigest_type & DIGEST_CRC32C || conn->ddigest_type &
DIGEST_CRC32C) {
++ conn->rx_digest_tfm = crypto_alloc_tfm("crc32c", 0);
++ if (!conn->rx_digest_tfm) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+- conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
+-
Bug#516393: debian-installer: inability to unmount /hd-media causes failure errors
Package: debian-installer Version: lenny Severity: normal I was doing an install off a usb stick, with the business card iso on the media. Every partitition with an ISO on it was mounted, but after finding that it was not the correct installer ISO (winxp.iso, for example), it would try to unmount and fail (busy) and spit me back to the main installer menu (what would you like to do next?). I could pick the same option (looking for the installer ISO) and it would continue where it left off (it had no trouble mounting a second or third partition on /hd-media) and eventually it made it to sdb (the usb stick) and continued. Annoying, and misleading to a newcomer, but has a workaround (scan repeatedly) Let me know what other information you need. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#516392: debian-installer: unbootable system after install
Package: debian-installer Version: lenny Severity: normal I have a Dell SC420 with a ICH6 on-board SATA controller (sda), and a PDC20268 2-port PATA with two drives on it (hde, hdg) I installed from the business card iso on a USB flash stick. I install GRUB to the root partition (sda2) because then Windows can't get at it. This was a fresh install, and I install to sda2 (hde, hdg are my data disks). After the install, the machine was unbootable. "Unable to load operating system". Booting back into the installer (soon wishing I had the 'rescue' image on the full CD), I was able to determine with dd that GRUB had NOT been installed on any drive or partition. dd if=/dev/sda2 bs=512 count=1 showed only zero'd out bytes (this was a newly partition/filesystem). I did the install a couple more times without any more success (I saw a grub-installer error, I think it was about a device map file missing, but in my haste to get the machine up, I didn't think to write it down exactly). Removing the PDC20268 card made the install and subsequent boot work fine. Please let me know what more information you need. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#516381: xserver-xorg: X autoprobing does not probe nvidia binary driver
Package: xserver-xorg Version: 1:7.3+18 Severity: normal I installed the nvidia driver before xorg, or I wouldn't have run into this as I usually install a couple of fallbacks. xserver-xorg Depends on xserver-xorg-video-all or xserver-xorg-video-2. The nvidia-glx drivers provide xserver-xorg-video-2, so when I installed xorg, no other xserver-xorg-video-* were installed. The X server does not probe for this driver, rendering this configuration broken. While I realize the nvidia binary server receives less support than the free drivers, it would be nice if this were better integrated in some way. Additionally, the user should be notified (by the nvidia pkg) that they will need to do this further configuration before they end up with a constantly flashing console. (suggest/recommend the nv driver too?) -- Package-specific info: Contents of /var/lib/x11/X.roster: xserver-xorg /var/lib/x11/X.md5sum does not exist. X server symlink status: lrwxrwxrwx 1 root root 13 2009-02-20 09:41 /etc/X11/X -> /usr/bin/Xorg -rwxr-xr-x 1 root root 1718484 2009-01-08 19:11 /usr/bin/Xorg Contents of /var/lib/x11/xorg.conf.roster: xserver-xorg VGA-compatible devices on PCI bus: 01:00.0 VGA compatible controller: nVidia Corporation GeForce 8400 GS (rev a1) /etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum. Xorg X server configuration file status: -rw-r--r-- 1 root root 1113 2009-02-20 17:15 /etc/X11/xorg.conf Contents of /etc/X11/xorg.conf: # xorg.conf (X.Org X Window System server configuration file) # # This file was generated by dexconf, the Debian X Configuration tool, using # values from the debconf database. # # Edit this file with caution, and see the xorg.conf manual page. # (Type "man xorg.conf" at the shell prompt.) # # This file is automatically updated on xserver-xorg package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xorg # package. # # If you have edited this file but would like it to be automatically updated # again, run the following command: # sudo dpkg-reconfigure -phigh xserver-xorg Section "InputDevice" Identifier "Generic Keyboard" Driver "kbd" Option "XkbRules" "xorg" Option "XkbModel" "pc104" Option "XkbLayout" "us" Option "XkbOptions""ctrl:nocaps" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" EndSection Section "Device" Identifier "Configured Video Device" EndSection Section "Monitor" Identifier "Configured Monitor" EndSection Section "Screen" Identifier "Default Screen" Monitor "Configured Monitor" EndSection Xorg X server log files on system: -rw-r--r-- 1 root root 14496 2009-02-20 17:23 /var/log/Xorg.0.log Contents of most recent Xorg X server log file /var/log/Xorg.0.log: X.Org X Server 1.4.2 Release Date: 11 June 2008 X Protocol Version 11, Revision 0 Build Operating System: Linux Debian (xorg-server 2:1.4.2-10) Current Operating System: Linux turok 2.6.26-1-686 #1 SMP Sat Jan 10 18:29:31 UTC 2009 i686 Build Date: 09 January 2009 02:57:16AM Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Module Loader present Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: "/var/log/Xorg.0.log", Time: Fri Feb 20 17:23:19 2009 (==) Using config file: "/etc/X11/xorg.conf" (==) No Layout section. Using the first Screen section. (**) |-->Screen "Default Screen" (0) (**) | |-->Monitor "Configured Monitor" (==) No device specified for screen "Default Screen". Using the first device section listed. (**) | |-->Device "Configured Video Device" (==) |-->Input Device "Configured Mouse" (==) |-->Input Device "Generic Keyboard" (==) The core pointer device wasn't specified explicitly in the layout. Using the first mouse device. (==) The core keyboard device wasn't specified explicitly in the layout. Using the first keyboard device. (==) Automatically adding devices (==) Automatically enabling devices (==) No FontPath specified. Using compiled-in default. (WW) The directory "/usr/share/fonts/X11/cyrillic" does not exist. Entry deleted from font path. (==) FontPath set to: /usr/share/fonts/X11/misc, /usr/share/fonts/X11/100dpi/:unscaled, /usr/share/fonts/X11/75dpi/:unscaled, /usr/share/fonts/X11/Type1, /usr/share/fonts/X11/100dpi, /usr/share/fonts/X11/75dpi, /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType (==) RgbPath set to "/etc/X11/rgb" (==) ModulePath set to "/usr/lib/xorg/modules" (II) Open ACPI successful (/var/run/acpid.socket) (II) Loader magic: 0x81e38c0 (II) Module ABI v
Bug#516379: update instructions in /usr/share/doc/nvidia-glx/README.Debian
Package: nvidia-glx Version: 173.14.09-5 Severity: normal The installation instructions are out of date for lenny, as both the glx Module isn't there to and the Driver line isn't there -- Package-specific info: uname -r: Linux turok 2.6.26-1-686 #1 SMP Sat Jan 10 18:29:31 UTC 2009 i686 GNU/Linux /proc/version: Linux version 2.6.26-1-686 (Debian 2.6.26-13) (wa...@debian.org) (gcc version 4.1.3 20080704 (prerelease) (Debian 4.1.2-24)) #1 SMP Sat Jan 10 18:29:31 UTC 2009 /proc/driver/nvidia/version: 01:00.0 VGA compatible controller: nVidia Corporation GeForce 8400 GS (rev a1) -- System Information: Debian Release: 5.0 APT prefers oldstable APT policy: (500, 'oldstable'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages nvidia-glx depends on: ii libc6 2.7-18GNU C Library: Shared libraries ii libgcc11:4.3.2-1.1 GCC support library ii libgl1-mesa-glx [libgl 7.0.3-7 A free implementation of the OpenG ii libx11-6 2:1.1.5-2 X11 client-side library ii libxext6 2:1.0.4-1 X11 miscellaneous extension librar ii nvidia-kernel-2.6.26-1 173.14.09+3 NVIDIA binary kernel module for Li ii x11-common 1:7.3+18 X Window System (X.Org) infrastruc ii zlib1g 1:1.2.3.3.dfsg-12 compression library - runtime nvidia-glx recommends no packages. Versions of packages nvidia-glx suggests: pn nvidia-kernel-source (no description available) ii nvidia-settings 173.14.09-1 Tool of configuring the NVIDIA gra -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
