unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: neox <neox@gnu.org>
To: 73391@debbugs.gnu.org
Cc: Adrien 'neox' Bourmault <neox@gnu.org>
Subject: [bug#73391] [PATCH v2 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend
Date: Fri, 20 Sep 2024 22:39:29 +0200	[thread overview]
Message-ID: <bc2d915931bfd53462d5eeac7504b04b94ea2d02.1726864525.git.neox@gnu.org> (raw)
In-Reply-To: <cover.1726864525.git.neox@gnu.org>

From: Adrien 'neox' Bourmault <neox@gnu.org>

* 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 <neox@gnu.org>
---
 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 <me@tobias.gr>
 ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 João Gabriel <joaog.bastos@protonmail.ch>
+;;; Copyright © 2024 Adrien Bourmault <neox@gnu.org>
 ;;;
 ;;; 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





WARNING: multiple messages have this Message-ID (diff)
From: Adrien 'neox' Bourmault <neox@gnu.org>
To: 73406@debbugs.gnu.org
Cc: Adrien 'neox' Bourmault <neox@gnu.org>
Subject: [bug#73406] [PATCH v2 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend
Date: Sat, 21 Sep 2024 10:03:32 +0200	[thread overview]
Message-ID: <bc2d915931bfd53462d5eeac7504b04b94ea2d02.1726864525.git.neox@gnu.org> (raw)
Message-ID: <20240921080332.vNz-gNDDWvvWMfJoCTbOW-5i-l67uhMG42ZhW7QKUS0@z> (raw)
In-Reply-To: <cover.1726864525.git.neox@gnu.org>

* 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 <neox@gnu.org>
---
 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 <me@tobias.gr>
 ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 João Gabriel <joaog.bastos@protonmail.ch>
+;;; Copyright © 2024 Adrien Bourmault <neox@gnu.org>
 ;;;
 ;;; 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





WARNING: multiple messages have this Message-ID (diff)
From: Adrien 'neox' Bourmault <neox@gnu.org>
To: 73393@debbugs.gnu.org
Cc: Adrien 'neox' Bourmault <neox@gnu.org>
Subject: [bug#73393] [PATCH v2 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend
Date: Sun, 22 Sep 2024 11:07:57 +0200	[thread overview]
Message-ID: <bc2d915931bfd53462d5eeac7504b04b94ea2d02.1726864525.git.neox@gnu.org> (raw)
Message-ID: <20240922090757.OR71YTK9b6cH20_QfQqnv-087kXDKjRbLk-p7Cq_tCg@z> (raw)
In-Reply-To: <cover.1726864525.git.neox@gnu.org>

* 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 <neox@gnu.org>
---
 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 <me@tobias.gr>
 ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 João Gabriel <joaog.bastos@protonmail.ch>
+;;; Copyright © 2024 Adrien Bourmault <neox@gnu.org>
 ;;;
 ;;; 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





  reply	other threads:[~2024-09-20 20:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-20 19:03 [bug#73391] [PATCH 0/2] SANE: fix a locking bug for plustek backend neox
2024-09-20 19:03 ` [bug#73392] [PATCH 1/2] gnu: sane-backends-minimal: fix lock path " neox
     [not found]   ` <handler.73392.B.172685906722683.ack@debbugs.gnu.org>
2024-09-20 19:21     ` [bug#73392] Acknowledgement ([PATCH 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend) Adrien 'neox' Bourmault
2024-09-20 19:03 ` [bug#73393] [PATCH 2/2] services: sane-service-type: create lock path for plustek backend neox
2024-09-22  8:55   ` Adrien 'neox' Bourmault
2024-09-20 20:39 ` [bug#73391] [PATCH v2 0/2] SANE: fix a locking bug " neox
2024-09-20 20:39   ` neox [this message]
2024-09-21  8:03     ` [bug#73406] [PATCH v2 1/2] gnu: sane-backends-minimal: fix lock path " Adrien 'neox' Bourmault
2024-09-22  9:07     ` [bug#73393] " Adrien 'neox' Bourmault
2024-09-20 20:39   ` [bug#73391] [PATCH v2 2/2] services: sane-service-type: create " neox
2024-09-21  8:03     ` [bug#73406] " Adrien 'neox' Bourmault
2024-09-22  9:07     ` [bug#73393] " Adrien 'neox' Bourmault
2024-09-21  8:01   ` [bug#73406] [PATCH v2 0/2] SANE: fix a locking bug " Adrien 'neox' Bourmault
2024-09-22  9:07   ` [bug#73393] " Adrien 'neox' Bourmault
2024-09-24 18:51   ` Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bc2d915931bfd53462d5eeac7504b04b94ea2d02.1726864525.git.neox@gnu.org \
    --to=neox@gnu.org \
    --cc=73391@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).