hurd: Find proper ld.so on 64bit systems
PATCH 1/1 hurd: Find proper ld.so on 64bit systems
--- util/grub.d/10_hurd.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
util/grub.d/10_hurd.in +9 -2
@@ -91,7 +91,14 @@ if ${at_least_one} ; then : ; else exit 0 fi -if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else +if test -e '/lib/ld.so.1' ; then + LD_SO=/lib/ld.so.1 +fi +if test -e '/lib/ld-x86-64.so.1' ; then + LD_SO=/lib/ld-x86-64.so.1 +fi + +if ${all_of_them} && test -n "$LD_SO" ; then : ; else gettext "Some Hurd stuff found, but not enough to boot." >&2 echo >&2 exit 1
@@ -210,7 +217,7 @@ EOF $host_ports \\ --exec-server-task='\${exec-task}' -T typed '\${root}' \\ '\$(fs-task=task-create)' $resume_task - module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' + module $LD_SO exec /hurd/exec '\$(exec-task=task-create)' } EOF
Signature · 7 lines
2.43.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Signed-off-by Samuel Thibault <[email protected]>
Samuel Thibault, le sam. 20 janv. 2024 21:10:14 +0100, a ecrit:
Quoted 36 lines
--- util/grub.d/10_hurd.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)util/grub.d/10_hurd.in +9
-2@@ -91,7 +91,14 @@ if ${at_least_one} ; then : ; else exit 0 fi -if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else +if test -e '/lib/ld.so.1' ; then + LD_SO=/lib/ld.so.1 +fi +if test -e '/lib/ld-x86-64.so.1' ; then + LD_SO=/lib/ld-x86-64.so.1 +fi + +if ${all_of_them} && test -n "$LD_SO" ; then : ; else gettext "Some Hurd stuff found, but not enough to boot." >&2 echo >&2 exit 1@@ -210,7 +217,7 @@ EOF $host_ports \\ --exec-server-task='\${exec-task}' -T typed '\${root}' \\ '\$(fs-task=task-create)' $resume_task - module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' + module $LD_SO exec /hurd/exec '\$(exec-task=task-create)' } EOFSignature · 1 line
2.43.0
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 1 line · Samuel Thibault
Signed-off-by Samuel Thibault <[email protected]>
May I ask you to repost this patch with proper commit message and added Signed-off-by?
Daniel
Quoted 25 lines
Samuel Thibault, le sam. 20 janv. 2024 21:10:14 +0100, a ecrit:
Quoted 24 lines
--- util/grub.d/10_hurd.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)util/grub.d/10_hurd.in +8
-1@@ -91,7 +91,14 @@ if ${at_least_one} ; then : ; else exit 0 fi -if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else +if test -e '/lib/ld.so.1' ; then + LD_SO=/lib/ld.so.1 +fi +if test -e '/lib/ld-x86-64.so.1' ; then + LD_SO=/lib/ld-x86-64.so.1 +fi + +if ${all_of_them} && test -n "$LD_SO" ; then : ; else gettext "Some Hurd stuff found, but not enough to boot." >&2 echo >&2 exit 1
Quoted 8 lines
util/grub.d/10_hurd.in EOF · line 222
Quoted 8 lines
util/grub.d/10_hurd.in +1
-1@@ -210,7 +217,7 @@ EOF $host_ports \\ --exec-server-task='\${exec-task}' -T typed '\${root}' \\ '\$(fs-task=task-create)' $resume_task - module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' + module $LD_SO exec /hurd/exec '\$(exec-task=task-create)' } EOF
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel