On Mon, Feb 15, 2021 at 06:24:46PM +0100, Ludovic Courtès wrote: > Gash-Utils ‘uname’ seems to be confused: > > --8<---------------cut here---------------start------------->8--- > $ $(guix build -e '(@@ (gnu packages commencement) > gash-utils-boot)')/bin/uname -a > Linux ribbon 5.10.10-gnu #1 SMP 1 x86_64 GNU/Linux > $ $(guix build -e '(@@ (gnu packages commencement) > gash-utils-boot)')/bin/uname -s > > $ guix describe > Generacio 175 Feb 04 2021 22:52:40 (nuna) > guix 5ae09d7 > repository URL: https://git.savannah.gnu.org/git/guix.git > branch: master > commit: 5ae09d7979a0696d862b9555314eab199f7ce576 > $ uname -s > Linux > --8<---------------cut here---------------end--------------->8--- > > Ludo’. >
The attached patch fixes it for me when I build it locally. Tested against master, with an expanded guix.scm to build multiple versions. -- Efraim Flashner <[email protected]> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
From eedd0ee769393eea3fcb9b7131d469ea15d9f179 Mon Sep 17 00:00:00 2001 From: Efraim Flashner <[email protected]> Date: Tue, 16 Feb 2021 11:50:20 +0200 Subject: [PATCH] uname: Fix uname -s. * gash/commands/uname.scm (uname): Remove duplicate kernel-name? match. --- gash/commands/uname.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gash/commands/uname.scm b/gash/commands/uname.scm index 2a89c6a..fa15c69 100644 --- a/gash/commands/uname.scm +++ b/gash/commands/uname.scm @@ -49,7 +49,6 @@ (processor? (option-ref options 'processor #f)) (hardware-platform? (option-ref options 'hardware-platform #f)) (operating-system? (option-ref options 'operating-system #f)) - (kernel-name? (not (or all? kernel-name? node-name? kernel-release? kernel-version? machine? processor? hardware-platform? operating-system?))) (help? (option-ref options 'help #f)) (version? (option-ref options 'version #f)) -- 2.30.1
signature.asc
Description: PGP signature
