Package: vaiostat-source
Severity: important
$KSRC/.. is used unconditionally. That's plain wrong, as it should be
possible to compile modules as a normal user against official kernel
headers below /usr/src/linux-headers-...
The attached patch should fix this - although not all targets tested,
only those affected by the following command:
KSRC=/usr/src/linux-headers-2.6.14-2-386 KPKG_DEST_DIR="\$(CURDIR)/.."
KDREV="0.99.jones1" fakeroot debian/rules kdist_configure kdist_image
- Jonas
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable')
Architecture: powerpc (ppc)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14-2-powerpc
Locale: LANG=da_DK, LC_CTYPE=da_DK (charmap=ISO-8859-1)
--- rules.orig 2005-01-11 21:10:58.000000000 +0100
+++ rules 2005-12-03 16:18:43.000000000 +0100
@@ -38,8 +38,20 @@
EPOCH=$(shell echo $(EPOCHT) | sed -e 's/://g')
VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
ARCH=$(shell dpkg --print-architecture)
-DEBDEST=..
-CHFILE=$(KSRC)/../vaiostat-$(KVERS)_$(VERSION)_$(ARCH).changes
+
+# Resolve a sane destdir (based on logic in alsa-source)
+ifeq "$(origin KPKG_DEST_DIR)" "undefined"
+ifeq "$(origin KMAINT)" "undefined"
+DEBDEST=$(CURDIR)/..
+else
+DEBDEST=$(KSRC)/..
+endif
+else
+DEBDEST=$(KPKG_DEST_DIR)
+endif
+
+
+CHFILE=$(DEBDEST)/vaiostat-$(KVERS)_$(VERSION)_$(ARCH).changes
DEB=debian/vaiostat-$(KVERS)
[EMAIL PROTECTED]@!$(KVERS)!g; \
@@ -79,10 +91,10 @@
kdist_image: kdist_clean
debian/rules build-stamp
- $(ROOT_CMD) debian/rules DEBDEST=$(KSRC)/.. binary-modules
+ $(ROOT_CMD) debian/rules DEBDEST=$(DEBDEST) binary-modules
kdist_changes: kdist_image
- dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(KSRC)/.." > $(CHFILE)
+ dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(DEBDEST)" > $(CHFILE)
debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE) || true
kdist: kdist_changes
