From patchwork Sun Nov 6 09:13:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 44348 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 E568527BBEB; Sun, 6 Nov 2022 09:14:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6353427BBE9 for ; Sun, 6 Nov 2022 09:14:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orbjB-00040D-7s; Sun, 06 Nov 2022 04:14:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orbj8-0003zc-OU for guix-patches@gnu.org; Sun, 06 Nov 2022 04:14:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orbj8-0005XU-An for guix-patches@gnu.org; Sun, 06 Nov 2022 04:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orbj8-0003dK-0j for guix-patches@gnu.org; Sun, 06 Nov 2022 04:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59074] [PATCH] build-system/linux-module: Add #:source-directory to linux-module-build-cross. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Nov 2022 09:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59074@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166772600613913 (code B ref -1); Sun, 06 Nov 2022 09:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Nov 2022 09:13:26 +0000 Received: from localhost ([127.0.0.1]:58663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orbiX-0003cL-VO for submit@debbugs.gnu.org; Sun, 06 Nov 2022 04:13:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:50026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orbiT-0003cB-Eo for submit@debbugs.gnu.org; Sun, 06 Nov 2022 04:13:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orbiT-0003v4-9L for guix-patches@gnu.org; Sun, 06 Nov 2022 04:13:21 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orbiR-0005Ur-O7 for guix-patches@gnu.org; Sun, 06 Nov 2022 04:13:20 -0500 Received: from localhost (host-82-184-251-30.business.telecomitalia.it [82.184.251.30]) by mira.cbaines.net (Postfix) with ESMTPSA id 243A427BBE9 for ; Sun, 6 Nov 2022 09:13:18 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 38d3119a for ; Sun, 6 Nov 2022 09:13:17 +0000 (UTC) From: Christopher Baines Date: Sun, 6 Nov 2022 10:13:17 +0100 Message-Id: <20221106091317.27635-1-mail@cbaines.net> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Otherwise computing cross-compilation derivations for packages (e.g. xpadneo) using the #:source-directory argument fails with this error: Unrecognized keyword: #:source-directory * guix/build-system/linux-module.scm (linux-module-build-cross): Support #:source-directory. --- guix/build-system/linux-module.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index 94a293da13..d6c369d65d 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -210,6 +210,7 @@ (define* (linux-module-build-cross (tests? #f) (phases '%standard-phases) (system (%current-system)) + (source-directory ".") (substitutable? #t) (imported-modules %linux-module-build-system-modules) @@ -229,6 +230,7 @@ (define %build-target-inputs (linux-module-build #:name #$name #:source #+source + #:source-directory #$source-directory #:system #$system #:target #$target #:arch #$(system->arch (or target system))