[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#928924: user-mode-linux: xterm functionality broken due to wrong path to port-helper



Control: notforwarded -1
 
On Tue, 2019-05-14 at 14:36 +0530, Ritesh Raj Sarraf wrote:

> I submitted this fix upstream to the kernel some time ago. I don't
> recollect if the 4.19 kernel is what had it included.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed

That patch is already applied in the Debian user-mode-linux package:

debian/patches/fix-port-helper-path.patch

I noticed that the path embedded in the binary has an extra slash in it
compared to what the patch changes it to so I think the problem is that
the OS_LIB_PATH variable isn't defined correctly on amd64.

There seems to be some sort of confusion about the CONFIG_64BIT var but
it seems like the paths and variables in the sources are correct so I'm
not sure what is going on.

BTW, is it possible to do source-only uploads so that the build logs
are available on amd64, or do the versioned binaries mean no logs? If
so I think it would be good to only upload i386 binary packages so that
we get the build logs for the most used architecture.

~/linux-4.19.37 $ grep -rC1 OS_LIB_PATH 
arch/um/drivers/xterm.c-	char *argv[] = { terminal_emulator, title_switch, title, exec_switch,
arch/um/drivers/xterm.c:			 OS_LIB_PATH "/uml/port-helper", "-uml-socket",
arch/um/drivers/xterm.c-			 file, NULL };
--
arch/um/include/shared/os.h-#ifdef CONFIG_64BIT
arch/um/include/shared/os.h:#define OS_LIB_PATH	"/usr/lib64/"
arch/um/include/shared/os.h-#else
arch/um/include/shared/os.h:#define OS_LIB_PATH	"/usr/lib/"
arch/um/include/shared/os.h-#endif
--
arch/um/os-Linux/main.c-
arch/um/os-Linux/main.c:#define UML_LIB_PATH	":" OS_LIB_PATH "/uml"
arch/um/os-Linux/main.c-

~/user-mode-linux-4.19-1um $ grep -r CONFIG_64BIT
config.i386:# CONFIG_64BIT is not set
config.amd64:CONFIG_64BIT=y

-- 
bye,
pabs

https://wiki.debian.org/PaulWise

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: