[bug#29404] [PATCH] bootloader: extlinux: Fix device tree path.

[bug#29404] [PATCH] bootloader: extlinux: Fix device tree path.

[Mathieu Othacehe]

* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Use kernel
  directory to format device tree file path.
---
 gnu/bootloader/extlinux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
index e5fdeb580..0db5598fc 100644
--- a/gnu/bootloader/extlinux.scm
+++ b/gnu/bootloader/extlinux.scm
@@ -53,7 +53,7 @@ corresponding to old generations of the system."
   APPEND ~a
 ~%"
                 #$label #$label
-                #$kernel #$kernel #$initrd
+                #$kernel (dirname #$kernel) #$initrd
                 (string-join (list #$@kernel-arguments)))))
 
   (define builder
-- 
2.15.0

[bug#29404] [PATCH] bootloader: extlinux: Fix device tree path.

[Ludovic Courtès]

Hello!

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Use kernel
>   directory to format device tree file path.
> ---
>  gnu/bootloader/extlinux.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
> index e5fdeb580..0db5598fc 100644
> --- a/gnu/bootloader/extlinux.scm
> +++ b/gnu/bootloader/extlinux.scm
> @@ -53,7 +53,7 @@ corresponding to old generations of the system."
>    APPEND ~a
>  ~%"
>                  #$label #$label
> -                #$kernel #$kernel #$initrd
> +                #$kernel (dirname #$kernel) #$initrd

What was wrong previously?  How does this affect the
“installed-extlinux-os” test?

If you’re confident that’s fine with me, but I’m just curious.  :-)

Thanks,
Ludo’.

[bug#29404] [PATCH] bootloader: extlinux: Fix device tree path.

[Mathieu Othacehe]

Hi Ludo !

> What was wrong previously?  How does this affect the
> “installed-extlinux-os” test?

The issue was FDTDIR was set to /gnu/store/...-linux/bzImage/lib/dtbs
instead of /gnu/store/...-linux/lib/dtbs. This has gone unnoticed
because device tree are not used on intel architecture.

So installed-extlinux-os must behave exactly the same because FDTDIR is
ignored.

Thanks for reviewing :)

Mathieu

[bug#29404] [PATCH] bootloader: extlinux: Fix device tree path.

[Ludovic Courtès]

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

>> What was wrong previously?  How does this affect the
>> “installed-extlinux-os” test?
>
> The issue was FDTDIR was set to /gnu/store/...-linux/bzImage/lib/dtbs
> instead of /gnu/store/...-linux/lib/dtbs. This has gone unnoticed
> because device tree are not used on intel architecture.
>
> So installed-extlinux-os must behave exactly the same because FDTDIR is
> ignored.

Got it, makes perfect sense.

Thank you!

Ludo’.

[bug#29404] [PATCH] bootloader: extlinux: Fix device tree path.

[Danny Milosavljevic]

LGTM!