From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753175AbdKIS1T (ORCPT ); Thu, 9 Nov 2017 13:27:19 -0500 Received: from mout.gmx.net ([212.227.15.18]:59898 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbdKIS1R (ORCPT ); Thu, 9 Nov 2017 13:27:17 -0500 From: Sven Joachim To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] builddeb: Pass the kernel:debarch substvar to dpkg-genchanges Date: Thu, 09 Nov 2017 19:27:06 +0100 Message-ID: <878tfftiit.fsf@turtle.gmx.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K0:GAEhevLoXI39i7SgU7YIPsVK6nnbatBEBRa+nCDH1EPhK7OJlbB 2w6dQcbLrPDNUHO+baokGl6M9FdbtcznRcHaDw0Bx+s6y8PRDE5hqKRs447QIY8AuZOZdCu KbGVNntBNlZwVgI+vlPkhgRu3u9NZmHKansgPyQ/uJaci8Pii5OEnxyWeC/NxJU6dF96n3R e/nJZNH+ecML0huZyF8ug== X-UI-Out-Filterresults: notjunk:1;V01:K0:aNqp3M8CH98=:kDPucUcoe9hPVze88Vo/Af JaDWkct9p3LnFKC+vADcPklYbNVlLZYFrmAhc0NrnNMJBcDsDR4cYO8IiSWsbR2RWC8lt4Wif H1iQWepH0kLbU5CDZSicJLuYAQLRP35l9x6jxwqXHc8bldKi+9Iyp1VGg34fp6JCbEWvNF1Z7 fPfTDi6PVCEE87buscKP5KHntFBOZYiHet/XjOG7oGTkPXxyz8zEg+tupvSxofKf5EEq7fiGB f0Gy5JmNOg/k89mmJnLD8vKZNvEXk838LxTrAnKf0rhfX0S38Hn1/IzyxP+7fVYSYkW6ze0uC wOHHbujsnA2r8rwU5/sCrfJPBzcYLmrXHILKxACyMBM1SsS3HL0SyOgLVbonsc6i8aqra7zgZ 5vk+ZfNgZLhR36j5xpnHQ4tmVpMzFngNdruLAEnXacxjM0bkhZfzDNjgbRJ7+uMSnyzPtrC57 LSfeDqNzTOHRyDPHSnqPCoe2F3iDNgHwtHTNulGcxqAe+uhd97DmYoBBEOWoPZAqyv34MPcD1 BxCLe1woKgt9+9nODyF3wQY8PNF436XPR1biQ+GhZI3HK+WAsH+YbZK5LTd1mRKjmiQlVnANb N+bH7gqKnTJpLCSI779paoSv8LoeulKOadBuZ5CmOi9IRgxiXOJXDdKoIDJOO7Ag5p29EeZNW 8rNz/P/kuIDTZugLtVAOunDS+UrC9LN29GWxLbyf1AGq8X+XnI6ff0mMnjc2abO0ucryAOZa+ puVUe7O3JY3ml8d3xETOlXV0k7+KBboHc5TUS2R6UUldEuXL6FlGuMs3sBrhdoEFhpTkMd9av kUXanN4qoToI9b82VmqYRukWVl8BXvSo6O/heSOnrX7iZLQsm4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.15.0