[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock kqemu, second try



Hi,

the current kqemu package in testing suffers from having a broken
creation of the /dev/kqemu device. The -6 revision removes the device
creation completely, slightly updates README.Debian and documents the
steps to create the device manually in README.device.

Please unblock it, debdiff is attached.

-- 
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baumann@panthera-systems.net
Internet:       http://people.panthera-systems.net/~daniel-baumann/
diff -u kqemu-1.3.0~pre9/debian/README.Debian kqemu-1.3.0~pre9/debian/README.Debian
--- kqemu-1.3.0~pre9/debian/README.Debian
+++ kqemu-1.3.0~pre9/debian/README.Debian
@@ -4,13 +4,14 @@
 The Debian kqemu-source package can be used in several ways,
 
+ - Using module-assistant(1) commands provided by the module-assistant Debian
+   package:
+
+	# module-assistant prepare kqemu
+	# module-assistant auto-install kqemu
+
  - Using the make-kpkg(1) command provided by the kernel-package Debian
-   package. This will produce a corresponding kqemu-modules package for
-   the Debian kernel-image package that you are using. This is "the Debian
-   way". See the "modules_image" section of the make-kpkg(1) man page.
-
- - Changing to the /usr/src/modules/kqemu/ directory and building as
-   the README file instructs using "make; make install". This will build
-   and install a module specific to the system you are building on and is
-   not under control of the packaging system.
+   package. See the "modules_image" section of the make-kpkg(1) man page.
+
+ - Unpacking /usr/src/kqemu-*.tar.bz2 and installing the module on your own.
 
  -- Daniel Baumann <daniel@debian.org>  Fri, 17 Nov 2006 08:29:00 +0100
diff -u kqemu-1.3.0~pre9/debian/rules kqemu-1.3.0~pre9/debian/rules
--- kqemu-1.3.0~pre9/debian/rules
+++ kqemu-1.3.0~pre9/debian/rules
@@ -69,7 +69,7 @@
 	# Install the module
 	install -D -m 0644 kqemu.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/misc/kqemu.ko
 
-	dh_installdocs *.html
+	dh_installdocs debian/README.device *.html
 	dh_installchangelogs Changelog
 	dh_compress
 	dh_fixperms
@@ -107,7 +107,7 @@
 	cp debian/*modules.in* \
 		debian/$(psource)/usr/src/modules/$(sname)/debian
 	cp debian/control debian/rules debian/changelog debian/copyright \
-		debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian/
+		debian/compat debian/README.device debian/$(psource)/usr/src/modules/$(sname)/debian/
 	cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules
 
 	dh_install
diff -u kqemu-1.3.0~pre9/debian/control.modules.in kqemu-1.3.0~pre9/debian/control.modules.in
--- kqemu-1.3.0~pre9/debian/control.modules.in
+++ kqemu-1.3.0~pre9/debian/control.modules.in
@@ -7,7 +7,8 @@
 
 Package: kqemu-modules-_KVERS_
 Architecture: any
-Depends: linux-image-_KVERS_, qemu (>= 0.8.2)
+Depends: linux-image-_KVERS_
+Recommends: qemu (>= 0.8.1)
 Provides: kqemu-modules
 Description: kqemu modules for Linux (kernel _KVERS_).
  This package contains the set of loadable kernel modules for the
reverted:
--- kqemu-1.3.0~pre9/debian/kqemu-modules-_KVERS_.postinst.modules.in
+++ kqemu-1.3.0~pre9.orig/debian/kqemu-modules-_KVERS_.postinst.modules.in
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	configure)
-		echo -n "  * Creating kqemu device: "
-
-		# Remove existing device
-		if [ -e /dev/kqemu ]
-		then
-			rm -f /dev/kqemu
-		fi
-
-		# Create new device
-		mknod /dev/kqemu c 250 0
-		chmod 0660 /dev/kqemu
-
-		echo "done."
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
reverted:
--- kqemu-1.3.0~pre9/debian/kqemu-modules-_KVERS_.postrm.modules.in
+++ kqemu-1.3.0~pre9.orig/debian/kqemu-modules-_KVERS_.postrm.modules.in
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	remove)
-		echo -n "  * Removing kqemu device: "
-		
-		rm -f /dev/kqemu
-		
-		echo "done."
-		;;
-
-	purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-		;;
-
-	*)
-		echo "postrm called with unknown argument \`$1'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -u kqemu-1.3.0~pre9/debian/changelog kqemu-1.3.0~pre9/debian/changelog
--- kqemu-1.3.0~pre9/debian/changelog
+++ kqemu-1.3.0~pre9/debian/changelog
@@ -1,3 +1,24 @@
+kqemu (1.3.0~pre9-6) unstable; urgency=medium
+
+  * Remove device creation and hope the best for #400788.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed,  3 Jan 2007 23:26:00 +0100
+
+kqemu (1.3.0~pre9-5) unstable; urgency=medium
+
+  * Fixed typo in the maintainer scripts (Closes: #405178).
+
+ -- Daniel Baumann <daniel@debian.org>  Tue,  2 Jan 2007 16:16:00 +0100
+
+kqemu (1.3.0~pre9-4) unstable; urgency=medium
+
+  * Updated README.Debian:
+    - adding a note about module-assistant (Closes: #401278, #402403).
+  * The qemu maintainer do not care to answer at all on #400788, therefore I'm
+    including the udev rules here :/ (Closes: #400139).
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 31 Dec 2006 16:07:00 +0100
+
 kqemu (1.3.0~pre9-3) unstable; urgency=low
 
   * Added install.sh to kqemu-source (Closes: #401174).
only in patch2:
unchanged:
--- kqemu-1.3.0~pre9.orig/debian/README.device
+++ kqemu-1.3.0~pre9/debian/README.device
@@ -0,0 +1,23 @@
+kqemu device node
+-----------------
+
+Before you can make use of kqemu, you need to create the required device node
+in /etc:
+
+  * If you do not use udev:
+
+	# echo 'options kqemu major=0' > /etc/modprobe.d/kqemu
+
+  * If you do use udev:
+
+	# echo 'KERNEL=="kqemu", MODE="0660", GROUP="kqemu"' \
+		> /etc/udev/kqemu.rules
+	# ln -sf ../kqemu.rules /etc/udev/rules.d/099_kqemu.rules
+
+Then, just load the module with:
+
+	# modprobe kqemu
+
+and do not forget to call qemu with the -kernel-kqemu flag.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed,  3 Jan 2007 23:26:00 +0100

Reply to: