From cfc9c49269c9b5422116cf7a0e1b29e53b07c787 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 21 Feb 2018 12:01:52 +0000
Subject: [PATCH] kernel: Handle non-existing config file for 'make kconfig'

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 kernel/Dockerfile.kconfig | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig
index 163485b75..8ae4023a0 100644
--- a/kernel/Dockerfile.kconfig
+++ b/kernel/Dockerfile.kconfig
@@ -28,14 +28,14 @@ RUN set -e && \
         SERIES=${VERSION%.*}.x && \
         echo "Patching $VERSION $SERIES" && \
         cd /linux-${VERSION} && \
-            if [ -d /patches-${SERIES} ]; then \
-               for patch in /patches-${SERIES}/*.patch; do \
-                   echo "Applying $patch" && \
-                   patch -t -F0 -N -u -p1 < "$patch"; \
-               done; \
-            fi && \
-        mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
-        mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig; \
+        if [ -d /patches-${SERIES} ]; then \
+           for patch in /patches-${SERIES}/*.patch; do \
+               echo "Applying $patch" && \
+               patch -t -F0 -N -u -p1 < "$patch"; \
+           done; \
+        fi && \
+        [ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
+        [ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
     done
 
 ENTRYPOINT ["/bin/sh"]