From patchwork Fri Jul 9 14:32:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12367507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9552C07E99 for ; Fri, 9 Jul 2021 14:33:09 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 68266613BA for ; Fri, 9 Jul 2021 14:33:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68266613BA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.153702.283944 (Exim 4.92) (envelope-from ) id 1m1rYl-0001uV-ST; Fri, 09 Jul 2021 14:32:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 153702.283944; Fri, 09 Jul 2021 14:32:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m1rYl-0001uO-PQ; Fri, 09 Jul 2021 14:32:55 +0000 Received: by outflank-mailman (input) for mailman id 153702; Fri, 09 Jul 2021 14:32:55 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m1rYk-0001uH-P5 for xen-devel@lists.xenproject.org; Fri, 09 Jul 2021 14:32:54 +0000 Received: from mo4-p00-ob.smtp.rzone.de (unknown [85.215.255.20]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8aad459d-e0c2-11eb-85f4-12813bfff9fa; Fri, 09 Jul 2021 14:32:53 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.28.1 AUTH) with ESMTPSA id 30791cx69EWpf9D (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 9 Jul 2021 16:32:51 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8aad459d-e0c2-11eb-85f4-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1625841171; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=wJEuN7IcmG/orFXDSp2phKEUtyHRKhzgT7wACeQ3PXE=; b=Izj3QclkbYUiuesbLn9GaB0SYjXOB/3JIw5qx40LkBNKgnge8Zger7bNVMS7Snd+bO 2wiDXJ3Twkbu2fDh5up3Zx7JiDAryQ5oXuLmj4b9w3faUjHcRaR5PLIkJMa9U+TVt//M oCE1QyVreoCpVg8+620am0C3/OSKDeEnNcEMRXomXUvzjzexf79Art2+pWdgwKewHgwd +OeUW6Wg0FNShAD0iXqeIW2ZdFzNI35IxiPLIie/RuC3Sp/kj3cHJ2/OdEWOsCXIb9G2 3F9GBT4fzrJir67+RvZAQyS3dxnvb1QPQnt5QHzi5dV5WCWYzITpYDSgIFNDMC4as6li nIOQ== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAgs3rVb2Qcstn6hLmi/A5ONQi+eEunNNoWD5g0T8" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Doug Goldstein Subject: [PATCH v1 1/2] automation: provide SDL and SDL2 in opensuse images Date: Fri, 9 Jul 2021 16:32:47 +0200 Message-Id: <20210709143248.20310-1-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 qemu-xen-traditional may make use of SDL, qemu-xen may make use of SDL2. Use pkgconfig() as resolvable instead of a rpm name, the latter may change. Signed-off-by: Olaf Hering --- automation/build/suse/opensuse-leap.dockerfile | 3 ++- automation/build/suse/opensuse-tumbleweed.dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 03f8a7acad..2f92392d76 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -31,7 +31,6 @@ RUN zypper install -y --no-recommends \ glibc-devel-32bit \ gzip \ hostname \ - libSDL2-devel \ libaio-devel \ libbz2-devel \ libext2fs-devel \ @@ -56,6 +55,8 @@ RUN zypper install -y --no-recommends \ pandoc \ patch \ pkg-config \ + 'pkgconfig(sdl)' \ + 'pkgconfig(sdl2)' \ python \ python-devel \ python3-devel \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile index be5ddb0d98..ed10cd8a22 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -31,7 +31,6 @@ RUN zypper install -y --no-recommends \ glibc-devel-32bit \ gzip \ hostname \ - libSDL2-devel \ libaio-devel \ libbz2-devel \ libext2fs-devel \ @@ -59,6 +58,8 @@ RUN zypper install -y --no-recommends \ pandoc \ patch \ pkg-config \ + 'pkgconfig(sdl)' \ + 'pkgconfig(sdl2)' \ python-devel \ python3-devel \ systemd-devel \