From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sIe5E6De72b54AAAe85BDQ:P1 (envelope-from ) for ; Sun, 22 Sep 2024 09:08:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sIe5E6De72b54AAAe85BDQ (envelope-from ) for ; Sun, 22 Sep 2024 11:08:48 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Ub3INmW2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=qIvRZmj5; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726996128; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=SGIX3lKzdvIsn4XzV4xaeCZ/n0iY37uv9n0DhTSWRQw=; b=R9phGPZBHtBcTfgUVleLxVdRzC1Yr6e3rAoHxxJp7NuGytfYYygLvPIJAEa3tkO7Nx3nc/ 4gCPe9gyEzNGAl+uhWozmHQesYcwxkbgPfVzLP2FqJq2bTHuijSC4hatLttYRI4gHLTfm1 fsmTM5O3upw+npQXfQNTOOncWNI/fz5qaYhNlp8404wh7L0mImvG66O6/42qglxnhW/hnx tg5AXHjX1WvZXtQuRmNh+T2ebcQwX0AK1G6WVz1SJ9cin0wSfHfu20cxtkxi/mgfLOrxC2 0utGWV4oPziOxkornkBLridaL255LRr5BIz4TlA7KIDXzNzZCZBt5e9oX3Meng== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726996128; a=rsa-sha256; cv=none; b=DH77FlS4Ck1ZwbDSJlfOdTf5/eGMKQKX2NSLa7cd+g0b7Rctq+HGtuSy+jKgiu9xR4umYg sSTC6IXWeHyUUN9UpCxG4nmoDcx8FkJFOxJGkighnCwFsxBzaeHQXnW8j2/uZ/jBJkYhkf pYxE5+xd7p6KHoN+62IEK1FS1bsaX5WC6DaLtFfTcufltiR04m43QKfjitRfi7ml1cqXoU AfU3XIzXMWKsD13KoBrNOtqVBdLWjuv9J8hNMm+6rR8BkCSYtwiHVLGQ7+iVJ4OEjjSxXt Byxj5zvtTJHG4IaJyvZF7dDeJwb/rs4NmZWvgPgcMCc1aRAzaztJq6BolaNdJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Ub3INmW2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=qIvRZmj5; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 05F6379149 for ; Sun, 22 Sep 2024 11:08:47 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssIaA-0003PT-Ri; Sun, 22 Sep 2024 05:08:42 -0400 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 1ssIa9-0003PB-Hi for guix-patches@gnu.org; Sun, 22 Sep 2024 05:08:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ssIa9-0002EA-1a for guix-patches@gnu.org; Sun, 22 Sep 2024 05:08:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=SGIX3lKzdvIsn4XzV4xaeCZ/n0iY37uv9n0DhTSWRQw=; b=Ub3INmW2FIp4zTZ4wU9xqS5edxsjroZ1rOLJeRaLk8WwzH88DYlK14UZbCHYke6+DzsZlK8qU1+wubDwGOBVXKq4HM2f+AURYuZDJu9glXgw+Aoz5kZMSAAWMMlGhp+k1jakODMl5/eeZPZ7fWnaBykv7y+/1p0QvqfRpzddSt4/VY24A4a1Z1TruPud4H9bMP2YOaMkFdrzbJbqD+TU6n/BIzvsd/Xz3cMe5votZz1Nl0Fv6fHxmHKH5iXy0Vs8JuJRbEYalhOfQhb0jsNF6V5MP0Ed9dyFK48zUAPyVHRUHHhHhpaFwCPF1FdcjCVXtTi9grElL3e/TqQK7Oku6Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssIaU-0005I8-By for guix-patches@gnu.org; Sun, 22 Sep 2024 05:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73393] [PATCH v2 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend Resent-From: Adrien 'neox' Bourmault Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Sep 2024 09:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73393@debbugs.gnu.org Cc: Adrien 'neox' Bourmault Received: via spool by 73393-submit@debbugs.gnu.org id=B73393.172699613020301 (code B ref 73393); Sun, 22 Sep 2024 09:09:02 +0000 Received: (at 73393) by debbugs.gnu.org; 22 Sep 2024 09:08:50 +0000 Received: from localhost ([127.0.0.1]:40873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssIaH-0005HN-Dx for submit@debbugs.gnu.org; Sun, 22 Sep 2024 05:08:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssIaF-0005Gt-15 for 73393@debbugs.gnu.org; Sun, 22 Sep 2024 05:08:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ssIZo-0002C9-9O; Sun, 22 Sep 2024 05:08:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=SGIX3lKzdvIsn4XzV4xaeCZ/n0iY37uv9n0DhTSWRQw=; b=qIvRZmj5Do6q3x3jqP4N p+WexGvXV02K9wZCsJUMcUFBlNXuXkktKy1r43NY9YmSY8BzXqCpOqO0jEKFPXpDo8tHcxvGma8CB 02Wofiptb6w9hqL/hLNan6nF+d5eqd+fHP8F9+clYvgxgsUpAcYL29DX6sERJDmGxS3tMZ1/Sy4qf QCdvHbMwa720eJmObVj2Tce7m6wZdDblmr1mdu77pfI5F2rLbTciKFNWF6D+3D/Z5dkNwPoXmi9E/ d0Kan5yCriw9PjuoqWnDkPyceNP9FjAbkwyA0Ly681/sFc9JCGS0sUq/XHSsi7SwzAlG83mlNxIeU JdmsRIydwg82Ag==; From: Adrien 'neox' Bourmault Date: Sun, 22 Sep 2024 11:07:57 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -8.11 X-Migadu-Queue-Id: 05F6379149 X-Spam-Score: -8.11 X-TUID: cwb/THvJQZjd Message-ID: <20240922090757.OR71YTK9b6cH20_QfQqnv-087kXDKjRbLk-p7Cq_tCg@z> * gnu/packages/scanner.scm (sane-backends-minimal) [arguments]<#:configure-flags>: add "--with-lockdir=/var/lock/sane" [arguments]<#:phases>: add disable-lockdir-creation to prevent creating the lockpath during install Change-Id: I338c16cd4c0bfa0d165c9906b0f1f87ab79a4f75 Signed-off-by: Adrien 'neox' Bourmault --- gnu/packages/scanner.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index a2faaa2728..a346f004ae 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2019, 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2022 João Gabriel +;;; Copyright © 2024 Adrien Bourmault ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,7 +137,8 @@ (define-public sane-backends-minimal (inputs (list libusb)) (arguments - `(#:phases + `(#:configure-flags '("--with-lockdir=/var/lock/sane") ;; Avoid errors with plustek + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'zap-unnecessary-git-dependency (lambda _ @@ -145,6 +147,12 @@ (define-public sane-backends-minimal (("/bin/sh") (which "sh"))) (with-output-to-file ".tarball-version" (lambda _ (format #t ,version))))) + (add-before 'configure 'disable-lockdir-creation + (lambda _ + ;; Modify the Makefile.am to prevent the creation of the lock dir + (substitute* "backend/Makefile.am" + (("^install-lockpath:.*$") + "install-lockpath: # pass")))) (add-before 'configure 'disable-backends (lambda _ (setenv "BACKENDS" " ") -- 2.46.0