[bug#28281] [PATCH] gnu: Add os-prober.

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

* gnu/packages/bootloaders.scm (os-prober): New variable.
---
 gnu/packages/bootloaders.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index f66d0bb3f..57d284be6 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -395,3 +395,69 @@ also initializes the boards (RAM etc).")
 
 (define-public u-boot-odroid-c2
   (make-u-boot-package "odroid-c2" "aarch64-linux-gnu"))
+
+(define-public os-prober
+  (package
+    (name "os-prober")
+    (version "1.76")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
+                           version ".tar.xz"))
+       (sha256
+        (base32
+         "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (ice-9 ftw)     ; for ftw
+                  (ice-9 regex)   ; for string-match
+                  (srfi srfi-2)   ; for and-let*
+                  (srfi srfi-26)) ; for cut
+       #:make-flags (list "CC=gcc")
+       #:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* (find-files ".")
+               (("/usr") (assoc-ref outputs "out")))
+             (substitute* (find-files "." "50mounted-tests$")
+               (("mkdir") "mkdir -p"))
+             #t))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib"))
+                    (share (string-append out "/share")))
+               (for-each (cut install-file <> bin)
+                         (list "linux-boot-prober" "os-prober"))
+               (install-file "newns" (string-append lib "/os-prober"))
+               (install-file "common.sh" (string-append share "/os-prober"))
+               (install-file "os-probes/mounted/powerpc/20macosx"
+                             (string-append lib "/os-probes/mounted"))
+               (for-each
+                (lambda (directory)
+                  (ftw directory
+                       (lambda (file stat flag)
+                         (when (eq? flag 'regular)
+                           (and-let* ((result (or (string-match "/common/" file)
+                                                  (string-match "/x86/" file))))
+                             (install-file
+                              file (dirname
+                                    (string-append
+                                     lib "/" (substring file 0 (match:start result 0))
+                                     (substring file (1- (match:end result 0))))))))
+                         #t)))
+                (list "os-probes" "linux-boot-probes"))
+               #t))))))
+    (home-page "https://joeyh.name/code/os-prober")
+    (synopsis "Detect other operating systems")
+    (description "os-prober probes disks on the system for other operating
+systems so that they can be added to the bootloader.  It also works out how to
+boot existing GNU/Linux systems and detects what distribution is installed in
+order to add a suitable bootloader menu entry.")
+    (license license:gpl2+)))
-- 
2.13.4

[bug#28281] [PATCH] gnu: Add os-prober.

[Ludovic Courtès]

Hi!

Arun Isaac <arunisaac@systemreboot.net> skribis:

> * gnu/packages/bootloaders.scm (os-prober): New variable.

[...]

> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (lib (string-append out "/lib"))
> +                    (share (string-append out "/share")))
> +               (for-each (cut install-file <> bin)
> +                         (list "linux-boot-prober" "os-prober"))
> +               (install-file "newns" (string-append lib "/os-prober"))
> +               (install-file "common.sh" (string-append share "/os-prober"))
> +               (install-file "os-probes/mounted/powerpc/20macosx"
> +                             (string-append lib "/os-probes/mounted"))
> +               (for-each
> +                (lambda (directory)
> +                  (ftw directory
> +                       (lambda (file stat flag)
> +                         (when (eq? flag 'regular)
> +                           (and-let* ((result (or (string-match "/common/" file)
> +                                                  (string-match "/x86/" file))))
> +                             (install-file
> +                              file (dirname
> +                                    (string-append
> +                                     lib "/" (substring file 0 (match:start result 0))
> +                                     (substring file (1- (match:end result 0))))))))
> +                         #t)))

For clarity, what about (1) using ‘find-files’ instead of ‘ftw’, and (2)
separating code that builds the list of files from code that calls
‘install-file’?

So something like:

  (define (candidate-files directory)
    (find-files directory
                (lambda (file stat)
                  (and (eq? (stat:kind stat) 'regular)
                       …))))

  (for-each (lambda (file)
              (install-file file …))
            (append-map candidate-files
                        (list "os-probes" "linux-boot-probes")))

WDYT?

Ludo’.

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

> For clarity, what about (1) using ‘find-files’ instead of ‘ftw’

I started with something like that and switched to `ftw' for slightly
shorter code. But, I guess clarity is more important.

> (2) separating code that builds the list of files from code that calls
> ‘install-file’?

Sure, will do. I'll send an updated patch with both changes
incorporated.

This package is really so messed up. I don't know why they couldn't have
just provided us with a Makefile for installation. Sigh...

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

* gnu/packages/bootloaders.scm (os-prober): New variable.
---
 gnu/packages/bootloaders.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index f66d0bb3f..613537a5d 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -395,3 +395,72 @@ also initializes the boards (RAM etc).")
 
 (define-public u-boot-odroid-c2
   (make-u-boot-package "odroid-c2" "aarch64-linux-gnu"))
+
+(define-public os-prober
+  (package
+    (name "os-prober")
+    (version "1.76")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_"
+                           version ".tar.xz"))
+       (sha256
+        (base32
+         "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (ice-9 regex)   ; for string-match
+                  (srfi srfi-26)) ; for cut
+       #:make-flags (list "CC=gcc")
+       #:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* (find-files ".")
+               (("/usr") (assoc-ref outputs "out")))
+             (substitute* (find-files "." "50mounted-tests$")
+               (("mkdir") "mkdir -p"))
+             #t))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (define (find-files-non-recursive directory)
+               (find-files directory
+                           (lambda (file stat)
+                             (string-match (string-append "^" directory "/[^/]*$")
+                                           file))
+                           #:directories? #t))
+
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib"))
+                    (share (string-append out "/share")))
+               (for-each (cut install-file <> bin)
+                         (list "linux-boot-prober" "os-prober"))
+               (install-file "newns" (string-append lib "/os-prober"))
+               (install-file "common.sh" (string-append share "/os-prober"))
+               (install-file "os-probes/mounted/powerpc/20macosx"
+                             (string-append lib "/os-probes/mounted"))
+               (for-each
+                (lambda (directory)
+                  (for-each
+                   (lambda (file)
+                     (let ((destination (string-append lib "/" directory
+                                                       "/" (basename file))))
+                       (mkdir-p (dirname destination))
+                       (copy-recursively file destination)))
+                   (append (find-files-non-recursive (string-append directory "/common"))
+                           (find-files-non-recursive (string-append directory "/x86")))))
+                (list "os-probes" "os-probes/mounted" "os-probes/init"
+                      "linux-boot-probes" "linux-boot-probes/mounted"))
+               #t))))))
+    (home-page "https://joeyh.name/code/os-prober")
+    (synopsis "Detect other operating systems")
+    (description "os-prober probes disks on the system for other operating
+systems so that they can be added to the bootloader.  It also works out how to
+boot existing GNU/Linux systems and detects what distribution is installed in
+order to add a suitable bootloader menu entry.")
+    (license license:gpl2+)))
-- 
2.14.1

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

Here's an updated patch.

> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (define (find-files-non-recursive directory)
> +               (find-files directory
> +                           (lambda (file stat)
> +                             (string-match (string-append "^" directory "/[^/]*$")
> +                                           file))
> +                           #:directories? #t))

Do you think it would be a good idea to add a #:recursive? keyword
argument to `find-files' in (guix build utils), instead of creating this
`find-files-non-recursive-function' here?

> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (lib (string-append out "/lib"))
> +                    (share (string-append out "/share")))
> +               (for-each (cut install-file <> bin)
> +                         (list "linux-boot-prober" "os-prober"))
> +               (install-file "newns" (string-append lib "/os-prober"))
> +               (install-file "common.sh" (string-append share "/os-prober"))
> +               (install-file "os-probes/mounted/powerpc/20macosx"
> +                             (string-append lib "/os-probes/mounted"))
> +               (for-each
> +                (lambda (directory)
> +                  (for-each
> +                   (lambda (file)
> +                     (let ((destination (string-append lib "/" directory
> +                                                       "/" (basename file))))
> +                       (mkdir-p (dirname destination))
> +                       (copy-recursively file destination)))
> +                   (append (find-files-non-recursive (string-append directory "/common"))
> +                           (find-files-non-recursive (string-append directory "/x86")))))
> +                (list "os-probes" "os-probes/mounted" "os-probes/init"
> +                      "linux-boot-probes" "linux-boot-probes/mounted"))
> +               #t))))))

I have used `find-files' instead of `ftw', as you suggested. The install
procedure is clearer now. but still remains quite messy. It is not
simple enough to separate the "candidate-files" and "install-file"
logic.

WDYT? Will the above code do?

[bug#28281] [PATCH] gnu: Add os-prober.

[Ludovic Courtès]

Heya,

Arun Isaac <arunisaac@systemreboot.net> skribis:

> Here's an updated patch.
>
>> +         (replace 'install
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             (define (find-files-non-recursive directory)
>> +               (find-files directory
>> +                           (lambda (file stat)
>> +                             (string-match (string-append "^" directory "/[^/]*$")
>> +                                           file))
>> +                           #:directories? #t))
>
> Do you think it would be a good idea to add a #:recursive? keyword
> argument to `find-files' in (guix build utils), instead of creating this
> `find-files-non-recursive-function' here?

Hmm I didn’t understand that it *had* to be non-recursive.  Does it
really make a difference?

If it does, then ‘scandir’ from (ice-9 ftw) would be the thing.  Sorry
if I led you in the wrong direction.  :-/

>> +             (let* ((out (assoc-ref outputs "out"))
>> +                    (bin (string-append out "/bin"))
>> +                    (lib (string-append out "/lib"))
>> +                    (share (string-append out "/share")))
>> +               (for-each (cut install-file <> bin)
>> +                         (list "linux-boot-prober" "os-prober"))
>> +               (install-file "newns" (string-append lib "/os-prober"))
>> +               (install-file "common.sh" (string-append share "/os-prober"))
>> +               (install-file "os-probes/mounted/powerpc/20macosx"
>> +                             (string-append lib "/os-probes/mounted"))
>> +               (for-each
>> +                (lambda (directory)
>> +                  (for-each
>> +                   (lambda (file)
>> +                     (let ((destination (string-append lib "/" directory
>> +                                                       "/" (basename file))))
>> +                       (mkdir-p (dirname destination))
>> +                       (copy-recursively file destination)))
>> +                   (append (find-files-non-recursive (string-append directory "/common"))
>> +                           (find-files-non-recursive (string-append directory "/x86")))))
>> +                (list "os-probes" "os-probes/mounted" "os-probes/init"
>> +                      "linux-boot-probes" "linux-boot-probes/mounted"))
>> +               #t))))))
>
> I have used `find-files' instead of `ftw', as you suggested. The install
> procedure is clearer now. but still remains quite messy. It is not
> simple enough to separate the "candidate-files" and "install-file"
> logic.
>
> WDYT? Will the above code do?

Sure.  I mean, we should try our best to make things clearer, while not
losing our hairs on it.  Sometimes it just has to be messy.

Thanks,
Ludo’.

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

>>> +         (replace 'install
>>> +           (lambda* (#:key outputs #:allow-other-keys)
>>> +             (define (find-files-non-recursive directory)
>>> +               (find-files directory
>>> +                           (lambda (file stat)
>>> +                             (string-match (string-append "^" directory "/[^/]*$")
>>> +                                           file))
>>> +                           #:directories? #t))
>>
>> Do you think it would be a good idea to add a #:recursive? keyword
>> argument to `find-files' in (guix build utils), instead of creating this
>> `find-files-non-recursive-function' here?
>
> Hmm I didn’t understand that it *had* to be non-recursive.  Does it
> really make a difference?

I am trying to do

cp -r /some/directory/* destination

To do this, I used `find-files-non-recursive' to get all files in
/some/directory/ and applied `copy-recursively' on each one of them.

Do you have a better way of doing this in mind?

> If it does, then ‘scandir’ from (ice-9 ftw) would be the thing.  Sorry
> if I led you in the wrong direction.  :-/

Yes, scandir could be used. But, it also returns "." and "..", and I'll
have to filter them out. So code length, or clarity-wise, it won't be
much of an improvement. That is why I thought adding a #:recursive?
argument to `find-files' would be nice.

>>> +             (let* ((out (assoc-ref outputs "out"))
>>> +                    (bin (string-append out "/bin"))
>>> +                    (lib (string-append out "/lib"))
>>> +                    (share (string-append out "/share")))
>>> +               (for-each (cut install-file <> bin)
>>> +                         (list "linux-boot-prober" "os-prober"))
>>> +               (install-file "newns" (string-append lib "/os-prober"))
>>> +               (install-file "common.sh" (string-append share "/os-prober"))
>>> +               (install-file "os-probes/mounted/powerpc/20macosx"
>>> +                             (string-append lib "/os-probes/mounted"))
>>> +               (for-each
>>> +                (lambda (directory)
>>> +                  (for-each
>>> +                   (lambda (file)
>>> +                     (let ((destination (string-append lib "/" directory
>>> +                                                       "/" (basename file))))
>>> +                       (mkdir-p (dirname destination))
>>> +                       (copy-recursively file destination)))
>>> +                   (append (find-files-non-recursive (string-append directory "/common"))
>>> +                           (find-files-non-recursive (string-append directory "/x86")))))
>>> +                (list "os-probes" "os-probes/mounted" "os-probes/init"
>>> +                      "linux-boot-probes" "linux-boot-probes/mounted"))
>>> +               #t))))))

[bug#28281] [PATCH] gnu: Add os-prober.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

>>>> +         (replace 'install
>>>> +           (lambda* (#:key outputs #:allow-other-keys)
>>>> +             (define (find-files-non-recursive directory)
>>>> +               (find-files directory
>>>> +                           (lambda (file stat)
>>>> +                             (string-match (string-append "^" directory "/[^/]*$")
>>>> +                                           file))
>>>> +                           #:directories? #t))
>>>
>>> Do you think it would be a good idea to add a #:recursive? keyword
>>> argument to `find-files' in (guix build utils), instead of creating this
>>> `find-files-non-recursive-function' here?
>>
>> Hmm I didn’t understand that it *had* to be non-recursive.  Does it
>> really make a difference?
>
> I am trying to do
>
> cp -r /some/directory/* destination
>
> To do this, I used `find-files-non-recursive' to get all files in
> /some/directory/ and applied `copy-recursively' on each one of them.
>
> Do you have a better way of doing this in mind?

Would (copy-recursively "/some/directory" destination) work for you?

>> If it does, then ‘scandir’ from (ice-9 ftw) would be the thing.  Sorry
>> if I led you in the wrong direction.  :-/
>
> Yes, scandir could be used. But, it also returns "." and "..", and I'll
> have to filter them out. So code length, or clarity-wise, it won't be
> much of an improvement. That is why I thought adding a #:recursive?
> argument to `find-files' would be nice.

Yeah, looks like none of the options is a perfect match.

HTH,
LUdo’.

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

>> I am trying to do
>>
>> cp -r /some/directory/* destination
>>
>> To do this, I used `find-files-non-recursive' to get all files in
>> /some/directory/ and applied `copy-recursively' on each one of them.
>>
>> Do you have a better way of doing this in mind?
>
> Would (copy-recursively "/some/directory" destination) work for you?

No, it wouldn't. That would recreate /some/directory at the
destination. I only want the files inside /some/directory to be copied,
not /some/directory itself.

[bug#28281] [PATCH] gnu: Add os-prober.

[Ludovic Courtès]

Hi Arun,

Arun Isaac <arunisaac@systemreboot.net> skribis:

>>> I am trying to do
>>>
>>> cp -r /some/directory/* destination
>>>
>>> To do this, I used `find-files-non-recursive' to get all files in
>>> /some/directory/ and applied `copy-recursively' on each one of them.
>>>
>>> Do you have a better way of doing this in mind?
>>
>> Would (copy-recursively "/some/directory" destination) work for you?
>
> No, it wouldn't. That would recreate /some/directory at the
> destination. I only want the files inside /some/directory to be copied,
> not /some/directory itself.

Ah sorry.  Then yeah, either ‘scandir’ or ‘find-files’, whichever you
find is the least cumbersome.

Feel free to push something along these lines!

Ludo’.

[bug#28281] [PATCH] gnu: Add os-prober.

[Arun Isaac]

>>> Would (copy-recursively "/some/directory" destination) work for you?
>>
>> No, it wouldn't. That would recreate /some/directory at the
>> destination. I only want the files inside /some/directory to be copied,
>> not /some/directory itself.
>
> Ah sorry.  Then yeah, either ‘scandir’ or ‘find-files’, whichever you
> find is the least cumbersome.
>
> Feel free to push something along these lines!

Not sure I follow you. Should I

1. push the patch I sent most recently

OR

2. or add a #:recursive? argument to `find-files', and push a patch
which uses this new `find-files'?

IMO, approach 2 is a better idea, though it could be that we are adding
too many keyword arguments to `find-files'.

WDYT?

[bug#28281] [PATCH] gnu: Add os-prober.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

>>>> Would (copy-recursively "/some/directory" destination) work for you?
>>>
>>> No, it wouldn't. That would recreate /some/directory at the
>>> destination. I only want the files inside /some/directory to be copied,
>>> not /some/directory itself.
>>
>> Ah sorry.  Then yeah, either ‘scandir’ or ‘find-files’, whichever you
>> find is the least cumbersome.
>>
>> Feel free to push something along these lines!
>
> Not sure I follow you. Should I
>
> 1. push the patch I sent most recently
>
> OR
>
> 2. or add a #:recursive? argument to `find-files', and push a patch
> which uses this new `find-files'?
>
> IMO, approach 2 is a better idea, though it could be that we are adding
> too many keyword arguments to `find-files'.
>
> WDYT?

I’m for approach #1, go for it!  :-)

Approach #2 would take a full rebuild, and it would make ‘find-files’
equivalent to ‘scandir’, so not worth it IMO.

Sorry for being unclear!

Ludo’.

bug#28281: [PATCH] gnu: Add os-prober.

[Arun Isaac]

>> Should I
>>
>> 1. push the patch I sent most recently
>>
>> OR
>>
>> 2. or add a #:recursive? argument to `find-files', and push a patch
>> which uses this new `find-files'?
>>
>> IMO, approach 2 is a better idea, though it could be that we are adding
>> too many keyword arguments to `find-files'.
>>
>> WDYT?
>
> I’m for approach #1, go for it!  :-)

Ok, pushed!