From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] New Addons: qemu-ga 6.0.1 second try
Date: Sun, 16 Jan 2022 15:12:34 +0000 [thread overview]
Message-ID: <2F042694-8ED3-4AC9-BEF5-DFAF890BE52E@ipfire.org> (raw)
In-Reply-To: <20220114204132.29347-1-smooky@v16.de>
[-- Attachment #1: Type: text/plain, Size: 13466 bytes --]
Hello Marcel,
Thank you. This looks very good. Can’t complain.
-Michael
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> On 14 Jan 2022, at 20:41, smooky(a)v16.de wrote:
>
>>>> https://www.qemu.org/ <<<
>
> source = https://download.qemu.org/qemu-6.0.1.tar.xz
>
> Hi @ all
>
> I have the addon qemu-ga for people who virtualize IPFire and to read the status
> without having to install the whole qemu package.
> Modified following Michael's suggestions.
>
>
> Signed-off-by: Marcel Follert (Smooky) <smooky(a)v16.de>
> ---
> config/rootfiles/packages/qemu-ga | 2 +
> lfs/qemu-ga | 103 ++++++++++++++++++++++++++++++
> make.sh | 1 +
> src/initscripts/packages/qemu-ga | 38 +++++++++++
> src/paks/qemu-ga/install.sh | 34 ++++++++++
> src/paks/qemu-ga/uninstall.sh | 32 ++++++++++
> src/paks/qemu-ga/update.sh | 27 ++++++++
> 7 files changed, 237 insertions(+)
> create mode 100644 config/rootfiles/packages/qemu-ga
> create mode 100644 lfs/qemu-ga
> create mode 100755 src/initscripts/packages/qemu-ga
> create mode 100644 src/paks/qemu-ga/install.sh
> create mode 100644 src/paks/qemu-ga/uninstall.sh
> create mode 100644 src/paks/qemu-ga/update.sh
>
> diff --git a/config/rootfiles/packages/qemu-ga b/config/rootfiles/packages/qemu-ga
> new file mode 100644
> index 000000000..78f368862
> --- /dev/null
> +++ b/config/rootfiles/packages/qemu-ga
> @@ -0,0 +1,2 @@
> +usr/bin/qemu-ga
> +etc/rc.d/init.d/qemu-ga
> diff --git a/lfs/qemu-ga b/lfs/qemu-ga
> new file mode 100644
> index 000000000..791c5b4c1
> --- /dev/null
> +++ b/lfs/qemu-ga
> @@ -0,0 +1,103 @@
> +###############################################################################
> +# #
> +# IPFire.org - A linux based firewall #
> +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
> +# #
> +# This program is free software: you can redistribute it and/or modify #
> +# it under the terms of the GNU General Public License as published by #
> +# the Free Software Foundation, either version 3 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# This program is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
> +# GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with this program. If not, see <http://www.gnu.org/licenses/>. #
> +# #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER = 6.0.1
> +
> +THISAPP = qemu-$(VER)
> +DL_FILE = $(THISAPP).tar.xz
> +DL_FROM = $(URL_IPFIRE)
> +DIR_APP = $(DIR_SRC)/$(THISAPP)
> +TARGET = $(DIR_INFO)/$(THISAPP)
> +SUP_ARCH = x86_64 aarch64
> +PROG = qemu-ga
> +PAK_VER = 1
> +
> +DEPS =
> +
> +TARGETS =
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_MD5 = 10c651469e07844523995e2c980a4fdb
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +md5 : $(subst %,%_MD5,$(objects))
> +
> +dist:
> + @$(PAK)
> +
> +###############################################################################
> +# Downloading, checking, md5sum
> +###############################################################################
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> + @$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> + @$(LOAD)
> +
> +$(subst %,%_MD5,$(objects)) :
> + @$(MD5)
> +
> +###############################################################################
> +# Installation Details
> +###############################################################################
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> + @$(PREBUILD)
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && ./configure \
> + --prefix=/usr \
> + --sysconfdir=/etc \
> + --localstatedir=/var \
> + --enable-kvm \
> + --disable-attr \
> + --extra-cflags="$(CFLAGS)" \
> + --enable-spice \
> + --enable-usb-redir \
> + --enable-seccomp \
> + --disable-docs \
> + --disable-sdl
I suppose some of the other switches are quite useless here, too. But this is just something cosmetic.
> +
> + cd $(DIR_APP) && make qemu-ga $(MAKETUNING)
> + cd $(DIR_APP) && cp build/qga/qemu-ga /usr/bin
> +
> + #install initscripts
> + $(call INSTALL_INITSCRIPT,qemu-ga)
> +
> + @rm -rf $(DIR_APP)
> + @$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index e6f948ba0..fe6dc123c 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1615,6 +1615,7 @@ buildipfire() {
> lfsmake2 libcdada
> lfsmake2 pmacct
> lfsmake2 squid-asnbl
> + lfsmake2 qemu-ga
> }
>
> buildinstaller() {
> diff --git a/src/initscripts/packages/qemu-ga b/src/initscripts/packages/qemu-ga
> new file mode 100755
> index 000000000..68863f86f
> --- /dev/null
> +++ b/src/initscripts/packages/qemu-ga
> @@ -0,0 +1,38 @@
> +#!/bin/sh
> +# Begin $rc_base/init.d/qemu-guest-agent
> +
> +
> +. /etc/sysconfig/rc
> +. $rc_functions
> +
> +case "$1" in
> + start)
> + boot_mesg "Starting QEMU Guest Agent..."
> + /usr/bin/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0 -f /run/qemu-ga.pid -d
> + evaluate_retval
> + ;;
> +
> + stop)
> + boot_mesg "Stopping QEMU Guest Agent..."
> + killproc /usr/bin/qemu-ga
> + ;;
> +
> + restart)
> + $0 stop
> + sleep 3
> + $0 start
> + ;;
> +
> + status)
> + statusproc /usr/bin/qemu-ga
> + ;;
> +
> +
> + *)
> + echo "Usage: $0 {start|stop|restart|status}"
> + exit 1
> + ;;
> +esac
> +
> +
> +# End $rc_base/init.d/qemu-guest-agent
> diff --git a/src/paks/qemu-ga/install.sh b/src/paks/qemu-ga/install.sh
> new file mode 100644
> index 000000000..6980820ba
> --- /dev/null
> +++ b/src/paks/qemu-ga/install.sh
> @@ -0,0 +1,34 @@
> +#!/bin/bash
> +############################################################################
> +# #
> +# This file is part of the IPFire Firewall. #
> +# #
> +# IPFire is free software; you can redistribute it and/or modify #
> +# it under the terms of the GNU General Public License as published by #
> +# the Free Software Foundation; either version 2 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# IPFire is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
> +# GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with IPFire; if not, write to the Free Software #
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
> +# #
> +# Copyright (C) 2022 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +extract_files
> +restore_backup ${NAME}
> +
> +# add symlinks for qemu-ga
> +
> +ln -s /etc/rc.d/init.d/qemu-ga /etc/rc.d/rc0.d/K00qemu-ga
> +ln -s /etc/rc.d/init.d/qemu-ga /etc/rc.d/rc3.d/S99qemu-ga
> +ln -s /etc/rc.d/init.d/qemu-ga /etc/rc.d/rc6.d/K00qemu-ga
> +
> +start_service --background ${NAME}
> diff --git a/src/paks/qemu-ga/uninstall.sh b/src/paks/qemu-ga/uninstall.sh
> new file mode 100644
> index 000000000..cc1115b99
> --- /dev/null
> +++ b/src/paks/qemu-ga/uninstall.sh
> @@ -0,0 +1,32 @@
> +#!/bin/bash
> +############################################################################
> +# #
> +# This file is part of the IPFire Firewall. #
> +# #
> +# IPFire is free software; you can redistribute it and/or modify #
> +# it under the terms of the GNU General Public License as published by #
> +# the Free Software Foundation; either version 2 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# IPFire is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
> +# GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with IPFire; if not, write to the Free Software #
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
> +# #
> +# Copyright (C) 2022 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +stop_service ${NAME}
> +make_backup ${NAME}
> +
> +# remove symlinks
> +
> +rm -f /etc/rc.d/rc0.d/K00qemu-ga /etc/rc.d/rc3.d/S99qemu-ga /etc/rc.d/rc6.d/K00qemu-ga
> +
> +remove_files
> diff --git a/src/paks/qemu-ga/update.sh b/src/paks/qemu-ga/update.sh
> new file mode 100644
> index 000000000..ea2505f2a
> --- /dev/null
> +++ b/src/paks/qemu-ga/update.sh
> @@ -0,0 +1,27 @@
> +#!/bin/bash
> +############################################################################
> +# #
> +# This file is part of the IPFire Firewall. #
> +# #
> +# IPFire is free software; you can redistribute it and/or modify #
> +# it under the terms of the GNU General Public License as published by #
> +# the Free Software Foundation; either version 2 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# IPFire is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
> +# GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with IPFire; if not, write to the Free Software #
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
> +# #
> +# Copyright (C) 2007-2022 IPFire-Team <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +extract_backup_includes
> +./uninstall.sh
> +./install.sh
> --
> 2.33.1
>
prev parent reply other threads:[~2022-01-16 15:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 20:41 smooky
2022-01-16 15:12 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2F042694-8ED3-4AC9-BEF5-DFAF890BE52E@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox