From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E55C415808B for ; Sun, 17 Apr 2022 22:17:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBDE2E09AD; Sun, 17 Apr 2022 22:17:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFB10E09A4 for ; Sun, 17 Apr 2022 22:17:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B94823414E0 for ; Sun, 17 Apr 2022 22:17:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BF3732A for ; Sun, 17 Apr 2022 22:16:59 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1650232318.22b2b448d0abacef7fabcd77a0dde9d6a15f1339.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen/xen-4.16.0-r5.ebuild X-VCS-Directories: app-emulation/xen/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 22b2b448d0abacef7fabcd77a0dde9d6a15f1339 X-VCS-Branch: master Date: Sun, 17 Apr 2022 22:16:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bd780c55-e79c-4f17-84ba-faaa7e9df27d X-Archives-Hash: 8c8088b68d585cdd83306dc69f5f14e1 commit: 22b2b448d0abacef7fabcd77a0dde9d6a15f1339 Author: Florian Schmaus gentoo org> AuthorDate: Sun Apr 17 21:34:02 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Apr 17 21:51:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b2b448 app-emulation/xen: fix debug use flag Upstream changed to a kconfig build system for the Xen hypervisor. Even though still documented, passing 'debug=y' as make argument does not enable a debug build. We now create a Gentoo specific kconfig that is merged into upstream's default configuration. This also allows to drop the flask patch. Bug: https://bugs.gentoo.org/838730 Signed-off-by: Florian Schmaus gentoo.org> app-emulation/xen/xen-4.16.0-r5.ebuild | 45 +++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/app-emulation/xen/xen-4.16.0-r5.ebuild b/app-emulation/xen/xen-4.16.0-r5.ebuild index eb0fa574bc2e..5746fe98d576 100644 --- a/app-emulation/xen/xen-4.16.0-r5.ebuild +++ b/app-emulation/xen/xen-4.16.0-r5.ebuild @@ -100,9 +100,6 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch fi - # Enable XSM-FLASK - use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch - # Workaround new gcc-11 options sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die @@ -117,11 +114,28 @@ src_prepare() { default } -XEN_OPTS=() - src_configure() { - use arm && XEN_OPTS+=( CONFIG_EARLY_PRINTK=sun7i ) - use debug && XEN_OPTS+=( debug=y ) + cd xen || die + emake defconfig + + touch gentoo-config || die + if use arm; then + echo "CONFIG_EARLY_PRINTK=sun7i" > gentoo-config || die + fi + if use debug; then + echo "CONFIG_DEBUG=y" > gentoo-config || die + fi + if use flask; then + echo "CONFIG_XSM=y" > gentoo-config || die + fi + + local merge_cmd=( + ./tools/kconfig/merge_config.sh + -m -r + .config gentoo-config + ) + einfo "${merge_cmd[*]}" + "${merge_cmd[@]}" || die "Merging Gentoo config failed" # remove flags unset CFLAGS @@ -133,19 +147,26 @@ src_configure() { src_compile() { # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${XEN_OPTS[@]} + emake \ + V=1 \ + CC="$(tc-getCC)" \ + LDFLAGS="$(raw-ldflags)" \ + LD="$(tc-getLD)" \ + -C xen } src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - # The 'make install' doesn't 'mkdir -p' the subdirs if use efi; then mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die fi - emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install + emake \ + LDFLAGS="$(raw-ldflags)" \ + LD="$(tc-getLD)" \ + DESTDIR="${D}" \ + -C xen \ + install # make install likes to throw in some extra EFI bits if it built use efi || rm -rf "${D}/usr/$(get_libdir)/efi"