From 10f9036c560b12506915864cbb71c26a5ee0a603 Mon Sep 17 00:00:00 2001 From: alde103 <aldebaran_103@hotmail.com> Date: Tue, 1 Jun 2021 22:31:54 -0500 Subject: [PATCH] Remove docker_compose test --- linux-5.4.defconfig | 2 +- nerves_defconfig | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/linux-5.4.defconfig b/linux-5.4.defconfig index e56a861..9aea16e 100644 --- a/linux-5.4.defconfig +++ b/linux-5.4.defconfig @@ -161,7 +161,7 @@ CONFIG_SCSI_ISCSI_ATTRS=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_NETDEVICES=y -ONFIG_MACVLAN=m +CONFIG_MACVLAN=m CONFIG_IPVLAN=m CONFIG_VXLAN=m CONFIG_TUN=m diff --git a/nerves_defconfig b/nerves_defconfig index e7953d9..5a85b8c 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -64,16 +64,16 @@ BR2_PACKAGE_MBEDTLS_COMPRESSION=y BR2_PACKAGE_UNIXODBC=y BR2_PACKAGE_LIBMNL=y BR2_PACKAGE_LIBSOCKETCAN=y -BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_IPROUTE2=y -BR2_PACKAGE_MOSQUITTO=y -BR2_PACKAGE_SOCKETCAND=y BR2_PACKAGE_LIBCGROUP=y BR2_PACKAGE_LIBCGROUP_TOOLS=y BR2_PACKAGE_AVAHI=y BR2_PACKAGE_AVAHI_DAEMON=y BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y BR2_PACKAGE_BRIDGE_UTILS=y +BR2_PACKAGE_CAN_UTILS=y +BR2_PACKAGE_IPROUTE2=y +BR2_PACKAGE_MOSQUITTO=y +BR2_PACKAGE_SOCKETCAND=y BR2_PACKAGE_WIRELESS_REGDB=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y @@ -85,7 +85,6 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_CLI_STATIC=y -BR2_PACKAGE_DOCKER_COMPOSE=y BR2_PACKAGE_DOCKER_ENGINE=y # BR2_TARGET_ROOTFS_TAR is not set BR2_NERVES_SYSTEM_NAME="valiot_system_rpi4"