From patchwork Mon Jun 9 00:24:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 4317351 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1F379BEEAA for ; Mon, 9 Jun 2014 00:24:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2617E20171 for ; Mon, 9 Jun 2014 00:24:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBF6620170 for ; Mon, 9 Jun 2014 00:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753603AbaFIAY3 (ORCPT ); Sun, 8 Jun 2014 20:24:29 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:41727 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753098AbaFIAY3 (ORCPT ); Sun, 8 Jun 2014 20:24:29 -0400 Received: from deadeye.wl.decadent.org.uk ([192.168.4.249]) by shadbolt.decadent.org.uk with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WtnNz-0001CS-VZ; Mon, 09 Jun 2014 01:24:28 +0100 Received: from ben by deadeye.wl.decadent.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1WtnNv-00031G-7W; Mon, 09 Jun 2014 01:24:23 +0100 Message-ID: <1402273462.23860.62.camel@deadeye.wl.decadent.org.uk> Subject: [PATCH v2 2/2] deb-pkg: Add automatic support for s390x architecture From: Ben Hutchings To: linux-kbuild Cc: maximilian attems , Michal Marek , debian-s390@lists.debian.org, Stephen Powell , 750925@bugs.debian.org Date: Mon, 09 Jun 2014 01:24:22 +0100 X-Mailer: Evolution 3.12.2-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.249 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Debian s390x architecture has 64-bit userland whereas s390 has 32-bit userland. A 64-bit kernel can be used with either. Now that Debian supports multiarch and officially supports s390x, it makes more sense to assign a 64-bit kernel package to s390x. Reported-by: Stephen Powell References: https://bugs.debian.org/750925 Signed-off-by: Ben Hutchings --- v2: - add bug reference, since Stephen also found this - add '|| true', as in recent fixes for other architectures scripts/package/builddeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 6756ed6..8db6dbd 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -35,7 +35,7 @@ create_package() { sparc*) debarch=sparc ;; s390*) - debarch=s390 ;; + debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;; ppc*) debarch=powerpc ;; parisc*)