diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-10-02 20:19:37 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-10-02 20:19:37 +0000 |
commit | 1864aa5ee2e6424d12b71c9ce5e165dfdd4bf32b (patch) | |
tree | 1367a5f8e8af7d564b4176c37caceb3fcc2e8b9b /emulators/qemu-sbruno/files | |
parent | Clean up MASTER_SITES and point to Web Archive version of the homepage (diff) |
Remove expired ports:
2020-09-30 audio/zinf: Does not build, no upstream
2020-10-01 emulators/qemu-sbruno: Port will be removed in favor of emulators/qemu
Notes
Notes:
svn path=/head/; revision=551231
Diffstat (limited to 'emulators/qemu-sbruno/files')
-rw-r--r-- | emulators/qemu-sbruno/files/cdrom-dma-patch | 11 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/patch-Makefile | 51 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/patch-configure | 74 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/patch-include_net_net.h | 13 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/patch-qemu-doc.texi | 12 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/qemu-ifdown.sample | 2 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/qemu-ifup.sample | 2 | ||||
-rw-r--r-- | emulators/qemu-sbruno/files/qemu_user_static.in | 164 |
8 files changed, 0 insertions, 329 deletions
diff --git a/emulators/qemu-sbruno/files/cdrom-dma-patch b/emulators/qemu-sbruno/files/cdrom-dma-patch deleted file mode 100644 index 7dd27fe73e0d..000000000000 --- a/emulators/qemu-sbruno/files/cdrom-dma-patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/hw/ide/internal.h.orig 2017-11-19 18:54:05.000000000 -0700 -+++ include/hw/ide/internal.h 2017-11-20 08:35:44.521365000 -0700 -@@ -15,7 +15,7 @@ - #include "qapi/error.h" - - /* debug IDE devices */ --#define USE_DMA_CDROM -+// #define USE_DMA_CDROM - - typedef struct IDEBus IDEBus; - typedef struct IDEDevice IDEDevice; diff --git a/emulators/qemu-sbruno/files/patch-Makefile b/emulators/qemu-sbruno/files/patch-Makefile deleted file mode 100644 index 2fc427ab1176..000000000000 --- a/emulators/qemu-sbruno/files/patch-Makefile +++ /dev/null @@ -1,51 +0,0 @@ ---- Makefile.orig 2018-02-08 19:22:54 UTC -+++ Makefile -@@ -281,9 +281,13 @@ LIBS+=-lz $(LIBS_TOOLS) - HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) - - ifdef BUILD_DOCS -+ifdef NOPORTDOCS -+DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 -+else - DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 - DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 - DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 -+endif - DOCS+=docs/qemu-block-drivers.7 - ifdef CONFIG_VIRTFS - DOCS+=fsdev/virtfs-proxy-helper.1 -@@ -669,16 +673,20 @@ endif - - install-doc: $(DOCS) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" -+ifndef NOPORTDOCS - $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" -+endif - ifdef CONFIG_POSIX - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" -+ifndef NOPORTDOCS - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" -+endif - ifneq ($(TOOLS),) - $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -@@ -686,11 +694,13 @@ ifneq ($(TOOLS),) - endif - ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" -+ifndef NOPORTDOCS - $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" - endif - endif -+endif - ifdef CONFIG_VIRTFS - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) fsdev/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1" diff --git a/emulators/qemu-sbruno/files/patch-configure b/emulators/qemu-sbruno/files/patch-configure deleted file mode 100644 index 5fac68a9cc9f..000000000000 --- a/emulators/qemu-sbruno/files/patch-configure +++ /dev/null @@ -1,74 +0,0 @@ ---- configure.orig 2019-12-12 02:59:10 UTC -+++ configure -@@ -3261,10 +3261,10 @@ fi - # curses probe - if test "$curses" != "no" ; then - if test "$mingw32" = "yes" ; then -- curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):" -+ curses_inc_list="$($pkg_config --cflags-only-I ncurses 2>/dev/null):" - curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses" - else -- curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:" -+ curses_inc_list="$($pkg_config --cflags-only-I ncursesw 2>/dev/null):-I/usr/include/ncursesw:" - curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" - fi - curses_found=no -@@ -3381,7 +3381,7 @@ for i in $glib_modules; do - glib_libs=$($pkg_config --libs $i) - QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" - LIBS="$glib_libs $LIBS" -- libs_qga="$glib_libs $libs_qga" -+ libs_qga="$glib_libs -lintl $libs_qga" - else - error_exit "glib-$glib_req_ver $i is required to compile QEMU" - fi -@@ -5517,27 +5517,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] - cat > $TMPC <<EOF - int main(void) { return 0; } - EOF -- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ textseg_ldflags="-Wl,--image-base=$textseg_addr" - if ! compile_prog "" "$textseg_ldflags"; then -- # In case ld does not support -Ttext-segment, edit the default linker -- # script via sed to set the .text start addr. This is needed on FreeBSD -- # at least. -- if ! $ld --verbose >/dev/null 2>&1; then -- error_exit \ -- "We need to link the QEMU user mode binaries at a" \ -- "specific text address. Unfortunately your linker" \ -- "doesn't support either the -Ttext-segment option or" \ -- "printing the default linker script with --verbose." \ -- "If you don't want the user mode binaries, pass the" \ -- "--disable-user option to configure." -- fi -+ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" -+ if ! compile_prog "" "$textseg_ldflags"; then -+ # In case ld does not support -Ttext-segment, edit the default linker -+ # script via sed to set the .text start addr. This is needed on FreeBSD -+ # at least. -+ if ! $ld --verbose >/dev/null 2>&1; then -+ error_exit \ -+ "We need to link the QEMU user mode binaries at a" \ -+ "specific text address. Unfortunately your linker" \ -+ "doesn't support either the -Ttext-segment option or" \ -+ "printing the default linker script with --verbose." \ -+ "If you don't want the user mode binaries, pass the" \ -+ "--disable-user option to configure." -+ fi - -- $ld --verbose | sed \ -- -e '1,/==================================================/d' \ -- -e '/==================================================/,$d' \ -- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -- textseg_ldflags="-Wl,-T../config-host.ld" -+ $ld --verbose | sed \ -+ -e '1,/==================================================/d' \ -+ -e '/==================================================/,$d' \ -+ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ -+ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld -+ textseg_ldflags="-Wl,-T../config-host.ld" -+ fi - fi - fi - fi diff --git a/emulators/qemu-sbruno/files/patch-include_net_net.h b/emulators/qemu-sbruno/files/patch-include_net_net.h deleted file mode 100644 index c78708df3435..000000000000 --- a/emulators/qemu-sbruno/files/patch-include_net_net.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/net/net.h.orig 2018-02-08 19:22:54 UTC -+++ include/net/net.h -@@ -220,8 +220,8 @@ void qmp_netdev_add(QDict *qdict, QObjec - int net_hub_id_for_client(NetClientState *nc, int *id); - NetClientState *net_hub_port_find(int hub_id); - --#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" --#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" -+#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" -+#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" - #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper" - #define DEFAULT_BRIDGE_INTERFACE "br0" - diff --git a/emulators/qemu-sbruno/files/patch-qemu-doc.texi b/emulators/qemu-sbruno/files/patch-qemu-doc.texi deleted file mode 100644 index 5c202289902c..000000000000 --- a/emulators/qemu-sbruno/files/patch-qemu-doc.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- qemu-doc.texi.orig 2018-02-08 19:22:54 UTC -+++ qemu-doc.texi -@@ -556,7 +556,8 @@ Send the escape character to the fronten - - @c man begin SEEALSO - The HTML documentation of QEMU for more precise information and Linux --user mode emulator invocation. -+user mode emulator invocation, as well as the FreeBSD host notes in -+@file{pkg-message} in the relevant qemu port directory. - @c man end - - @c man begin AUTHOR diff --git a/emulators/qemu-sbruno/files/qemu-ifdown.sample b/emulators/qemu-sbruno/files/qemu-ifdown.sample deleted file mode 100644 index 89d9a9bff436..000000000000 --- a/emulators/qemu-sbruno/files/qemu-ifdown.sample +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec true diff --git a/emulators/qemu-sbruno/files/qemu-ifup.sample b/emulators/qemu-sbruno/files/qemu-ifup.sample deleted file mode 100644 index 89d9a9bff436..000000000000 --- a/emulators/qemu-sbruno/files/qemu-ifup.sample +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec true diff --git a/emulators/qemu-sbruno/files/qemu_user_static.in b/emulators/qemu-sbruno/files/qemu_user_static.in deleted file mode 100644 index 4022421f8963..000000000000 --- a/emulators/qemu-sbruno/files/qemu_user_static.in +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: %%NAME%% -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable `%%NAME%%': -# -# %%NAME%%_enable="YES" -# - -. /etc/rc.subr - -name=%%NAME%% -rcvar=%%NAME%%_enable - -# read configuration and set defaults -load_rc_config "$name" - -: ${%%NAME%%_enable:="NO"} - -BINMISCCTL=/usr/sbin/binmiscctl -QEMU_DIR=%%PREFIX%%/bin -QEMU_PREFIX=qemu- -QEMU_SUFFIX=-static - -start_cmd=%%NAME%%_start -stop_cmd=%%NAME%%_stop -extra_commands=list -list_cmd="${BINMISCCTL} list" - -%%NAME%%_start() -{ - # register arm interpreter styled 'arm' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add arm --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register armv6 interpreter styled 'arm' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add armv6 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register armv7 interpreter styled 'arm' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}arm${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add armv7 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register aarch64 interpreter styled 'aarch64' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}aarch64${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add aarch64 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register mips interpreter styled 'mips' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}mips${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add mips --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register mipsle interpreter styled 'mipsel' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}mipsel${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add mipsel --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register mips64 interpreter styled 'mips64' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}mips64${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add mips64 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register powerpc interpreter styled 'ppc' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}ppc${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add powerpc --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register powerpc64 interpreter styled 'ppc64' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}ppc64${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add powerpc64 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register riscv64 interpreter styled 'riscv64' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}riscv64${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add riscv64 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi - # register sparc64 interpreter styled 'sparc64' - interpreter=${QEMU_DIR}/${QEMU_PREFIX}sparc64${QEMU_SUFFIX} - if [ -x "${interpreter}" ]; then - ${BINMISCCTL} add sparc64 --interpreter "${interpreter}" \ - --magic "\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b" \ - --mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff" \ - --size 20 --set-enabled - else - echo "$0: interpreter ${interpreter} not found, cannot register." - fi -} - -%%NAME%%_stop() -{ - ${BINMISCCTL} remove arm - ${BINMISCCTL} remove armv6 - ${BINMISCCTL} remove armv7 - ${BINMISCCTL} remove aarch64 - ${BINMISCCTL} remove mips - ${BINMISCCTL} remove mips64 - ${BINMISCCTL} remove mipsel - ${BINMISCCTL} remove powerpc - ${BINMISCCTL} remove powerpc64 - ${BINMISCCTL} remove riscv64 - ${BINMISCCTL} remove sparc64 -} - -run_rc_command "$1" |