From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from 2481.rev.megiteam.pl ([91.227.36.129]:46895 "EHLO vk1001.megiteam.com.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755670Ab2CWO0c (ORCPT ); Fri, 23 Mar 2012 10:26:32 -0400 Message-ID: <4F6C85B2.4030806@localdomain.pl> Date: Fri, 23 Mar 2012 15:16:18 +0100 From: Grzegorz Nosek MIME-Version: 1.0 Subject: [PATCH] Don't force deb architecture on universal packages Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: linux-kbuild@vger.kernel.org Cc: Asbjoern Sloth Toennesen , maximilian attems , Michal Marek $debarch is basically always set so the Architecture field from debian/control is ignored. While we don't really care for most packages (they have Architecture: any or some specific $arch), this breaks the firmware package as it becomes an arch-dependent .deb, ignoring its Architecture: all entry. It's apparently broken by 10f26fa64200095af0e5d80a980e47877865e4b7. Signed-off-by: Grzegorz Nosek --- Note: this is based on 3.2 as that's what I'm currently using. I'll clean the two-level if and rebase onto whatever is required when the general idea is accepted. Best regards, Grzegorz Nosek scripts/package/builddeb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 3c6c0b1..ef71b80 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -57,8 +57,10 @@ create_package() { if [ -n "$KBUILD_DEBARCH" ] ; then debarch="$KBUILD_DEBARCH" fi - if [ -n "$debarch" ] ; then - forcearch="-DArchitecture=$debarch" + if [ -n "$debarch" ]; then + if ! grep -qFx "Architecture: all" debian/control ; then + forcearch="-DArchitecture=$debarch" + fi fi # Create the package -- 1.7.2.3