From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mNi1Fdbd7WaEfAAAqHPOHw:P1 (envelope-from ) for ; Fri, 20 Sep 2024 20:40:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id mNi1Fdbd7WaEfAAAqHPOHw (envelope-from ) for ; Fri, 20 Sep 2024 22:40:54 +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="ljwxLo1/"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=WBGrRnIq; 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=1726864854; 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=AL4lIL4YEuqT5HpMxok6qOTbSt9uTVytxTv46UzbVZg=; b=tjgk0HM3CorYxbIlGa2EdLpbZD93ynmW25+ZD4ViOuTEMzbsIVYuTAQVqjxR45yhH6y2jO h7X3NN/SRkauVdBE2roCXrFiCu7QKza04iD5wKaYDyu7DRUQovNGhRUc5R5IngeX1bKDd7 3yyVRjRhttIZKQLPuYsUbUO+rHNGwA24mBG8JxQDW2tJsYkerQOW8BchqPrz0c3nYqpcP2 wv89LSkFWMmUKCp4Lr67suoG3OkPIjk9NuFGAy74fbZV+D5UY8lP+g0CW96Lk4ma2N6tiu 2/epOpzmPl2pp5gtrSBFK6OTMRTljv1iRrt2mPuphk2lCA1Dl17DiTQIyfzcWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="ljwxLo1/"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=WBGrRnIq; 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-Seal: i=1; s=key1; d=yhetil.org; t=1726864854; a=rsa-sha256; cv=none; b=IEuvH+QoI2Gq8OnA+mU7kXu0HMu6DMwy+lCTDWeF3Y08rg4+18qop0tD4bFHzlsltEQgrI 1R1LuLz+MauiYFynln92kIx7yUxo/fjJ4Na1NqGzn4J1NjkLUrGEKg6fu6PsfKpxjeg3Wt wd+/V3PRNpL3EG0IhXHXtqG1s+Y6BQbfNX9J8hPU8HfIHFqvQ4wLu+71Rz8UgZEktYppHm rvyIn8eS4bVEjxmMjbCdvCgFKc/tPJYgugpbPLAQFQ5Q/SOQs+wE/HkUxRXmJ5VIC3olJl NHTWc2+q9eT7QOjR0V0ZciCZaRvop7NY7imrJFixuiq7Fpt9yuIhvEF7SYUvdQ== 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 8C5C17FD17 for ; Fri, 20 Sep 2024 22:40:53 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srkQm-0007Hb-Dv; Fri, 20 Sep 2024 16:40:44 -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 1srkQl-0007HE-Hs for guix-patches@gnu.org; Fri, 20 Sep 2024 16:40:43 -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 1srkQl-0005yr-7e for guix-patches@gnu.org; Fri, 20 Sep 2024 16:40:43 -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=AL4lIL4YEuqT5HpMxok6qOTbSt9uTVytxTv46UzbVZg=; b=ljwxLo1/0MtqUbZSuIby02FgBKQkzdw4LVigTyZQ5xkQ9oLVWg3e/gHtD29+2Qfa8eGkb0OJ7gLas/CRCIzalz9tDTWi8wxnrJ/2rn4I66723Vo+neRZgyy+nmXpvsgWXjdrRv8G+no3VAAmRiTQ3ZBJ9tP/gGmhlj5JRlmfi5SJAHINvRjAPm3bd6DLxpwSBNK1fAkc9zbo5eMGNA9Gk3jjEc0X8FTWluDkVSezmHmLvxOiC/CyHnYU3Lt6nRxu1teQoJYDA1MwVrF3v3jYglGRa0CNBshttQN7COB3DnFDnie7wMjeHsVogRnEqPDGd0aIeRGzw6xZB+i7B+wBjA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srkR4-0002t8-95 for guix-patches@gnu.org; Fri, 20 Sep 2024 16:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73391] [PATCH v2 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend Resent-From: neox Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 20:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73391@debbugs.gnu.org Cc: Adrien 'neox' Bourmault Received: via spool by 73391-submit@debbugs.gnu.org id=B73391.172686484911055 (code B ref 73391); Fri, 20 Sep 2024 20:41:02 +0000 Received: (at 73391) by debbugs.gnu.org; 20 Sep 2024 20:40:49 +0000 Received: from localhost ([127.0.0.1]:36431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srkQq-0002sF-LC for submit@debbugs.gnu.org; Fri, 20 Sep 2024 16:40:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srkQm-0002rl-CW for 73391@debbugs.gnu.org; Fri, 20 Sep 2024 16:40:45 -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 1srkQN-0005xI-Nx; Fri, 20 Sep 2024 16:40:19 -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=AL4lIL4YEuqT5HpMxok6qOTbSt9uTVytxTv46UzbVZg=; b=WBGrRnIqvhYH8MizDnjA GJHoevw4eombvydnmFTDjTpdnqHXsX8nGuqdxQpF0ZoLmwcKWHDORw7YL55lw3xSFlkhpJj3w1NqP 19GkHWNMOZ5KnWKJgXpa/66wr4w6vJUsiSmYjNJFiNgAooJlQRayFFMKdV9drjFOV1flIGDQqkDJ5 6blwE478dwhw/vAzMSxXzGHFYbOrpQzYeka/3NEf71y6i6ec5ir2aFom5HF5e3lvn2vf03MjhZH63 mCnP7RELrwWV5RujhugAhSIHVuvlzKJQjClvRz3RleugOBm7w92uzTlkHTaiLz7BRCDP5QVDIVIl3 86XFiaU6BVjQIQ==; From: neox Date: Fri, 20 Sep 2024 22:39:29 +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-Queue-Id: 8C5C17FD17 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -8.11 X-Migadu-Spam-Score: -8.11 X-TUID: VW00HHQw5SQO From: Adrien 'neox' Bourmault * 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2KCjEDZ+7mYz5AAA62LTzQ:P1 (envelope-from ) for ; Sat, 21 Sep 2024 08:05:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2KCjEDZ+7mYz5AAA62LTzQ (envelope-from ) for ; Sat, 21 Sep 2024 10:05:10 +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=up9UcU1L; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=aYe2oUBK; 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=1726905910; 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=Np3HKKi1PnYEgDAuLgYYlwkWueHf/LBwu1A4gQhl9e+x55TIShF/tis7eoW+T1U9rpjyzj 3afjPVMk5OvtKSSiT4xjgwkJo6l7YGUPTo7RSRHblaUeERPJayejfoY5WRy7LYBXjb7u0X MbmydQQMpKll6LDsFAL8AfPf4goFDR83cUUz1ZlYSalITktz921NGCWCWwQwSW7F28kv9i PDS6/1440BFCuloBCECdi8C1Zllq4jLMYTpWq4047IFcUWvjx1n9qYTOiuQQxgPyudpytp CIemWhvY4bwgHMHeYsyMry2ar1mftcMJvGPP+0wfdq6xBIwMLGUYS7aZ6VO1LQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=up9UcU1L; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=aYe2oUBK; 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-Seal: i=1; s=key1; d=yhetil.org; t=1726905910; a=rsa-sha256; cv=none; b=SvIZ4QwCPqRkwj+REaNIknO/Uc+m0vvUQfSVwSNBo9cTYfdvbp9l2JIHq7YVNgfb0MQ4Nd TT/+YxOfGjhgONtxYt0XnfzDqxgRcblIZNF+G328GOHsOPtzUfQ/w1ciGJBPnTiaGfPF+P qAgSXDQUbfCm3jhLqWoIgWkcD8D/rAtGvnpfhOzdqHpQ7rLge2hqxzJTcWSja9J/1zz6Pl CZ3N0arCskCvbbSuxtRezYrUx0KzzEFA2BYFH8A/RZO3cuYRdcNhfo1wOd6/TzHEvo4qGi AQ8UtZfpcllBZyWg+33dfUlxYd6+sry6wSW1EVWQHj4sXa+FjaaNRDuJ+HojYg== 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 CC1D37F651 for ; Sat, 21 Sep 2024 10:05:09 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srv6i-00026X-GI; Sat, 21 Sep 2024 04:04:44 -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 1srv6g-00025v-Cj for guix-patches@gnu.org; Sat, 21 Sep 2024 04:04:42 -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 1srv6g-0007Zo-3m for guix-patches@gnu.org; Sat, 21 Sep 2024 04:04:42 -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=up9UcU1LVYJdbTAC9vpxIb+z3OqT/dibEOrS6nBSqUF1cL/ax0M88APCY5Q7AWT2d4kytalroDpXNP+GcfV7ANDp+7VYvzz5x8v/9WpbQDooXIYjtA1osRrwqZn0ZazCptRWkRIsMunqvp32eCUVIO/VPMUtXww/Q8TnM13BhU06gBhOGewV2ThZb772tWX3AsU4qxdHepH0y4pvXyU/WdOST/+OWdkkL+r1IgPBEQZMpuB33Ir9DqPl1/RycY2bPpFko7AfN1GuO7oCdEUGXEkAIQ4PYmJOOsemOxICHd6/dPP7y2c+cfUPjO1Kml4X2M2yoATlgGM2ui2qUgsaPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srv6z-0006XQ-VU for guix-patches@gnu.org; Sat, 21 Sep 2024 04:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73406] [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: Sat, 21 Sep 2024 08:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73406 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73406@debbugs.gnu.org Cc: Adrien 'neox' Bourmault Received: via spool by 73406-submit@debbugs.gnu.org id=B73406.172690584525001 (code B ref 73406); Sat, 21 Sep 2024 08:05:01 +0000 Received: (at 73406) by debbugs.gnu.org; 21 Sep 2024 08:04:05 +0000 Received: from localhost ([127.0.0.1]:36999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srv64-0006VB-KM for submit@debbugs.gnu.org; Sat, 21 Sep 2024 04:04:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srv62-0006Ub-TA for 73406@debbugs.gnu.org; Sat, 21 Sep 2024 04:04:03 -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 1srv5d-0007WQ-82; Sat, 21 Sep 2024 04:03:37 -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=aYe2oUBKYlvsQStb55PQ BxAMqeqeSQDrj8ZsftYi180OXiVMsj/mIhFNSgLyAtlcuDb1jXES+pcowHsMZcI/Dr7AhzfcQb1ne 7Ind6VhV7g7XCyT6vKCISeyduYHd7UODwaJ8FNBlW4sYufh9+g/BgyV0FdL/jaz4zllldHjW5OG0s qLrKNBpBFhldx3v+hxqPyaLxTh8tX5AQBCbCm3DrATRQOLPD2HiheFDnPqK/8vwmmXydpnXciHYjb 9VqJ0XxD1ESCVIUPK6fktGe4XmoQOFqNYkyhoPJv2GXg/bsaZJUEYxt7jCXbXJ9fV1Btnafe9jobb 41ZJk/KdmMl05Q==; From: Adrien 'neox' Bourmault Date: Sat, 21 Sep 2024 10:03:32 +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-Spam-Score: -6.01 X-Spam-Score: -6.01 X-Migadu-Queue-Id: CC1D37F651 X-Migadu-Scanner: mx10.migadu.com X-TUID: 9jNj9x++EHeC Message-ID: <20240921080332.vNz-gNDDWvvWMfJoCTbOW-5i-l67uhMG42ZhW7QKUS0@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 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