tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

objtool: Avoid checking code drift on busybox's diff

That doesn't have -I to match lines.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-1zqv1h6okt70e2huokkdtf1u@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Arnaldo Carvalho de Melo 1a4bf285 774bec3f

+4 -1
+4 -1
tools/objtool/Makefile
··· 41 41 $(OBJTOOL_IN): fixdep FORCE 42 42 @$(MAKE) $(build)=objtool 43 43 44 + # Busybox's diff doesn't have -I, avoid warning in that case 45 + # 44 46 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) 45 - @(test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \ 47 + @(diff -I 2>&1 | grep -q 'option requires an argument' && \ 48 + test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \ 46 49 diff -I'^#include' arch/x86/insn/insn.c ../../arch/x86/lib/insn.c >/dev/null && \ 47 50 diff -I'^#include' arch/x86/insn/inat.c ../../arch/x86/lib/inat.c >/dev/null && \ 48 51 diff arch/x86/insn/x86-opcode-map.txt ../../arch/x86/lib/x86-opcode-map.txt >/dev/null && \