From patchwork Sun Jun 21 07:59:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1313845 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=UuM7Jir6; 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 49qQ422YBnz9sTK for ; Sun, 21 Jun 2020 18:01:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 832E426045; Sun, 21 Jun 2020 08:01:51 +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 YVinmzQ9b-e6; Sun, 21 Jun 2020 08:01:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CF0FA2CB5A; Sun, 21 Jun 2020 08:00:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E81AA1BF954 for ; Sun, 21 Jun 2020 08:00:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E235288195 for ; Sun, 21 Jun 2020 08:00:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DGhYdc9WjS2k for ; Sun, 21 Jun 2020 08:00:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1B3DB88493 for ; Sun, 21 Jun 2020 08:00:28 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id t194so12886716wmt.4 for ; Sun, 21 Jun 2020 01:00:28 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ydrDcbKXboyBFWOx5ClEa+j4ckFbku8gRoUKbf5ZmkY=; b=UuM7Jir6ydlZgYzTkWT3xjUBKCTLGIkerchiektuj+fMIQFqtUWutkKgoeqpYDKVlB KPiBsYZPDI072k9N+0LtQQ3v6ddCQq+AyhbhBBJq+ylHiLdE1x41a6or9JA3r/+85/Sg VwXgAI7+9gXYyb9GwupH1Fu0bB377xxw+hNiw4BqeBFdZhPHy4rTQyO1Td+X2kcdTrVq EywLiEXOtx5jAtnQe5OwnMlrxt3GZMgMpJ6qIx1XVda9fM5pdVd64CauXugIneRQkscX xeVtFjAheSYCrvrxsaLpZwzD3qnXiftNHJ5xeQeQsS/Ozi3mI3SUHSlBx1owxRU5U9XY 1O0w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ydrDcbKXboyBFWOx5ClEa+j4ckFbku8gRoUKbf5ZmkY=; b=aWzV5Tw/g5KJ0/XPAExm4YhJ3c2QvTpzayrmogpCFT3yhJh+BjPSZWVKSxsKyay1VB AxEMFw+9VOpA1qy5mqtgvoi6Lk2ict3i64x5e6DX2OLV11p4j3TEiuW4lGCWwhXeuPI4 XSONXmV5u2YsxOfeMPDyyskf/ITT7sU0fm+zWl8IkE7vhyF7CZL/SRTnh0bcx5AJiEhc HQJpuGz3JxNFzhtrSbuw+KqiVoKuGoAYkxLL1C5S1Ns4iMO97aWLZFJhc9V0ME2HqCUq 4ObCcyLJQ78ZnetSoAvSG7cJaRYgAq0/XQgJJi141NuMZ0NrJuDSrnlOXc74/oPMMLAa Jd3A== X-Gm-Message-State: AOAM531R8VjSXicow9Od/lA9wMTdLYWE1Avau5E6BfcdV3JvRL7wZOxv i7ZaKzo5gDogOgUx1iAwY0BsG+y+eAU= X-Google-Smtp-Source: ABdhPJwdqE4VGHRRkVi66PQCnf+/USsSjR+Kc/9FtQ4Ikn2Su/z6cnCogh9oMrmAw6lmnXd020vrLg== X-Received: by 2002:a7b:c456:: with SMTP id l22mr12009657wmi.120.1592726426159; Sun, 21 Jun 2020 01:00:26 -0700 (PDT) Received: from vm-xubuntu20.04 ([78.250.207.83]) by smtp.gmail.com with ESMTPSA id e5sm11051327wrs.33.2020.06.21.01.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 01:00:25 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sun, 21 Jun 2020 09:59:56 +0200 Message-Id: <20200621080000.180089-4-francois.perrad@gadz.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200621080000.180089-1-francois.perrad@gadz.org> References: <20200621080000.180089-1-francois.perrad@gadz.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 3/7] package/docker-engine: needs some kernel options 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: Christian Stewart , Norbert Lange , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" according to https://wiki.gentoo.org/wiki/Docker#Kernel Signed-off-by: Francois Perrad --- package/docker-engine/docker-engine.mk | 67 ++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 78f6c1261..41600486c 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -79,4 +79,71 @@ define DOCKER_ENGINE_USERS - - docker -1 * - - - Docker Application Container Framework endef +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) +define DOCKER_ENGINE_DRIVER_BTRFS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) +endef +endif + +define DOCKER_ENGINE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG_SWAP) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_CGROUP) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_FAIR_GROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFS_BANDWIDTH) + $(call KCONFIG_ENABLE_OPT,CONFIG_RT_GROUP_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PIDS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) + $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PROC_PID_CPUSET) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PERF) + $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) + $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_USER_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLOCK) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_THROTTLING) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_NETMAP) + $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_REDIRECT) + $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_SCHED) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CLS_CGROUP) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_L3_MASTER_DEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_NET_PRIO) + $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_NETCLASSID) + $(call KCONFIG_ENABLE_OPT,CONFIG_MD) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_DM) + $(call KCONFIG_ENABLE_OPT,CONFIG_MD_THIN_PROVISIONING) + $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) + $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) + $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_IPVLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) + $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) + $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) + $(call KCONFIG_ENABLE_OPT,CONFIG_PERSISTENT_KEYRINGS) + $(call KCONFIG_ENABLE_OPT,CONFIG_ENCRYPTED_KEYS) + $(call KCONFIG_ENABLE_OPT,CONFIG_KEY_DH_OPERATIONS) + $(DOCKER_ENGINE_DRIVER_BTRFS_LINUX_CONFIG_FIXUPS) +endef + $(eval $(golang-package))