From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule
Date: Wed, 31 Jul 2024 11:14:35 +0200 [thread overview]
Message-ID: <20240731091435.2983175-2-rhi@pengutronix.de> (raw)
In-Reply-To: <20240731091435.2983175-1-rhi@pengutronix.de>
This rule was forked in commit eaf7839876093a6c34f8 (2021-07-08, Oleksij
Rempel: "platform-mipsel: add basic qemu malta support"), which has been
merged upstream in PTXdist 2023.11.0. As we are currently using PTXdist
2024.05.0, remove our outdated fork.
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=572e3440d6f8206e949c
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mipsel/rules/host-qemu.make | 244 -------------------
1 file changed, 244 deletions(-)
delete mode 100644 configs/platform-mipsel/rules/host-qemu.make
diff --git a/configs/platform-mipsel/rules/host-qemu.make b/configs/platform-mipsel/rules/host-qemu.make
deleted file mode 100644
index 8d377ffa55f8..000000000000
--- a/configs/platform-mipsel/rules/host-qemu.make
+++ /dev/null
@@ -1,244 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2012 by Bernhard Walle <bernhard@bwalle.de>
-# (C) 2013 by Michael Olbrich <m.olbrich@pengutronix.de>
-# (C) 2013 by Jan Luebbe <j.luebbe@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_QEMU) += host-qemu
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-
-HOST_QEMU_BROKEN_ICECC := \
- $(call ptx/sh, gcc -dumpversion | awk -F . '{ if ($$1*100 + $$2 < 409) print "y" }')
-
-ifeq ($(HOST_QEMU_BROKEN_ICECC),y)
-HOST_QEMU_MAKE_ENV := PTXDIST_ICECC=$(PTXDIST_ICERUN)
-endif
-HOST_QEMU_MAKE_OPT := V=$(filter 1,$(PTXDIST_VERBOSE))
-
-HOST_QEMU_TARGETS := $(PTXCONF_ARCH_STRING)
-ifndef PTXCONF_ARCH_X86_64
-ifdef PTXCONF_ARCH_X86
-HOST_QEMU_TARGETS := i386
-endif
-endif
-ifdef PTXCONF_ARCH_ARM64
-HOST_QEMU_TARGETS := aarch64
-endif
-ifdef PTXCONF_ARCH_MIPS
-ifdef PTXCONF_ENDIAN_LITTLE
-HOST_QEMU_TARGETS := mipsel
-endif
-endif
-HOST_QEMU_SYS_TARGETS := $(patsubst %,%-softmmu,$(HOST_QEMU_TARGETS))
-HOST_QEMU_USR_TARGETS := $(patsubst %,%-linux-user,$(HOST_QEMU_TARGETS))
-
-HOST_QEMU_CONF_TOOL := autoconf
-# Note: not really autoconf:
-# e.g. there is --enable-debug but not --disable-debug
-HOST_QEMU_CONF_OPT := \
- --prefix=/usr \
- --target-list=" \
- $(call ptx/ifdef, PTXCONF_HOST_QEMU_SYS,$(HOST_QEMU_SYS_TARGETS),) \
- $(call ptx/ifdef, PTXCONF_HOST_QEMU_USR,$(HOST_QEMU_USR_TARGETS),) \
- " \
- --ninja=ninja \
- --disable-download \
- --disable-sanitizers \
- --disable-tsan \
- --disable-werror \
- --enable-stack-protector \
- --with-coroutine=auto \
- --disable-plugins \
- --disable-containers \
- --audio-drv-list= \
- --block-drv-ro-whitelist= \
- --block-drv-rw-whitelist= \
- --enable-coroutine-pool \
- --disable-cfi \
- --disable-debug-mutex \
- --enable-fdt \
- --disable-fuzzing \
- --disable-lto \
- --disable-module-upgrades \
- --disable-qom-cast-debug \
- --disable-rng-none \
- --disable-strip \
- --disable-tcg-interpreter \
- --enable-trace-backends=nop \
- --tls-priority=NORMAL \
- --disable-alsa \
- --enable-attr \
- --disable-auth-pam \
- --disable-blkio \
- --disable-bochs \
- --disable-bpf \
- --disable-brlapi \
- --disable-bzip2 \
- --disable-canokey \
- --enable-cap-ng \
- --disable-capstone \
- --disable-cloop \
- --disable-cocoa \
- --disable-coreaudio \
- --disable-crypto-afalg \
- --disable-curl \
- --disable-curses \
- --disable-dmg \
- --disable-docs \
- --disable-dsound \
- --disable-fuse \
- --disable-fuse-lseek \
- --disable-gcrypt \
- --disable-gettext \
- --disable-gio \
- --disable-glusterfs \
- --disable-gnutls \
- --disable-gtk \
- --disable-gtk-clipboard \
- --disable-guest-agent \
- --disable-guest-agent-msi \
- --disable-hax \
- --disable-hvf \
- --enable-iconv \
- --disable-jack \
- --disable-keyring \
- --enable-kvm \
- --disable-l2tpv3 \
- --disable-libdaxctl \
- --disable-libdw \
- --disable-libiscsi \
- --disable-libnfs \
- --disable-libpmem \
- --disable-libssh \
- --disable-libudev \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-libusb \
- --disable-libvduse \
- --disable-linux-aio \
- --disable-linux-io-uring \
- --disable-live-block-migration \
- --disable-lzfse \
- --disable-lzo \
- --enable-malloc-trim \
- --enable-membarrier \
- --disable-mpath \
- --enable-multiprocess \
- --disable-netmap \
- --disable-nettle \
- --disable-numa \
- --disable-nvmm \
- --disable-opengl \
- --disable-oss \
- --disable-pa \
- --disable-pipewire \
- --disable-parallels \
- --disable-png \
- --disable-pvrdma \
- --disable-qcow1 \
- --disable-qed \
- --disable-qga-vss \
- --disable-rbd \
- --disable-rdma \
- --disable-replication \
- --disable-sdl \
- --disable-sdl-image \
- --disable-seccomp \
- --disable-selinux \
- --enable-slirp \
- --disable-slirp-smbd \
- --disable-smartcard \
- --disable-snappy \
- --disable-sndio \
- --disable-sparse \
- --disable-spice \
- --disable-spice-protocol \
- --enable-tcg \
- --disable-tools \
- --disable-tpm \
- --disable-u2f \
- --disable-usb-redir \
- --disable-vdi \
- --disable-vduse-blk-export \
- --disable-vfio-user-server \
- --disable-vhost-crypto \
- --enable-vhost-kernel \
- --enable-vhost-net \
- --disable-vhost-user \
- --disable-vhost-user-blk-server \
- --disable-vhost-vdpa \
- --disable-virglrenderer \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \
- --disable-vmnet \
- --disable-vnc \
- --disable-vnc-jpeg \
- --disable-vnc-sasl \
- --disable-vte \
- --disable-vvfat \
- --disable-whpx \
- --disable-xen \
- --disable-xen-pci-passthrough \
- --disable-xkbcommon \
- --disable-zstd \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-system \
- --disable-user \
- --$(call ptx/endis, PTXCONF_HOST_QEMU_USR)-linux-user \
- --disable-bsd-user \
- --enable-pie \
- --disable-modules \
- --disable-debug-tcg \
- --disable-debug-info \
- --disable-safe-stack
-
-# Use '=' to delay $(shell ...) calls until this is needed
-QEMU_CROSS_QEMU = $(call ptx/get-alternative, config/qemu, qemu-cross)
-QEMU_CROSS_DL = $(shell ptxd_cross_cc_v | sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p')
-QEMU_CROSS_TOOLEXECLIBDIR = $(shell dirname $$(realpath $$(ptxd_cross_cc -print-file-name=libatomic.so 2> /dev/null)))
-QEMU_CROSS_LD_LIBRARY_PATH = $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(QEMU_CROSS_TOOLEXECLIBDIR):$(SYSROOT)/lib:$(SYSROOT)/usr/lib
-
-QEMU_CROSS_QEMU_ENV = \
- QEMU="$(PTXDIST_SYSROOT_HOST)/usr/bin/qemu-$(HOST_QEMU_TARGETS)" \
- KERNEL_VERSION="$(KERNEL_VERSION)" \
- QEMU_LD_PREFIX="$(PTXDIST_SYSROOT_TOOLCHAIN)" \
- QEMU_LD_LIBRARY_PATH="$(QEMU_CROSS_LD_LIBRARY_PATH)" \
- LINKER="$(shell readlink -f "$$(ptxd_cross_cc -print-file-name=$$(ptxd_get_dl))")"
-
-$(STATEDIR)/host-qemu.install:
- @$(call targetinfo)
- @$(call world/install, HOST_QEMU)
-ifdef PTXCONF_HOST_QEMU_SYS
-# # necessary for qemu to find its ROM files
- @ln -vsf share/qemu $(HOST_QEMU_PKGDIR)/usr/pc-bios
-endif
- @$(call touch)
-
-$(STATEDIR)/host-qemu.install.post:
- @$(call targetinfo)
- @$(call world/install.post, HOST_QEMU)
-ifdef PTXCONF_HOST_QEMU_USR
- @$(QEMU_CROSS_QEMU_ENV) ptxd_replace_magic $(QEMU_CROSS_QEMU) > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross
- @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross
- @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/
- @sed \
- -e 's|RTLDLIST=.*|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)$(QEMU_CROSS_DL)"|' \
- -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross -E "$${add_env// /,}"|' \
- -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu-cross |' \
- -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_TOPDIR)/bin/bash)|' \
- $(PTXDIST_SYSROOT_TOOLCHAIN)/usr/bin/ldd > $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd
- @chmod +x $(PTXDIST_SYSROOT_CROSS)/usr/bin/qemu/ldd
-endif
- @$(call touch)
-
-# vim: syntax=make
--
2.39.2
next prev parent reply other threads:[~2024-07-31 9:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31 9:14 ` Roland Hieber [this message]
2024-07-31 11:42 ` Robert Schwebel
2024-07-31 12:07 ` Alexander Dahl
2024-07-31 12:10 ` Michael Olbrich
2024-07-31 12:23 ` Roland Hieber
2024-07-31 12:33 ` Robert Schwebel
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
2024-08-08 13:41 ` Michael Olbrich
2024-08-13 13:23 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-08 12:32 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
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=20240731091435.2983175-2-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/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