From patchwork Fri Jan 21 23:23:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 36720 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 538B727BBEA; Fri, 21 Jan 2022 23:24:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 0BEED27BBE9 for ; Fri, 21 Jan 2022 23:24:21 +0000 (GMT) Received: from localhost ([::1]:42292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nB3GW-0006YV-77 for patchwork@mira.cbaines.net; Fri, 21 Jan 2022 18:24:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nB3GE-0006YK-Ob for guix-patches@gnu.org; Fri, 21 Jan 2022 18:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nB3GE-0005oN-Et for guix-patches@gnu.org; Fri, 21 Jan 2022 18:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nB3GE-000232-Bv for guix-patches@gnu.org; Fri, 21 Jan 2022 18:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53431] [PATCH 1/3] gnu: i2c-tools: Update to 4.3. References: <20220121231316.8253-1-brice@waegenei.re> In-Reply-To: <20220121231316.8253-1-brice@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jan 2022 23:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53431@debbugs.gnu.org Received: via spool by 53431-submit@debbugs.gnu.org id=B53431.16428073977815 (code B ref 53431); Fri, 21 Jan 2022 23:24:02 +0000 Received: (at 53431) by debbugs.gnu.org; 21 Jan 2022 23:23:17 +0000 Received: from localhost ([127.0.0.1]:35326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nB3FV-00021z-5W for submit@debbugs.gnu.org; Fri, 21 Jan 2022 18:23:17 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:58057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nB3FT-00021Y-8h for 53431@debbugs.gnu.org; Fri, 21 Jan 2022 18:23:16 -0500 Received: (Authenticated sender: brice@waegenei.re) by mail.gandi.net (Postfix) with ESMTPSA id 24099100002 for <53431@debbugs.gnu.org>; Fri, 21 Jan 2022 23:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waegenei.re; s=gm1; t=1642807389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLdH6Ms57Oi/eXO++lYY7rbYNVyQMc1J8qYWxR8FdPo=; b=dvRlhweN/wgHoIvhPsH6lebdXtp+h9F5Dm8ccT6CJ2Z3pywBvZ6+05Wlgy4vKsy7+8pqQA U5E6Rtzuu0SKutPbT21QtBeV3lG2nRajq6Jwjkl1/+vlhHzlA92seF9Dl8LsPq3+HVR9AS uLZmNcevr2C//GVoZpcHYI/4LT7Wy0Jf3OsIKn0MWMxgGmsEDrE6KCHtKHzy5Jxx3RcqK7 w86V0R5EDJJcsxZhoIoYk+ECFpefzTDUCJHhSONswGBjaQuZC98sQWZG4IUb5bCSnRh9AL qLeTRmXlsdQ2ONpvgdKJrQEnmnfPBEhDjUV8tChHdl8Rt7g6AIRwFnpZG5M0Qw== From: Brice Waegeneire Date: Sat, 22 Jan 2022 00:23:06 +0100 Message-Id: <20220121232306.12976-1-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (i2c-tools): Update to 4.3. [arguments]: Up case "prefix" make-flag and add "LDFLAGS". (i2c-tools-3): New variable. * gnu/packages/admin.scm (novena-eeprom)[inputs]: Replace "i2c-tools" by "i2c-tools-3". --- gnu/packages/admin.scm | 2 +- gnu/packages/linux.scm | 33 +++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ed66e358ea..88e514b0c6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4753,7 +4753,7 @@ (define-public novena-eeprom (install-file "novena-eeprom" out-bin) (install-file "novena-eeprom.8" out-share-man))))))) (inputs - (list i2c-tools)) + (list i2c-tools-3)) (synopsis "Novena EEPROM editor") (description "This package provides an editor for the Novena EEPROM. Novena boards contain a device-dependent descriptive EEPROM that defines diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c044f2543d..e08eac1668 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2019 Tim Gesthuizen ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović -;;; Copyright © 2019, 2020, 2021 Brice Waegeneire +;;; Copyright © 2019-2022 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020, 2021 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt @@ -4430,21 +4430,22 @@ (define-public iucode-tool (define-public i2c-tools (package (name "i2c-tools") - (version "3.1.1") + (version "4.3") (source (origin (method url-fetch) (uri (string-append "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l")))) + "1y0fphjd5ah2j886x8i175r7viq0hmx666hyca0wi4dzrm290qxk")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no 'check' target #:make-flags - ,#~(list (string-append "prefix=" #$output) - (string-append "CC=" #$(cc-for-target))) + ,#~(list (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target)) + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) ;; No configure script. #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs @@ -4458,6 +4459,26 @@ (define-public i2c-tools SMBus access.") (license license:gpl2+))) +;; Needed for novena-eeprom +(define-public i2c-tools-3 + (package + (inherit i2c-tools) + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-" + version ".tar.bz2")) + (sha256 + (base32 + "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l")))) + (arguments + `(#:make-flags + ,#~(list (string-append "prefix=" #$output) + (string-append "CC=" #$(cc-for-target))) + ,@(strip-keyword-arguments '(#:make-flags) + (package-arguments i2c-tools)))))) + (define-public xsensors (package (name "xsensors")