Your message dated Wed, 18 May 2005 08:02:23 -0400
with message-id <[EMAIL PROTECTED]>
and subject line Bug#241098: fixed in dh-make 0.39
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 30 Mar 2004 18:13:42 +0000
>From [EMAIL PROTECTED] Tue Mar 30 10:13:42 2004
Return-path: <[EMAIL PROTECTED]>
Received: from quechua.inka.de (mail.inka.de) [193.197.184.2] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1B8Nk5-0005xW-00; Tue, 30 Mar 2004 10:13:41 -0800
Received: from debian.zombie.inka.de (p508418a8.dip.t-dialin.net
[80.132.24.168])
by mail.inka.de with asmtp
id 1B8Nk3-0008D5-00; Tue, 30 Mar 2004 20:13:39 +0200
Received: from inet by debian.zombie.inka.de with local (Exim 4.30)
id 1B8MfS-0007UI-Ru; Tue, 30 Mar 2004 19:04:50 +0200
Date: Tue, 30 Mar 2004 19:04:40 +0200
From: Eduard Bloch <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: missing features in the kernel templates
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Dxnq1zWXvFF0Q93v"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
X-Reportbug-Version: 2.49
User-Agent: Mutt/1.5.5.1+cvs20040105i
Sender: <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,HAS_PACKAGE,
RCVD_IN_DSBL autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Package: dh-make
Version: 0.36
Severity: minor
Tags: patch
Hello,
The templates created by dh_make for the kernel-modules packages do not
follow recent conventions:
- KPKG_DEST_DIR is not used
- no compiler choice is done
- module source is not compressed
- kdist rule does the same thing as kdist_image, no changes files are
generated
- it does not install a postinst files that runs update-modules and
update-devfsd
Since all this packages inherit the static rules installed by dh_make
once and need modifications by maintainers on such changes, I suggest a
rewrite of the current templates and make them use my module-assistant
package. An example of a such package using m-a is sl-modem. More
details in the module-assistant documentation, eg. HOWTO-DEVEL. I
wrote an (untested) set of templates, in the patch attached to this
message.
Regards,
Eduard.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.5-rc3
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8
Versions of packages dh-make depends on:
ii debhelper 4.2.4 helper programs for debian/rules
ii dpkg-dev 1.10.18.1 Package building tools for Debian
ii make 3.80-6 The GNU version of the "make" util
ii perl 5.8.3-2 Larry Wall's Practical Extraction
-- no debconf information
--
"Das Schwein tr�gt seinen Namen nicht umsonst" - Stilbl�ten aus
Kinderaufs�tzen: (�ber den Menschen)
Der Mensch hat an seinem K�rper mehrere �ffnungen, aber nur mit einer
kann er reden.
--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="m-a-port.diff"
diff -Nurd dh-make-0.36/debian/changelog dh-make-0.37/debian/changelog
--- dh-make-0.36/debian/changelog 2004-01-14 23:26:41.000000000 +0100
+++ dh-make-0.37/debian/changelog 2004-03-30 16:40:03.000000000 +0200
@@ -1,3 +1,9 @@
+dh-make (0.37) unstable; urgency=low
+
+ * module-assistant migration
+
+ -- Eduard Bloch <[EMAIL PROTECTED]> Tue, 30 Mar 2004 16:39:53 +0200
+
dh-make (0.36) unstable; urgency=low
* Fixed CFLAGS problem Closes: #211287, #213118, #223448
diff -Nurd dh-make-0.36/lib/debiank/control dh-make-0.37/lib/debiank/control
--- dh-make-0.36/lib/debiank/control 2003-09-24 06:17:57.000000000 +0200
+++ dh-make-0.37/lib/debiank/control 2004-03-30 17:25:12.000000000 +0200
@@ -11,8 +11,8 @@
Package: #PACKAGE#-source
Architecture: all
-Depends: make
+Depends: module-assistant, debhelper (>>4.0.0), make, bzip2
Description: Source for the #PACKAGE# driver.
This package provides the source code for the #PACKAGE# kernel modules.
The #PACKAGE# package is also required in order to make use of these
- modules. Kernel source is required to compile these modules.
+ modules. Kernel source or headers are required to compile these modules.
diff -Nurd dh-make-0.36/lib/debiank/control.modules.in
dh-make-0.37/lib/debiank/control.modules.in
--- dh-make-0.36/lib/debiank/control.modules.in 2003-06-26 13:44:48.000000000
+0200
+++ dh-make-0.37/lib/debiank/control.modules.in 2004-03-30 17:23:53.000000000
+0200
@@ -5,16 +5,16 @@
Build-Depends: debhelper (>> 4.0.0)
Standards-Version: #POLICY#
-Package: #PACKAGE#-modules-${kpkg:Kernel-Version}
+Package: #PACKAGE#-modules-_KVERS_
Architecture: any
Provides: #PACKAGE#-modules
-Description: #PACKAGE# modules for Linux (kernel ${kpkg:Kernel-Version}).
+Description: #PACKAGE# modules for Linux (kernel _KVERS_).
This package contains the set of loadable kernel modules for the
<description>.
.
- This package contains the compiled kernel modules for ${kpkg:Kernel-Version}
+ This package contains the compiled kernel modules for _KVERS_
.
If you have compiled your own kernel, you will most likely need to build
- your own #PACKAGE#-modules. The #PACKAGE#-source package has been
- provided for use with the Debian kernel-package utility to produce a version
- of #PACKAGE#-module for your kernel.
+ your own #PACKAGE#-modules. The #PACKAGE#-source package has been
+ provided for use with the Debian's module-assistant or kernel-package
+ utilities to produce a version of #PACKAGE#-module for your kernel.
diff -Nurd
dh-make-0.36/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex
dh-make-0.37/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex
--- dh-make-0.36/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex
1970-01-01 01:00:00.000000000 +0100
+++ dh-make-0.37/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex
2004-03-30 19:00:20.000000000 +0200
@@ -0,0 +1,51 @@
+#! /bin/sh
+# postinst script for modules package built from #PACKAGE#
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+ update-devfsd 2>/dev/null || true
+ update-modules 2>/dev/null || true
+ modprobe foo 2>/dev/null || modprobe bar 2>/dev/null || true
+ # start or restart after install or upgrade
+ if test -x /usr/sbin/daemon ; then
+ if ! -e /var/run/daemon.pid ; then
+ /etc/init.d/daemon start || true
+ else
+ if test -n "$2" ; then
+ /etc/init.d/daemon restart || true
+ fi
+ fi
+ fi
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff -Nurd dh-make-0.36/lib/debiank/rules dh-make-0.37/lib/debiank/rules
--- dh-make-0.36/lib/debiank/rules 2003-09-19 01:06:01.000000000 +0200
+++ dh-make-0.37/lib/debiank/rules 2004-03-30 17:29:16.000000000 +0200
@@ -26,115 +26,46 @@
INSTALL_PROGRAM += -s
endif
+# some default definitions, important!
+#
+# Name of the source package
+psource:=#PACKAGE#-source
+
+# The short upstream name, used for the module source directory
+sname:=#PACKAGE#
+
### KERNEL SETUP
### Setup the stuff needed for making kernel module packages
### taken from /usr/share/kernel-package/sample.module.rules
-# Name of package
-package = #PACKAGE#
-# KSRC is the location of the kernel source. This is the default value,
-# when make-kpkg is used it will supply to real value
-KSRC = /usr/src/linux
-# KDREV is the package-revision, as given to make-kpkg by the user.
-# Just put a simply default value in here which we use when we test
-# the packagebuilding without make-kpkg
-ifeq ($(strip $(KDREV)),)
-KDREV = "test1.0"
-endif
-
-## Now to determine the kernel version, normally supplied by make-kpkg
-ifeq ($(strip $(KVERS)),)
-# Now we need to get the kernel-version somehow (we are not running
-# under make-kpkg?)
-ifeq ($(strip $(KSRC)),)
-$(error Error. I do not know how to determine the kernel version)
-else
-kversion :=$(shell egrep '^VERSION +=' $(KSRC)/Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-kplevel :=$(shell egrep '^PATCHLEVEL +=' $(KSRC)/Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-ksublevel:=$(shell egrep '^SUBLEVEL +=' $(KSRC)/Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-EXTRA_VERSION:=$(shell egrep '^EXTRAVERSION +=' $(KSRC)/Makefile 2>/dev/null |
\
- sed -e 's/EXTRAVERSION[\t ]*=[\t ]*\(.*\)/\1/')
-kextra:=$(strip $(EXTRA_VERSION))
-HAVE_NEW_MODLIB:=$(shell egrep '\(INSTALL_MOD_PATH\)' \
- $(KSRC)/Makefile 2>/dev/null )
-
-# If you want to have more than one kernel configuration per kernel
-# version, set FLAVOUR in the top level kernel Makefile *before*
-# invoking make-kpkg -- it will be appended to UTS_RELEASE in
-# version.h (separated by a hyphen). This affects everything -- the
-# names and versions of the image, source, headers, and doc packages,
-# and where the modules are searched for in /lib/modules.
-
-ifdef FLAVOUR
-# uhm - should check if we really have a Makefile capable of Flavours?
-endif
-
-FLAVOUR:=$(shell grep ^FLAVOUR $(KSRC)/Makefile 2>/dev/null | \
- perl -ple 's/FLAVOUR[\s:=]+//g')
-
-ifneq ($(strip $(FLAVOUR)),)
-INT_FLAV := -$(FLAVOUR)
-FLAV_ARG := FLAVOUR=$(FLAVOUR)
-else
-INT_FLAV :=
-FLAV_ARG :=
-endif
-
-## This is the replacement for FLAVOUR
-ifneq ($(strip $(APPEND_TO_VERSION)),)
-iatv := $(strip $(APPEND_TO_VERSION))
-EXTRAV_ARG := EXTRAVERSION=${EXTRA_VERSION}${iatv}
-else
-iatv :=
-EXTRAV_ARG :=
-endif
-
-KVERS = $(kversion).$(kplevel).$(ksublevel)$(kextra)$(iatv)$(INT_FLAV)
-
-endif
-endif
-
-non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
-epoch=$(shell echo $(KVERS) | perl -ne 'm/^(\d+:)/ && print $$1')
-
-# We also need the package version
-pversion = $(shell sed -ne '1s/.*\((.*)\).*/\1/' debian/changelog)
-pversion = $(shell sed -ne '1s/.*(\(.*\)).*/\1/p' debian/changelog)
-
-# MODDIR is the place where the final .deb package should be made. This is the
-# default value, when make-kpkg is used it will supply to real value
-MODDIR = ..
-
-pmodules = $(package)-modules-$(non_epoch_version)
-psource = $(package)-source
-
-# Prepares the package for distribution. Intended for the kernel
-# maintainer.
-kdist: kdist_clean kdist_config kdist_image
+# prefix of the target package name
+PACKAGE=#PACKAGE#-modules
+# modifieable for experiments or debugging m-a
+MA_DIR ?= /usr/share/modass
+# load generic variable handling
+-include $(MA_DIR)/include/generic.make
+# load default rules, including kdist, kdist_image, ...
+-include $(MA_DIR)/include/common-rules.make
-# The kdist_configure target is called by make-kpkg modules_config. It
-# should configure the module so it is ready for compilation (mostly
-# useful for calling configure)
-kdist_config:
- @echo Nothing to configure
+# module assistant calculates all needed things for us and sets
+# following variables:
+# KSRC (kernel source directory), KVERS (kernel version string), KDREV
+# (revision of the Debian kernel-image package), CC (the correct
+# compiler), VERSION (the final package version string), PKGNAME (full
+# package name with KVERS included), DEB_DESTDIR (path to store DEBs)
-# the kdist_image target is called by make-kpkg modules_image. It is
-# responsible for compiling the module and creating the package. It
-# should also clean up after making the module. Please note we use a
-# seperate binary-modules target to make testing the package building
-# easier
-kdist_image:
- $(MAKE) $(MFLAGS) -f debian/rules binary-modules
- $(MAKE) $(MFLAGS) -f debian/rules clean
+# The kdist_configure target is called by make-kpkg modules_config and
+# by kdist* rules by dependency. It should configure the module so it is
+# ready for compilation (mostly useful for calling configure).
+# prep-deb-files from module-assistant creates the neccessary debian/ files
+kdist_config: prep-deb-files
-# the kdist_clean target is called by make-kpkg modules_clean. It is
-# responsible for cleaning up any changes that have been made by the
-# other kdist_commands (except for the .deb files created).
-kdist_clean:
+# the kdist_clean target is called by make-kpkg modules_clean and from
+# kdist* rules. It is responsible for cleaning up any changes that have
+# been made by the other kdist_commands (except for the .deb files created)
+kdist_clean: clean
$(MAKE) $(MFLAGS) -f debian/rules clean
+# rm -f driver/*.o driver/*.ko
### end KERNEL SETUP
@@ -149,46 +80,31 @@
touch build-arch-stamp
-# the binary-modules target prepares the $(pmodules) package.
-# It is called by make-kpkg and *not* during a normal build
-binary-modules:
- export DH_OPTIONS='-p$(pmodules)'
-
- # Is this needed for setting up a Depends?
- #echo "kpkg:Package-Version=$(epoch)$(pversion)+$(non_epoch_version)" \
- # >> debian/$(package).substvars
- echo "kpkg:Kernel-Version=$(non_epoch_version)" > \
- debian/$(pmodules).substvars
-
- # The substvars mechanism seems slightly broken, hack to get around it
- # stolen from the qce-ga package. Yaaaa!
- sed -e 's/$${kpkg\:Kernel\-Version}/$(non_epoch_version)/' \
- debian/control.in > debian/control
+#k = $(shell echo $(KVERS) | grep -q ^2.6 && echo k)
- dh_testdir
+# the binary-modules rule is invoked by module-assistant while processing the
+# kdist* targets. It is called by module-assistant or make-kpkg and *not*
+# during a normal build
+binary-modules:
dh_testroot
dh_clean -k
-
+ dh_installdirs lib/modules/$(KVERS)/misc
+
# Build the module
- $(MAKE)
-
+ $(MAKE) -C drivers KERNEL_DIR=$(KSRC) KVERS=$(KVERS)
+
# Install the module
- $(MAKE) install DESTDIR=$(CURDIR)/debian/$(pmodules)
+ cp drivers/slusb.$ko drivers/slamr.$ko
debian/$(PKGNAME)/lib/modules/$(KVERS)/misc
- dh_installdebconf
- # FIXME dh_installdocs README
+ dh_installdocs
dh_installchangelogs
-
- # We're not using this yet
- #dh_installmodules
-
+ dh_compress
+ dh_fixperms
dh_installdeb
- #dh_gencontrol -- -v$(epoch)$(pversion)+$(non_epoch_version)+$(KDREV)
- dh_gencontrol -- -v$(epoch)$(pversion)
+ dh_gencontrol -- -v$(VERSION)
dh_md5sums
- #dh_builddeb --destdir=$(KSRC)/..
- dh_builddeb --destdir=$(MODDIR)
-
+ dh_builddeb --destdir=$(DEB_DESTDIR)
+ dh_clean -k
build-indep: #CONFIG_STATUS# #CONFIGURE_STAMP# build-indep-stamp
build-indep-stamp:
@@ -221,22 +137,16 @@
dh_installdirs
# Create the directories to install the source into
- dh_installdirs -p$(psource) usr/src/modules/$(package)
- dh_installdirs -p$(psource) usr/src/modules/$(package)/debian
+ dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian
# Copy only the driver source to the proper location
cp -s driver/* debian/$(psource)/usr/src/modules/$(package)
# Copy the needed debian/ pieces to the proper location
- cp debian/*-modules.* \
- debian/$(psource)/usr/src/modules/$(package)/debian
- cp debian/control.modules.in \
- debian/$(psource)/usr/src/modules/$(package)/debian/control.in
- cp debian/rules \
- debian/$(psource)/usr/src/modules/$(package)/debian
- cp debian/changelog \
- debian/$(psource)/usr/src/modules/$(package)/debian
- cp debian/copyright \
+ cp debian/*modules.in* \
debian/$(psource)/usr/src/modules/$(package)/debian
+ cp debian/*_KVERS_* debian/rules debian/changelog debian/copyright \
+ debian/$(psource)/usr/src/modules/$(package)/debian/
+ cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 >
$(sname).tar.bz2 && rm -rf modules
# Add here commands to install the package into debian/#PACKAGE#.
#INSTALL#
--Dxnq1zWXvFF0Q93v--
---------------------------------------
Received: (at 241098-close) by bugs.debian.org; 18 May 2005 12:09:19 +0000
>From [EMAIL PROTECTED] Wed May 18 05:09:19 2005
Return-path: <[EMAIL PROTECTED]>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DYNMV-0001Gg-00; Wed, 18 May 2005 05:09:19 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1DYNFn-0003e1-00; Wed, 18 May 2005 08:02:23 -0400
From: Craig Small <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.55 $
Subject: Bug#241098: fixed in dh-make 0.39
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Wed, 18 May 2005 08:02:23 -0400
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
X-CrossAssassin-Score: 2
Source: dh-make
Source-Version: 0.39
We believe that the bug you reported is fixed in the latest version of
dh-make, which is due to be installed in the Debian FTP archive:
dh-make_0.39.dsc
to pool/main/d/dh-make/dh-make_0.39.dsc
dh-make_0.39.tar.gz
to pool/main/d/dh-make/dh-make_0.39.tar.gz
dh-make_0.39_all.deb
to pool/main/d/dh-make/dh-make_0.39_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Craig Small <[EMAIL PROTECTED]> (supplier of updated dh-make package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 18 May 2005 21:39:50 +1000
Source: dh-make
Binary: dh-make
Architecture: source all
Version: 0.39
Distribution: unstable
Urgency: low
Maintainer: Craig Small <[EMAIL PROTECTED]>
Changed-By: Craig Small <[EMAIL PROTECTED]>
Description:
dh-make - tool that converts source archives into Debian package source
Closes: 166849 241098 269423 292390 292484 293311 294408 299840 307032 308944
Changes:
dh-make (0.39) unstable; urgency=low
.
* Has cdbs support closes: #269423
* Removed local variable from native changelog Closes: #292484
* module-assistant migration Closes: #241098
* Library control template uses libdevel section Closes: #293311
* Uses pre-existing orig.tar.gz if it exists Closes: #166849
* Converts bz2 original files into gz ones Closes: #292390
* lower case Release in changelog template Closes: #294408
* watch has an example of SF support Closes: #299840
* watch files are now version 3 Closes: #307032
* pkgconfig files installed for lib-dev package types Closes: #308944
Files:
ece48a2109452872b11ae58e98595005 493 devel optional dh-make_0.39.dsc
09cda28c3a6b5ac37f724c7ce04b1797 37494 devel optional dh-make_0.39.tar.gz
ec7fc4b75793540356e28bb442465c81 34494 devel optional dh-make_0.39_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCiyx2x2zlrBLK36URAt0AAJ9S+/Dw0W0d325xLpHRFHMjGVVTiQCglHAD
mJYdPVc8BFyjl+yI/wvcfLw=
=crCs
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
