[PATCH] kbuild: allow to specify a custom revision for .deb packages

[PATCH] kbuild: allow to specify a custom revision for .deb packages

[Frans Pop]

From: Frans Pop <elendil@planet.nl>

Allow to specify a custom revision for the generated .deb package
by exporting the environment variable KERNELDEBREVISION.

Signed-off-by: Frans Pop <elendil@planet.nl>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index ba6bf5d..2577dec 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -14,6 +14,11 @@ set -e
 # Some variables and settings used throughout the script
 version=$KERNELRELEASE
 revision=`cat .version`
+if [ x"$KERNELDEBREVISION" = x ]; then
+	debrevision=$version-$revision
+else
+	debrevision=$KERNELDEBREVISION
+fi
 tmpdir="$objtree/debian/tmp"
 packagename=linux-$version
 
@@ -66,7 +71,7 @@ done
 name="Kernel Compiler <$(id -nu)@$(hostname -f)>"
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
-linux ($version-$revision) unstable; urgency=low
+linux ($debrevision) unstable; urgency=low
 
   * A standard release
 

[PATCH] kbuild: allow alternative hook script dir in .deb packages

[Frans Pop]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

From: Frans Pop <elendil@planet.nl>
    
Hook scripts in the default directory /etc/kernel are also
executed by packages created using make-kpkg (including official
Debian kernels). Allow to specify an alternative hook scripts
directory by exporting the environment variable KERNELDEBHOOKDIR
so that this can be avoided.

Signed-off-by: Frans Pop <elendil@planet.nl>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 2577dec..c76bbf1 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -55,14 +55,17 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
 fi
 
 # Install the maintainer scripts
+# Note: hook scripts under /etc/kernel are also executed by kernel packages
+# built using make-kpkg (from the "kernelpackage" package)
+debhookdir=${KERNELDEBHOOKDIR:-/etc/kernel}
 for script in postinst postrm preinst prerm ; do
-	mkdir -p "$tmpdir/etc/kernel/$script.d"
+	mkdir -p "$tmpdir$debhookdir/$script.d"
 	cat <<EOF > "$tmpdir/DEBIAN/$script"
 #!/bin/sh
 
 set -e
 
-test -d /etc/kernel/$script.d && run-parts --arg="$version" /etc/kernel/$script.d
+test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
 exit 0
 EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] kbuild: allow to specify a custom revision for .deb packages

[Sam Ravnborg]

On Wed, Feb 13, 2008 at 11:18:11AM +0100, Frans Pop wrote:
> From: Frans Pop <elendil@planet.nl>
> 
> Allow to specify a custom revision for the generated .deb package
> by exporting the environment variable KERNELDEBREVISION.

If this is needed I think we need such functionality
across all package targets.
So please try to come up with a solution that would
fit rpm as well as deb.

	Sam

Re: [PATCH] kbuild: allow alternative hook script dir in .deb packages

[Sam Ravnborg]

On Wed, Feb 13, 2008 at 12:42:18PM +0100, Frans Pop wrote:
> From: Frans Pop <elendil@planet.nl>
>     
> Hook scripts in the default directory /etc/kernel are also
> executed by packages created using make-kpkg (including official
> Debian kernels). Allow to specify an alternative hook scripts
> directory by exporting the environment variable KERNELDEBHOOKDIR
> so that this can be avoided.

Do we have similar hook scripts for rpm for instance?
If we have then a deb specific solution is not acceptable,
we would need something that works across all packages.

Does this btw have to be an environment variable?
Why not make it a config option?

	Sam