From patchwork Wed Oct 23 09:34:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Peach X-Patchwork-Id: 1181968 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.137; helo=fraxinus.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.b="vYQ4B+aZ"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46ylb911LVz9sPF for ; Wed, 23 Oct 2019 20:35:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A0C7D8626D; Wed, 23 Oct 2019 09:34:59 +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 ZOLroMtNFKHA; Wed, 23 Oct 2019 09:34:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 09C788459E; Wed, 23 Oct 2019 09:34:59 +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 61FBF1BF5B5 for ; Wed, 23 Oct 2019 09:34:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5F1858459E for ; Wed, 23 Oct 2019 09:34:57 +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 w_u8uQcunfYd for ; Wed, 23 Oct 2019 09:34:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CA95C8459B for ; Wed, 23 Oct 2019 09:34:56 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id b4so3642777pfr.12 for ; Wed, 23 Oct 2019 02:34:56 -0700 (PDT) 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=hlo5u1kXe5h+YvOFxVIFzOhWis7FN1qmlriTL2/i3f0=; b=vYQ4B+aZak/lPwoUlZPXo49dWNNk1rcIWZPxv+FSfN7E2Pl5Pb99WwRFTi68AorHWH OQBuHbfyRgWcZR6lCxsxqSgNIbZazV64VTWrjrpc9OdWzpXNa2cCQ9nzIZz5ryilYFET lM1FZ2tMn09qFIF09QEEl8jxnngQASGunmOPbQoTtr11jqvbYkxbulnWgPRnfRh64Zik EBEUkkbClKgYRfrVkIUnQ07YSD+7e+Au2wN1RJZDCUCvupiICeh/G2+fRhH0YHLf/+l4 ydua+0u3/PxQ7yNl4KdRcrsGIJ/3DSW1pPcYZA+nlPzj7DDkKk2quSR4PbumM6z6vGn4 wOCQ== 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=hlo5u1kXe5h+YvOFxVIFzOhWis7FN1qmlriTL2/i3f0=; b=D7t2DI+zViks/+A0FoTkSF0ypb6t2KGBV4dK66PyiBTSa0SzflXNNrcbsN2R38TPaD 26oTj6OViZZEDCpV3HdcHQGRjK16O8VGAA2ROCXvF1Y3BcypVIMtzE3qStZI8t9k992n WicORyO+6MVZ6MZ7Fs13ZcAeTuWqVqqBD1QHEmP3nNpG130JlHIN/8egv4hSwREdgw77 bjE+IXI08M2GV1PdoMNQYtfeClfICGI8ZL3+Rusuth2xI8ihytgzQAoARHCOhWA1T4Od qUdOBEE61dqr44sm5Gu6JHF+c97LbNut8RAfd4B92oZA47T7NWHPMnTSa8fcDUhqie39 3qiA== X-Gm-Message-State: APjAAAX0f2y7++PgUJsmVf1gBAgfUMhTWRZDwJKYlRhylqzI0DA6MRyg NRUAUWNNkUAOGUJnZQFGq7r3XImg+t9rRg== X-Google-Smtp-Source: APXvYqy45DmmdiaaKVd7W+FOPgpH1TgeJqxcf22H5ArF9kKXVVQn+dU5O+wYtxGLhQHktywCVFCV1A== X-Received: by 2002:a65:66d1:: with SMTP id c17mr8698913pgw.169.1571823296100; Wed, 23 Oct 2019 02:34:56 -0700 (PDT) Received: from sk1.jpeach.org (2001-44b8-414b-6000-0000-0000-0000-0216.static.ipv6.internode.on.net. [2001:44b8:414b:6000::216]) by smtp.gmail.com with ESMTPSA id v1sm38632625pfg.26.2019.10.23.02.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 02:34:55 -0700 (PDT) From: James Peach To: buildroot@buildroot.org Date: Wed, 23 Oct 2019 20:34:31 +1100 Message-Id: <20191023093431.2220-1-jorgar@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/runc: add an option to build a non-static runc 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: James Peach Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: James Peach The systemd cgroup driver is compiled out of static builds of runc so some users will need a non-static build. Add an option to control whether the runc should be static or not, and default it to true for compatibility with existing configurations. Signed-off-by: James Peach --- package/runc/Config.in | 11 +++++++++++ package/runc/runc.mk | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git package/runc/Config.in package/runc/Config.in index f181ee334f..ea932120b8 100644 --- package/runc/Config.in +++ package/runc/Config.in @@ -10,6 +10,17 @@ config BR2_PACKAGE_RUNC https://github.com/opencontainers/runc +if BR2_PACKAGE_RUNC + +config BR2_PACKAGE_RUNC_STATIC + bool "static runc binary" + default y + help + Whether to make a static build of runc. This must be false + for runc to be able to use the systemd cgroups driver. + +endif + comment "runc needs a glibc or musl toolchain w/ threads" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS diff --git package/runc/runc.mk package/runc/runc.mk index b858742905..4128afd53a 100644 --- package/runc/runc.mk +++ package/runc/runc.mk @@ -13,7 +13,11 @@ RUNC_WORKSPACE = Godeps/_workspace RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) -RUNC_TAGS = cgo static_build +RUNC_TAGS = cgo + +ifeq ($(BR2_PACKAGE_RUNC_STATIC),y) +RUNC_TAGS += static_build +endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_TAGS += seccomp