diff mbox

builddeb: Pass the kernel:debarch substvar to dpkg-genchanges

Message ID 878tfftiit.fsf@turtle.gmx.de (mailing list archive)
State New, archived
Headers show

Commit Message

Sven Joachim Nov. 9, 2017, 6:27 p.m. UTC
At the end of "make bindeb-pkg" I noticed the following warning:

dpkg-genchanges: warning: unknown substitution variable ${kernel:debarch}

It turns out that since dpkg version 1.19.0 dpkg-genchanges honors
substitution variables in the Description field, while earlier
versions silently left them alone, see https://bugs.debian.org/856547.

The result is an incomplete description of the linux-headers package
in the generated .changes file.  Fix it by passing the kernel:debarch
substitution variable to dpkg-genchanges.

Signed-off-by: Sven Joachim <svenjoac@gmx.de>
---
 scripts/package/builddeb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Masahiro Yamada Nov. 13, 2017, 3:25 p.m. UTC | #1
2017-11-10 3:27 GMT+09:00 Sven Joachim <svenjoac@gmx.de>:
> At the end of "make bindeb-pkg" I noticed the following warning:
>
> dpkg-genchanges: warning: unknown substitution variable ${kernel:debarch}
>
> It turns out that since dpkg version 1.19.0 dpkg-genchanges honors
> substitution variables in the Description field, while earlier
> versions silently left them alone, see https://bugs.debian.org/856547.
>
> The result is an incomplete description of the linux-headers package
> in the generated .changes file.  Fix it by passing the kernel:debarch
> substitution variable to dpkg-genchanges.
>
> Signed-off-by: Sven Joachim <svenjoac@gmx.de>
> ---

Applied to linux-kbuild/misc.  Thanks!
diff mbox

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0bc87473f68f..b4f0f2b3f8d2 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -408,9 +408,9 @@  EOF
 	dpkg-source -cdebian/control -ldebian/changelog --format="3.0 (custom)" --target-format="3.0 (quilt)" \
 		-b / ../${sourcename}_${version}.orig.tar.gz  ../${sourcename}_${packageversion}.debian.tar.gz
 	mv ${sourcename}_${packageversion}*dsc ..
-	dpkg-genchanges > ../${sourcename}_${packageversion}_${debarch}.changes
+	dpkg-genchanges -Vkernel:debarch="${debarch}" > ../${sourcename}_${packageversion}_${debarch}.changes
 else
-	dpkg-genchanges -b > ../${sourcename}_${packageversion}_${debarch}.changes
+	dpkg-genchanges -b -Vkernel:debarch="${debarch}" > ../${sourcename}_${packageversion}_${debarch}.changes
 fi
 
 exit 0