From 5b2bdd3ef7a2f8966901f91b5341b64f9891969e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 20 Oct 2018 01:02:56 +0100 Subject: [PATCH] kernel: Print unified diff if kernel config does not match After 'make oldconfig' we check that that the kernel config is as we expect and error if they don't. We used to print the default 'diff' output on a mismatch but a unified diff is easier to read. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 4fbbf944f..8d2d43cf0 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -112,7 +112,7 @@ RUN case $(uname -m) in \ fi && \ make defconfig && \ make oldconfig && \ - if [ -z "${EXTRA}" ] && [ -z "${DEBUG}" ]; then diff .config ${KERNEL_DEF_CONF}; fi + if [ -z "${EXTRA}" ] && [ -z "${DEBUG}" ]; then diff -u .config ${KERNEL_DEF_CONF}; fi # Kernel