From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 14 Aug 2024 12:02:28 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1seApo-009V4H-0o for lore@lore.pengutronix.de; Wed, 14 Aug 2024 12:02:28 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1seApn-0002dl-BU; Wed, 14 Aug 2024 12:02:27 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1seApj-0002dD-5D; Wed, 14 Aug 2024 12:02:23 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1seApi-000Kcc-OQ; Wed, 14 Aug 2024 12:02:22 +0200 Received: from rsc by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1seApi-002VN3-20; Wed, 14 Aug 2024 12:02:22 +0200 Date: Wed, 14 Aug 2024 12:02:22 +0200 From: Robert Schwebel To: Roland Hieber Message-ID: References: <20240814092410.518889-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240814092410.518889-1-rhi@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [DistroKit] [PATCH v4] mipsel: remove forked host-qemu rule X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Applied to next On Wed, Aug 14, 2024 at 11:24:11AM +0200, Roland Hieber wrote: > 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 > --- > The confusion continues, I forgot to include this one in v3, which was at > https://lore.distrokit.org/distrokit/20240813132050.3914043-1-rhi@pengutronix.de > However there are no changes since v1. > > 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 > -# (C) 2013 by Michael Olbrich > -# (C) 2013 by Jan Luebbe > -# > -# 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 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |