From patchwork Thu Nov 12 22:00:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1399368 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Qavpye+g; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CXFtF1nqJz9s0b for ; Fri, 13 Nov 2020 09:01:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 67E3F20369; Thu, 12 Nov 2020 22:01:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vlBZb80UeLDF; Thu, 12 Nov 2020 22:01:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D91C02011B; Thu, 12 Nov 2020 22:01:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 814B81BF40E for ; Thu, 12 Nov 2020 22:01:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7E227844AB for ; Thu, 12 Nov 2020 22:01:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9RRH2ErRhFjB for ; Thu, 12 Nov 2020 22:01:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0FE76842A5 for ; Thu, 12 Nov 2020 22:01:15 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id w24so6819496wmi.0 for ; Thu, 12 Nov 2020 14:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R4fPSbMh0Q2J7ymcyRDZ6exdxv0lRcs0pZToLIpcv5g=; b=Qavpye+ghwartcr771r9K+j0BCowXoGFhcIy/8XvgD0sR07fC4TbbL1y9VQu+N/+Zl UHKpf/KtwB/JV5gD4fs1GoSs4ZGS/8fr42ombD5TSiFb0GfqznKzXjg8fZmnPYtrJ2jp f6FzmXduI0c7J3HToKhyHTgCRDKX7N6mlNgp+5hJyXuL4NwtZ4tqhnUEriwh130JO7Yr 9S2MAr2F9jp8wpeZ+QJsS0O79MMOfK5VKrSAeW93ZjFmJ6Opr/vgpzt3/WN6hRAtZ+DS 6u3r2Qj1htCPsTnGvn7YSn0zGUFWqkKEoeTLX/ougFa93YaEdWwu4241HHMD2aP2J2Y4 64Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=R4fPSbMh0Q2J7ymcyRDZ6exdxv0lRcs0pZToLIpcv5g=; b=CD44pwfSnTV25oMxQzW2N+031Rf20O6JUh/a5F564BhZgAsj9l6nNhDV7Tb3Hu/dzQ Z9hawy3mK+IdLvarUr1cuNcm7qfoRppudCI9pWPkYPI0Z9QIHTvfsdhaBvnFkq/KOmw7 /Lb3+ol6wdzidoSe8Ibu+uSiE8qLcWaD1/kflMRsL9Hp7B1NXGfs/OiKb+h4U4b8WQjw WyDy7/i5TRi4Qc+yBS4ICGt2Mmnnd0OYa6Qm8eWZa0Ihh857lLFLU732cs+ACjHwm93N ddqBWJMqEoYw5JCvhyqP/qF5ZKuYVjYVTNtW2+AODgwJqmk4MQtVLflksR8nA6dqQTM0 DlnQ== X-Gm-Message-State: AOAM531c5uD3q74gGnRTm6lO4XOUFOAv789O1IM4/M6nLyPXLoRt7+dY ErymMRFGM0OIF6FzUpCmquqBaqt6pysrVQ== X-Google-Smtp-Source: ABdhPJyx4TYq68AehT5MZc6khb3efift/nQu0DDBZs+Y0saS2yyIXCx8fMtJc8ppPPhK78sVGe9g4g== X-Received: by 2002:a7b:cbd7:: with SMTP id n23mr1786541wmi.142.1605218473233; Thu, 12 Nov 2020 14:01:13 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id 35sm8862792wro.71.2020.11.12.14.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 14:01:12 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 12 Nov 2020 23:00:59 +0100 Message-Id: <20201112220059.804870-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/qemu: use a system-wide slirp X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use a system-wide slirp now that we switched to the up to date https://gitlab.freedesktop.org/slirp/libslirp qemu already depends on libglib2 so we don't need to add any new dependencies Signed-off-by: Fabrice Fontaine --- package/qemu/Config.in | 1 + package/qemu/qemu.mk | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 33d4cccd7b..391fd5faaf 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -58,6 +58,7 @@ comment "Networking options" config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" + select BR2_PACKAGE_SLIRP help Enable user mode network stack, which is the default networking backend. It requires no administrator privileges diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 69850ec938..2bac96bd66 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -51,8 +51,10 @@ endif endif -# There is no "--enable-slirp" -ifeq ($(BR2_PACKAGE_QEMU_SLIRP),) +ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) +QEMU_OPTS += --enable-slirp=system +QEMU_DEPENDENCIES += slirp +else QEMU_OPTS += --disable-slirp endif