From patchwork Tue May 28 15:57:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 14117 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 72FD717055; Tue, 28 May 2019 16:59:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 19DB317051 for ; Tue, 28 May 2019 16:59:55 +0100 (BST) Received: from localhost ([127.0.0.1]:37102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVeVz-00046j-45 for patchwork@mira.cbaines.net; Tue, 28 May 2019 11:59:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVeVM-0003nO-A5 for guix-patches@gnu.org; Tue, 28 May 2019 11:59:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVeVI-0000cS-7J for guix-patches@gnu.org; Tue, 28 May 2019 11:59:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43382) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVeVC-0000Y5-Ka for guix-patches@gnu.org; Tue, 28 May 2019 11:59:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVeVC-0004Dx-IO for guix-patches@gnu.org; Tue, 28 May 2019 11:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35963] [PATCH] gnu: cross-base: Allow non-default linux-headers. Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 May 2019 15:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35963@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155905908616151 (code B ref -1); Tue, 28 May 2019 15:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 May 2019 15:58:06 +0000 Received: from localhost ([127.0.0.1]:56925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVeUI-0004CR-Iv for submit@debbugs.gnu.org; Tue, 28 May 2019 11:58:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVeUF-0004Bq-ON for submit@debbugs.gnu.org; Tue, 28 May 2019 11:58:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:59118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVeUA-00073l-44 for submit@debbugs.gnu.org; Tue, 28 May 2019 11:57:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVeU9-0002uK-14 for guix-patches@gnu.org; Tue, 28 May 2019 11:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVeU8-0006uP-1o for guix-patches@gnu.org; Tue, 28 May 2019 11:57:56 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:29977) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVeU7-0006We-OF for guix-patches@gnu.org; Tue, 28 May 2019 11:57:55 -0400 Date: Tue, 28 May 2019 15:57:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1559059069; bh=L2cNTfLvIxAUOIsPF0GvUUDPM/90K32EVTAe5Td149Y=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=i0jjQ9k9J1Rx/LWrRp0NZB0idX/9b3U/ODCMkH5Nl2Ooqt+btohiC+ypuCdj0aKz5 Gq8alRLwdyHK21cdoaTvQwFDJX46EKeYTV4MheAlK4YXrCSCp9qjl4F+L8tih62uvp d6eTRYqTL5mPLqNTmDaW7ib6ydgtdPzD2kEroqZ8= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Cc: Carl Dong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-kernel-headers): Add 'linux-headers' optional argument to specify using a non-default linux-kernel package. --- gnu/packages/cross-base.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index b3b90a6490..a0341ebc5d 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -39,7 +39,8 @@ #:export (cross-binutils cross-libc cross-gcc - cross-newlib?)) + cross-newlib? + cross-kernel-headers)) (define-syntax %xgcc ;; GCC package used as the basis for cross-compilation. It doesn't have to @@ -276,18 +277,19 @@ target that libc." (define* (cross-kernel-headers target #:optional + (linux-headers linux-libre-headers) (xgcc (cross-gcc target)) (xbinutils (cross-binutils target))) "Return headers depending on TARGET." (define xlinux-headers - (package (inherit linux-libre-headers) - (name (string-append (package-name linux-libre-headers) + (package (inherit linux-headers) + (name (string-append (package-name linux-headers) "-cross-" target)) (arguments (substitute-keyword-arguments `(#:implicit-cross-inputs? #f - ,@(package-arguments linux-libre-headers)) + ,@(package-arguments linux-headers)) ((#:phases phases) `(alist-replace 'build @@ -300,7 +302,7 @@ target that libc." ,phases)))) (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) - ,@(package-native-inputs linux-libre-headers))))) + ,@(package-native-inputs linux-headers))))) (define xgnumach-headers (package (inherit gnumach-headers)