mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/jailhouse: install files to /usr

Browse Source 
The jailhouse package installs files in the /usr/local prefix. This is
not convenient, because the jailhouse binary ends up in /usr/local/sbin,
which is not in the default Buildroot PATH. See [1]. Moreover, all
other Buildroot packages install files in /usr.

This is because the Buildroot package recipe does not set any prefix
value, and the upstream Jailhouse Makefile has a default to /usr/local.
See [2].

This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also
updates other installation commands to put all the files in /usr.

[1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495
[2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Julien Olivain
2024-02-10 23:26:59 +01:00
committed by Yann E. MORIN
parent 8ab4a0a348
commit e40ca97d71
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/jailhouse/jailhouse.mk
View File

@@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(KERNEL_ARCH)" \ ARCH="$(KERNEL_ARCH)" \
KDIR="$(LINUX_DIR)" \ KDIR="$(LINUX_DIR)" \
DESTDIR="$(TARGET_DIR)" DESTDIR="$(TARGET_DIR)" \
prefix=/usr
ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y)
JAILHOUSE_DEPENDENCIES += \ JAILHOUSE_DEPENDENCIES += \
@@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse
$(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos
$(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos
$(JAILHOUSE_INSTALL_HELPER_SCRIPTS) $(JAILHOUSE_INSTALL_HELPER_SCRIPTS)
endef endef