jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 06:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix qemu agent 4.2.0 (#646)

Browse Source
This commit is contained in:
Pascal Vizeli 2020-04-29 22:09:47 +02:00 committed by GitHub
parent 517abe0ea9
commit f0b5be41fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk
View File

@ -19,14 +19,15 @@ QEMU_GUEST_AGENT_DEPENDENCIES = host-pkgconf libglib2 zlib
# not automatically pulled. :-( # not automatically pulled. :-(
QEMU_GUEST_AGENT_LIBS = -lrt -lm QEMU_GUEST_AGENT_LIBS = -lrt -lm
QEMU_GUEST_AGENT_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool QEMU_GUEST_AGENT_OPTS = -lrt -lm
QEMU_GUEST_AGENT_OPTS = --enable-guest-agent QEMU_GUEST_AGENT_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool
# Override CPP, as it expects to be able to call it like it'd # Override CPP, as it expects to be able to call it like it'd
# call the compiler. # call the compiler.
define QEMU_GUEST_AGENT_CONFIGURE_CMDS define QEMU_GUEST_AGENT_CONFIGURE_CMDS
( cd $(@D); \ unset TARGET_DIR; \
cd $(@D); \
LIBS='$(QEMU_GUEST_AGENT_LIBS)' \ LIBS='$(QEMU_GUEST_AGENT_LIBS)' \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_ARGS) \
@ -52,7 +53,6 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
--disable-sdl \ --disable-sdl \
--disable-system \ --disable-system \
--disable-user \ --disable-user \
--disable-guest-agent \
--disable-nettle \ --disable-nettle \
--disable-gcrypt \ --disable-gcrypt \
--disable-curses \ --disable-curses \
@ -86,17 +86,18 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
--disable-blobs \ --disable-blobs \
--disable-capstone \ --disable-capstone \
--disable-tools \ --disable-tools \
--disable-slirp \
--disable-tcg-interpreter \ --disable-tcg-interpreter \
$(QEMU_GUEST_AGENT_OPTS) \ --enable-guest-agent
)
endef endef
define QEMU_GUEST_AGENT_BUILD_CMDS define QEMU_GUEST_AGENT_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) unset TARGET_DIR; \
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) qemu-ga
endef endef
define QEMU_GUEST_AGENT_INSTALL_TARGET_CMDS define QEMU_GUEST_AGENT_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_GUEST_AGENT_MAKE_ENV) DESTDIR=$(TARGET_DIR) install $(INSTALL) -m 755 $(@D)/qemu-ga $(TARGET_DIR)/usr/libexec/
endef endef
define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD

2
buildroot-external/package/qemu-guest-agent/qemu-guest.service
View File

@ -4,7 +4,7 @@ After=syslog.target network.target
ConditionVirtualization=kvm ConditionVirtualization=kvm
[Service] [Service]
ExecStart=/usr/bin/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0 ExecStart=/usr/libexec/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0
Restart=on-failure Restart=on-failure
[Install] [Install]