From cef1202f7715e58241d562441b043afd9c17ce26 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 10 May 2019 22:16:16 +0100 Subject: eclass/linux-build: improve config diff ignore CONFIG_GCC_VERSION --- eclass/linux-build.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'eclass') diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass index 4922ded8..20e056d0 100644 --- a/eclass/linux-build.eclass +++ b/eclass/linux-build.eclass @@ -313,8 +313,12 @@ _linux-build_src_prepare_build() { emake olddefconfig "${myopt[@]}" fi - if diff -Nu0 "${BUILDDIR}/.config.old" "${BUILDDIR}/.config" \ - | egrep -q '^(\-|\+)CONFIG_' ; then + if ! diff -q \ + --ignore-matching-lines '^# ' \ + --ignore-matching-lines '^CONFIG_GCC_VERSION=' \ + --ignore-matching-lines '^CONFIG_CLANG_VERSION=' \ + "${BUILDDIR}/.config.old" "${BUILDDIR}/.config" ; then + eerror "You configuration is not up to date" diff -Nu "${BUILDDIR}/.config.old" "${BUILDDIR}/.config" die "Bad configuration" -- cgit v1.2.3