From 129c83e06ff26ee229951441f213389cf76dc6cc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 30 Oct 2018 22:38:45 +0100 Subject: [PATCH] configs/{at91, atmel}*_dev*: drop Dropbear as it duplicates OpenSSH The "development" defconfigs for Atmel platforms enable both OpenSSH and Dropbear, which doesn't make a lot of sense, as only one SSH server can start on port 22. This commit therefore drops BR2_PACKAGE_DROPBEAR=y from those defconfigs, keeping OpenSSH as an SSH server/client, as was requested by Atmel/Microchip folks in the review of an earlier version of this patch [1]. Since those defconfigs are "development" defconfigs, they are not meant to be minimal, and already provide an arbitrary set of packages, so using openssh is just as good as using dropbear in this case. [1] https://patchwork.ozlabs.org/patch/989516/ Signed-off-by: Thomas Petazzoni Cc: Nicolas Ferre Cc: Joshua Henderson Cc: Ludovic Desroches Signed-off-by: Peter Korsgaard (cherry picked from commit dab153961337e11675a224af0cf3c3e029561910) Signed-off-by: Peter Korsgaard --- configs/at91sam9x5ek_dev_defconfig | 1 - configs/at91sam9x5ek_mmc_dev_defconfig | 1 - configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 1 - configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 1 - configs/atmel_sama5d3_xplained_dev_defconfig | 1 - configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 1 - configs/atmel_sama5d4_xplained_dev_defconfig | 1 - configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 1 - 8 files changed, 8 deletions(-) diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index 3af4ba74e8..3f711ffebb 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -60,7 +60,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 931cf7dec8..73c90a4951 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -63,7 +63,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 3752129202..0c04150151 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -52,7 +52,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 23a2582086..4563ed1163 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -66,7 +66,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index f403e2308d..6a5ed37516 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -62,7 +62,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a3351482cf..37112ce434 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -65,7 +65,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index 7ebfde173c..266411ff9e 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -63,7 +63,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index c31f15a1ee..a295831912 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -66,7 +66,6 @@ BR2_PACKAGE_DTC_PROGRAMS=y BR2_PACKAGE_BLUEZ_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPERF=y BR2_PACKAGE_IPROUTE2=y