From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 05 May 2023 12:11:57 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pusPu-005pW7-2l for lore@lore.pengutronix.de; Fri, 05 May 2023 12:11:57 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pusPr-0006l7-Hd; Fri, 05 May 2023 12:11:55 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pusPk-0006hV-QU; Fri, 05 May 2023 12:11:48 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pusPk-001Gx1-4x; Fri, 05 May 2023 12:11:48 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pusPj-003TCp-AD; Fri, 05 May 2023 12:11:47 +0200 From: Michael Olbrich To: distrokit@pengutronix.de Date: Fri, 5 May 2023 12:11:43 +0200 Message-Id: <20230505101145.826813-2-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505101145.826813-1-m.olbrich@pengutronix.de> References: <20230505101145.826813-1-m.olbrich@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 1/3] ptxdist: version bump 2023.04.0 -> 2023.05.0 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: Michael Olbrich 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.ext.pengutronix.de); SAEximRunCond expanded to false - all changes in rules/at91bootstrap2.make and rules/host-qemu.make are now upstream. - update configs/platform-mipsel/rules/host-qemu.make to the latest version from upstream. It still has local changes for mips. Signed-off-by: Michael Olbrich --- configs/platform-mips/platformconfig | 5 +- configs/platform-mipsel/platformconfig | 5 +- configs/platform-mipsel/rules/host-qemu.make | 253 ++++++++++--------- configs/platform-rpi1/platformconfig | 6 +- configs/platform-v7a/platformconfig | 5 +- configs/platform-v7a_noneon/platformconfig | 5 +- configs/platform-v8a/platformconfig | 5 +- configs/platform-x86_64/platformconfig | 5 +- configs/ptxconfig | 24 +- rules/at91bootstrap2.make | 90 ------- rules/host-qemu.make | 231 ----------------- 11 files changed, 175 insertions(+), 459 deletions(-) delete mode 100644 rules/at91bootstrap2.make delete mode 100644 rules/host-qemu.make diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig index 085b9c4da94a..0aa4927b1e46 100644 --- a/configs/platform-mips/platformconfig +++ b/configs/platform-mips/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mips" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -70,6 +70,7 @@ PTXCONF_GNU_TARGET="mips-softfloat-linux-gnu" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="${PTXCONF_GNU_TARGET}" # end of toolchain # diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig index 8ffc452fa7bc..c00e76ed8183 100644 --- a/configs/platform-mipsel/platformconfig +++ b/configs/platform-mipsel/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mipsel" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -70,6 +70,7 @@ PTXCONF_GNU_TARGET="mipsel-softfloat-linux-gnu" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="${PTXCONF_GNU_TARGET}" # end of toolchain # diff --git a/configs/platform-mipsel/rules/host-qemu.make b/configs/platform-mipsel/rules/host-qemu.make index a841f4cbf4df..3e1ccbea4468 100644 --- a/configs/platform-mipsel/rules/host-qemu.make +++ b/configs/platform-mipsel/rules/host-qemu.make @@ -13,19 +13,6 @@ # HOST_PACKAGES-$(PTXCONF_HOST_QEMU) += host-qemu -# -# Paths and names -# -HOST_QEMU_VERSION := 5.2.0 -HOST_QEMU_MD5 := 179f86928835da857c237b42f4b2df73 -HOST_QEMU := qemu-$(HOST_QEMU_VERSION) -HOST_QEMU_SUFFIX := tar.xz -HOST_QEMU_URL := https://download.qemu.org/$(HOST_QEMU).$(HOST_QEMU_SUFFIX) -HOST_QEMU_SOURCE := $(SRCDIR)/$(HOST_QEMU).$(HOST_QEMU_SUFFIX) -HOST_QEMU_DIR := $(HOST_BUILDDIR)/$(HOST_QEMU) -HOST_QEMU_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND MIT AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause -HOST_QEMU_BUILD_OOT := YES - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -60,145 +47,169 @@ 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 realy autoconf: +# Note: not really autoconf: # e.g. there is --enable-debug but not --disable-debug HOST_QEMU_CONF_OPT := \ - --prefix=/. \ + --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),) \ " \ --meson=meson \ --ninja=ninja \ + --with-git-submodules=ignore \ --disable-sanitizers \ --disable-tsan \ --disable-werror \ --enable-stack-protector \ - --audio-drv-list= \ - --block-drv-rw-whitelist= \ - --block-drv-ro-whitelist= \ - --enable-trace-backends=nop \ - --disable-tcg-interpreter \ - --enable-malloc-trim \ --with-coroutine= \ - --tls-priority=NORMAL \ --disable-plugins \ --disable-containers \ - --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-system \ - --disable-user \ - --$(call ptx/endis, PTXCONF_HOST_QEMU_USR)-linux-user \ - --disable-bsd-user \ - --disable-docs \ - --disable-guest-agent \ - --disable-guest-agent-msi \ - --enable-pie \ - --disable-modules \ + --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-debug-tcg \ - --disable-debug-info \ - --disable-sparse \ - --disable-safe-stack \ - --disable-gnutls \ - --disable-nettle \ - --disable-gcrypt \ + --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-sdl \ - --disable-sdl-image \ - --disable-gtk \ - --disable-vte \ - --disable-curses \ - --enable-iconv \ - --disable-vnc \ - --disable-vnc-sasl \ - --disable-vnc-jpeg \ - --disable-vnc-png \ - --disable-cocoa \ - --enable-virtfs \ - --disable-virtiofsd \ - --disable-libudev \ - --disable-mpath \ - --disable-xen \ - --disable-xen-pci-passthrough \ + --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 \ - --enable-membarrier \ - --enable-fdt \ - --enable-kvm \ + --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 \ - --disable-whpx \ - --disable-rdma \ - --disable-pvrdma \ - --disable-netmap \ - --disable-linux-aio \ - --disable-linux-io-uring \ - --enable-cap-ng \ - --enable-attr \ - --enable-vhost-net \ - --enable-vhost-vsock \ - --enable-vhost-scsi \ - --disable-vhost-crypto \ - --enable-vhost-kernel \ - --disable-vhost-user \ - --disable-vhost-user-blk-server \ - --disable-vhost-vdpa \ - --disable-spice \ - --disable-rbd \ + --enable-iconv \ + --disable-jack \ + --disable-keyring \ + --enable-kvm \ + --disable-l2tpv3 \ + --disable-libdaxctl \ + --disable-libdw \ --disable-libiscsi \ --disable-libnfs \ - --disable-smartcard \ - --disable-u2f \ + --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-usb-redir \ - --disable-lzo \ - --disable-snappy \ - --disable-bzip2 \ --disable-lzfse \ - --disable-zstd \ - --disable-seccomp \ - --enable-coroutine-pool \ - --disable-glusterfs \ - --disable-tpm \ - --disable-libssh \ + --disable-lzo \ + --enable-malloc-trim \ + --enable-membarrier \ + --disable-mpath \ + --enable-multiprocess \ + --disable-netmap \ + --disable-nettle \ --disable-numa \ - --disable-libxml2 \ - --disable-tcmalloc \ - --disable-jemalloc \ - --enable-replication \ + --disable-nvmm \ --disable-opengl \ - --disable-virglrenderer \ - --disable-xfsctl \ - --disable-qom-cast-debug \ - --disable-tools \ - --disable-bochs \ - --disable-cloop \ - --disable-dmg \ + --disable-oss \ + --disable-pa \ + --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-qed \ - --disable-parallels \ - --disable-sheepdog \ - --disable-crypto-afalg \ - --disable-capstone \ - --disable-debug-mutex \ - --disable-libpmem \ + --disable-whpx \ + --disable-xen \ + --disable-xen-pci-passthrough \ --disable-xkbcommon \ - --disable-rng-none \ - --disable-libdaxctl \ - \ - --disable-fuzzing \ - --disable-keyring + --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)/$(CROSS_LIB_DIR):$(SYSROOT)/usr/$(CROSS_LIB_DIR) +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)/bin/qemu-$(HOST_QEMU_TARGETS)" \ + 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)" \ @@ -209,7 +220,7 @@ $(STATEDIR)/host-qemu.install: @$(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)/pc-bios + @ln -vsf share/qemu $(HOST_QEMU_PKGDIR)/usr/pc-bios endif @$(call touch) @@ -217,16 +228,16 @@ $(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)/bin/qemu-cross - @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross - @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/bin/qemu/ + @$(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)/bin/qemu-cross -E "$${add_env// /,}"|' \ - -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross |' \ + -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)/bin/qemu/ldd - @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd + $(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) diff --git a/configs/platform-rpi1/platformconfig b/configs/platform-rpi1/platformconfig index d10c1851f1fa..b8ca72a350be 100644 --- a/configs/platform-rpi1/platformconfig +++ b/configs/platform-rpi1/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -20,7 +20,7 @@ PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF_VIRTUAL=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -75,6 +75,7 @@ PTXCONF_GNU_TARGET="arm-1136jfs-linux-gnueabihf" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="${PTXCONF_GNU_TARGET}" # end of toolchain # @@ -203,6 +204,7 @@ PTXCONF_BAREBOX_EXTRA_ENV_PATH="barebox-defaultenv" # PTXCONF_BAREBOX_NEEDS_HOST_IMX_CST is not set # PTXCONF_BAREBOX_NEEDS_KEYS is not set PTXCONF_BAREBOX_NEEDS_HOST_LZOP=y +# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set # PTXCONF_BAREBOX_MLO is not set PTXCONF_BOOTLOADER=y # PTXCONF_GRUB is not set diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index a5fd92ee8fa2..81e389ca27fb 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -75,6 +75,7 @@ PTXCONF_GNU_TARGET="arm-v7a-linux-gnueabihf" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="${PTXCONF_GNU_TARGET}" # end of toolchain # diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig index 031ba98c274a..fdfd01e12a01 100644 --- a/configs/platform-v7a_noneon/platformconfig +++ b/configs/platform-v7a_noneon/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a_noneon" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -74,6 +74,7 @@ PTXCONF_GNU_TARGET="arm-v7a-linux-gnueabihf" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="${PTXCONF_GNU_TARGET}" # end of toolchain # diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index b15e30dfe9a0..e03ab7779727 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v8a" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -72,6 +72,7 @@ PTXCONF_GNU_TARGET="aarch64-v8a-linux-gnu" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="${PTXCONF_GNU_TARGET}" # end of toolchain # diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig index 3ba9acd203a9..5465a969cabb 100644 --- a/configs/platform-x86_64/platformconfig +++ b/configs/platform-x86_64/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="x86_64" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2023.04.0" +PTXCONF_PLATFORMCONFIG_VERSION="2023.05.0" # # architecture @@ -76,6 +76,7 @@ PTXCONF_GNU_TARGET="x86_64-unknown-linux-gnu" PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-" PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}" PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}" +PTXCONF_RUST_TARGET="x86_64-v1-linux-gnu" # end of toolchain # diff --git a/configs/ptxconfig b/configs/ptxconfig index f059ad9198a9..fb6a26ec12e2 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2023.04.0 +# PTXdist 2023.05.0 # PTXCONF_DATAPARTITION=y @@ -67,7 +67,7 @@ PTXCONF_BSP=y PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF_VIRTUAL=y -PTXCONF_CONFIGFILE_VERSION="2023.04.0" +PTXCONF_CONFIGFILE_VERSION="2023.05.0" PTXCONF__ptxconfig_MAGIC__=y # @@ -117,6 +117,13 @@ PTXCONF_HOST_OPKG=y PTXCONF_HOST_PCRE2=y PTXCONF_HOST_PIXMAN=y PTXCONF_HOST_PKG_CONFIG=y +PTXCONF_HOST_PYTHON3_FLIT_CORE=y +PTXCONF_HOST_PYTHON3_INSTALLER=y +PTXCONF_HOST_PYTHON3_PACKAGING=y +PTXCONF_HOST_PYTHON3_PYBUILD=y +PTXCONF_HOST_PYTHON3_PYPROJECT_HOOKS=y +PTXCONF_HOST_PYTHON3_TOMLI=y +PTXCONF_HOST_PYTHON3_WHEEL=y PTXCONF_HOST_SYSTEM_PERL=y PTXCONF_HOST_SYSTEM_PERL_XMLPARSER=y PTXCONF_HOST_SYSTEM_PYTHON3=y @@ -1655,12 +1662,15 @@ PTXCONF_ZSTD=y # PTXCONF_PYTHON3_AIOHTTP_WSGI is not set # PTXCONF_PYTHON3_AIOHTTP is not set # PTXCONF_PYTHON3_AIOSIGNAL is not set +# PTXCONF_PYTHON3_AIOSQLITE is not set # PTXCONF_PYTHON3_ASYNC_TIMEOUT is not set +# PTXCONF_PYTHON3_ASYNCUA is not set # PTXCONF_PYTHON3_ATTRS is not set # PTXCONF_PYTHON3_CFFI is not set # PTXCONF_PYTHON3_CHARDET is not set # PTXCONF_PYTHON3_CHARSET_NORMALIZER is not set # PTXCONF_PYTHON3_CONFIGSHELL is not set +# PTXCONF_PYTHON3_CRYPTOGRAPHY is not set # PTXCONF_PYTHON3_DATEUTIL is not set # PTXCONF_PYTHON3_DECORATOR is not set # PTXCONF_PYTHON3_FALCON is not set @@ -1694,6 +1704,7 @@ PTXCONF_ZSTD=y # PTXCONF_PYTHON3_PIP is not set # PTXCONF_PYTHON3_PLUGGY is not set # PTXCONF_PYTHON3_PLY is not set +# PTXCONF_PYTHON3_POSIX_IPC is not set # PTXCONF_PYTHON3_PSUTIL is not set # PTXCONF_PYTHON3_PTYPROCESS is not set # PTXCONF_PYTHON3_PY is not set @@ -1707,11 +1718,14 @@ PTXCONF_ZSTD=y # PTXCONF_PYTHON3_PYSNMP is not set # PTXCONF_PYTHON3_PYTEST is not set # PTXCONF_PYTHON3_PYTZ is not set +# PTXCONF_PYTHON3_PYUSB is not set # PTXCONF_PYTHON3_PYYAML is not set +# PTXCONF_PYTHON3_SEMANTIC_VERSION is not set # PTXCONF_PYTHON3_SETUPTOOLS is not set # PTXCONF_PYTHON3_SIMPLEGENERIC is not set # PTXCONF_PYTHON3_SIX is not set # PTXCONF_PYTHON3_SNMPCLITOOLS is not set +# PTXCONF_PYTHON3_SORTEDCONTAINERS is not set # PTXCONF_PYTHON3_SQLPARSE is not set # PTXCONF_PYTHON3_SYSTEMD is not set # PTXCONF_PYTHON3_TABULATE is not set @@ -2061,7 +2075,10 @@ PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4=y # PTXCONF_JED is not set # PTXCONF_JOE is not set # PTXCONF_NANO is not set -# PTXCONF_VIM is not set + +# +# BusyBox' vi and xxd is selected! +# # end of Editors # @@ -2437,6 +2454,7 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y # PTXCONF_GST_PLUGINS_BAD1 is not set # PTXCONF_GST_PLUGINS_BASE1 is not set # PTXCONF_GST_PLUGINS_GOOD1 is not set +# PTXCONF_GST_PLUGINS_RS is not set # PTXCONF_GST_PLUGINS_UGLY1 is not set # PTXCONF_GST_PYTHON1 is not set # PTXCONF_GST_RTSP_SERVER1 is not set diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make deleted file mode 100644 index c36e30305a92..000000000000 --- a/rules/at91bootstrap2.make +++ /dev/null @@ -1,90 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2011 by Michael Olbrich -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_AT91BOOTSTRAP2) += at91bootstrap2 - -# -# Paths and names -# -AT91BOOTSTRAP2_VERSION := $(call ptx/config-version, PTXCONF_AT91BOOTSTRAP2) -AT91BOOTSTRAP2_MD5 := $(call ptx/config-md5, PTXCONF_AT91BOOTSTRAP2) -AT91BOOTSTRAP2 := at91bootstrap-$(AT91BOOTSTRAP2_VERSION) -AT91BOOTSTRAP2_SUFFIX := tar.gz -AT91BOOTSTRAP2_URL := https://github.com/linux4sam/at91bootstrap/archive/v$(AT91BOOTSTRAP2_VERSION).$(AT91BOOTSTRAP2_SUFFIX) -AT91BOOTSTRAP2_SOURCE := $(SRCDIR)/$(AT91BOOTSTRAP2).$(AT91BOOTSTRAP2_SUFFIX) -AT91BOOTSTRAP2_DIR := $(BUILDDIR)/$(AT91BOOTSTRAP2) -AT91BOOTSTRAP2_CONFIG := $(call ptx/in-platformconfigdir, \ - $(call remove_quotes, $(PTXCONF_AT91BOOTSTRAP2_CONFIG))) -AT91BOOTSTRAP2_LICENSE := unknown - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \ - $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) - -AT91BOOTSTRAP2_MAKE_ENV := \ - CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ - HOSTCC=$(HOSTCC) -AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE) BUILDDIR=. - -ifdef PTXCONF_AT91BOOTSTRAP2 -$(AT91BOOTSTRAP2_CONFIG): - @echo - @echo "***********************************************************************************" - @echo "* Please generate a at91bootstrap config with 'ptxdist menuconfig at91bootstrap2' *" - @echo "***********************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/at91bootstrap2.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/at91bootstrap2.targetinstall: - @$(call targetinfo) - @if [ -e $(AT91BOOTSTRAP2_DIR)/binaries/at91bootstrap.bin ]; then \ - install -vD -m644 $(AT91BOOTSTRAP2_DIR)/binaries/at91bootstrap.bin \ - $(IMAGEDIR)/at91bootstrap.bin; \ - else \ - install -vD -m644 $(AT91BOOTSTRAP2_DIR)/binaries/*boot-$(AT91BOOTSTRAP2_VERSION).bin \ - $(IMAGEDIR)/at91bootstrap.bin; \ - fi - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/at91bootstrap2.clean: - @$(call targetinfo) - @$(call clean_pkg, AT91BOOTSTRAP2) - @rm -rf $(IMAGEDIR)/at91bootstrap.bin - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -at91bootstrap2_oldconfig at91bootstrap2_menuconfig: $(STATEDIR)/at91bootstrap2.extract - @$(call world/kconfig, AT91BOOTSTRAP2, $(subst at91bootstrap2_,,$@)) - -# vim: syntax=make diff --git a/rules/host-qemu.make b/rules/host-qemu.make deleted file mode 100644 index cee65bea0744..000000000000 --- a/rules/host-qemu.make +++ /dev/null @@ -1,231 +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 -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),) \ - " \ - --meson=meson \ - --ninja=ninja \ - --disable-sanitizers \ - --disable-tsan \ - --disable-strip \ - --disable-werror \ - --enable-stack-protector \ - --audio-drv-list= \ - --block-drv-rw-whitelist= \ - --block-drv-ro-whitelist= \ - --with-coroutine= \ - --tls-priority=NORMAL \ - --disable-plugins \ - --disable-containers \ - --disable-capstone \ - --disable-cfi \ - --enable-fdt \ - --disable-fuzzing \ - --disable-tcg-interpreter \ - --enable-trace-backends=nop \ - --disable-alsa \ - --enable-attr \ - --disable-auth-pam \ - --disable-bpf \ - --disable-brlapi \ - --disable-bzip2 \ - --enable-cap-ng \ - --disable-cocoa \ - --disable-coreaudio \ - --disable-curl \ - --disable-curses \ - --disable-docs \ - --disable-dsound \ - --disable-fuse \ - --disable-fuse-lseek \ - --disable-gcrypt \ - --disable-gettext \ - --disable-glusterfs \ - --disable-gnutls \ - --disable-gtk \ - --disable-guest-agent-msi \ - --disable-hax \ - --disable-hvf \ - --enable-iconv \ - --disable-jack \ - --enable-kvm \ - --disable-l2tpv3 \ - --disable-libdaxctl \ - --disable-libiscsi \ - --disable-libnfs \ - --disable-libpmem \ - --disable-libudev \ - --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-libusb \ - --disable-linux-aio \ - --disable-linux-io-uring \ - --disable-lzfse \ - --disable-lzo \ - --enable-malloc-trim \ - --disable-mpath \ - --enable-multiprocess \ - --disable-netmap \ - --disable-nettle \ - --disable-nvmm \ - --disable-oss \ - --disable-pa \ - --disable-rbd \ - --disable-sdl \ - --disable-sdl-image \ - --disable-seccomp \ - --disable-selinux \ - --enable-slirp \ - --disable-smartcard \ - --disable-snappy \ - --disable-sparse \ - --disable-spice \ - --disable-spice-protocol \ - --enable-tcg \ - --disable-u2f \ - --disable-usb-redir \ - --disable-vhost-user-blk-server \ - --disable-libvduse \ - --disable-virglrenderer \ - --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \ - --disable-virtiofsd \ - --disable-vnc \ - --disable-vnc-jpeg \ - --disable-vnc-sasl \ - --disable-vte \ - --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 \ - --disable-guest-agent \ - --enable-pie \ - --disable-modules \ - --disable-module-upgrades \ - --disable-debug-tcg \ - --disable-debug-info \ - --disable-lto \ - --disable-safe-stack \ - --enable-membarrier \ - --disable-rdma \ - --disable-pvrdma \ - --enable-vhost-net \ - --disable-vhost-crypto \ - --enable-vhost-kernel \ - --disable-vhost-user \ - --disable-vhost-vdpa \ - --disable-live-block-migration \ - --enable-coroutine-pool \ - --disable-tpm \ - --disable-libssh \ - --disable-numa \ - --disable-replication \ - --disable-opengl \ - --disable-qom-cast-debug \ - --disable-tools \ - --disable-bochs \ - --disable-cloop \ - --disable-dmg \ - --disable-qcow1 \ - --disable-vdi \ - --disable-vvfat \ - --disable-qed \ - --disable-parallels \ - --disable-crypto-afalg \ - --disable-debug-mutex \ - --disable-rng-none \ - --disable-gio \ - --disable-slirp-smbd \ - \ - --disable-keyring \ - --with-git-submodules=ignore - -# 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