From patchwork Mon Jul 27 22:21:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1337376 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=none (p=none dis=none) header.from=korsgaard.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=NzHxLVW4; 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 4BFvS73ZSpz9sRN for ; Tue, 28 Jul 2020 08:22:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 19021868A6; Mon, 27 Jul 2020 22:22:11 +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 2GYyq4nkkF1j; Mon, 27 Jul 2020 22:22:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 73F78868A8; Mon, 27 Jul 2020 22:22:10 +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 33D071BF2C9 for ; Mon, 27 Jul 2020 22:22:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 308A8868A6 for ; Mon, 27 Jul 2020 22:22:08 +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 EMTvHZeak0Ji for ; Mon, 27 Jul 2020 22:22:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 76110868A8 for ; Mon, 27 Jul 2020 22:22:07 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id c2so7445825edx.8 for ; Mon, 27 Jul 2020 15:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eb1J4bpAGHRT7LqF4Zzu4Xm4Gxfp3OGmTBC2BUPgoB4=; b=NzHxLVW4qzmaSbSvw3Raiufo6L+NW5sXp/yuq7szCb79Otf3UvAchusJwTj/FcoQG0 6JXWXx0s/G03GneBzBn+HbJS6ILmn4yt8vumiQBerhpchb8g5cxNzv8s7RLw33Z4KHwN y4FS0501C11j37aEXbxrk7gI2f1hMIQHyCtFiAjfpvU4K0XpHsxsesjrrauNzk4Y2sGl 3/aQQbPjxanhriMNpgrl7cOnIMOL8cEhg55b4J9LsX+QPoVc4A0Zmy+fvGSawD+yZ2Pv iRN6KOLXDSlUY+nhF7dWa+EzRd/r8am3O7joUnu92upy3CphyxBUEQTj44VrD0YNfTe+ 8e/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eb1J4bpAGHRT7LqF4Zzu4Xm4Gxfp3OGmTBC2BUPgoB4=; b=ZWH4DI0Ec06YQBT2wF62bu/fZkDuJ/9faP1CfDpDEs7FZkSs1xR9T0QAgQEGU9ZDYg pR+EVpQwLCMgCPxEQIECrbOHT0PuiFbLWhGvu86TtuxMAc5KBawB0z89OX/gP7/QKnwQ XRDLlI+AaLYHhwyklfHct0FxBT0uV1M4lQvGvRuxK1zqciPyTK2KkU94B6U/oaGzfcL4 pSsvnw3kce0AbR0h1rZYzYFx7zIi9rU1VgjkKYLFJStKIXEUEyeJcrY24c6wr/a2z79X k52Y7Ay00/opXcBG6dd2Sg82o0AanTsUmwSLNUxoiAN2yzsrysIIKwZ/tq21ELMVtFYz BP+A== X-Gm-Message-State: AOAM5313PvCJ94t0mBJRkqY7MKNozl2knfogQejOrUbnZdyk9xwefZwR nUAIekn9zR8mK9+qviTyVTooy6Im X-Google-Smtp-Source: ABdhPJwssVWUuSiNosQYPrR0dLG/PSPYF5PDM3opTKNFUf8Nmue5JPWUTm+Gc5vqqJmvNxkQgtNHkg== X-Received: by 2002:a05:6402:1c07:: with SMTP id ck7mr23677360edb.297.1595888525411; Mon, 27 Jul 2020 15:22:05 -0700 (PDT) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id s2sm1509690ejh.95.2020.07.27.15.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 15:22:03 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1k0BVT-0006km-9w; Tue, 28 Jul 2020 00:22:03 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 28 Jul 2020 00:21:58 +0200 Message-Id: <20200727222158.25910-2-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200727222158.25910-1-peter@korsgaard.com> References: <20200727222158.25910-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] support/testing: drop explicit docker kernel options from docker test 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: Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since commit 0390777bfaff6c6 (package/docker-engine: needs some kernel options), docker-engine now automatically ensures the needed kernel options are enabled, so drop the explicit options from the kernel config. 23:19:27 TestDockerCompose Starting 23:19:28 TestDockerCompose Building 00:14:41 TestDockerCompose Building done 00:15:30 TestDockerCompose Cleaning up . ---------------------------------------------------------------------- Ran 1 test in 3362.784s OK Signed-off-by: Peter Korsgaard --- .../testing/conf/docker-compose-kernel.config | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/support/testing/conf/docker-compose-kernel.config b/support/testing/conf/docker-compose-kernel.config index 9468ef8db8..4d30a578ec 100644 --- a/support/testing/conf/docker-compose-kernel.config +++ b/support/testing/conf/docker-compose-kernel.config @@ -1,16 +1,7 @@ # CONFIG_SWAP is not set CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_HIGH_RES_TIMERS=y -CONFIG_CGROUPS=y -CONFIG_MEMCG=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y # CONFIG_COMPAT_BRK is not set # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_IOSF_MBI=y @@ -38,33 +29,19 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=y # CONFIG_NF_CONNTRACK_PROCFS is not set # CONFIG_NF_CT_PROTO_DCCP is not set # CONFIG_NF_CT_PROTO_SCTP is not set # CONFIG_NF_CT_PROTO_UDPLITE is not set -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_IPVS=y CONFIG_IP_VS=y CONFIG_IP_VS_RR=y CONFIG_IP_VS_NFCT=y -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_NAT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_BRIDGE=y # CONFIG_BRIDGE_IGMP_SNOOPING is not set # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_VIRTIO_BLK=y CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MACVLAN=y -CONFIG_VXLAN=y -CONFIG_VETH=y CONFIG_VIRTIO_NET=y # CONFIG_ETHERNET is not set # CONFIG_WLAN is not set @@ -90,12 +67,9 @@ CONFIG_VIRTIO_PCI=y # CONFIG_X86_PLATFORM_DEVICES is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT4_FS=y -CONFIG_OVERLAY_FS=y -CONFIG_OVERLAY_FS_REDIRECT_DIR=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_KEYS=y CONFIG_SECURITYFS=y # CONFIG_CRYPTO_ECHAINIV is not set # CONFIG_CRYPTO_HW is not set