From 0e64929fc56e7520b59cab3d1538197797777827 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 18 Jul 2017 04:05:42 +0100 Subject: [PATCH] scripts/mod: Update modpost wrapper for 4.12 Commit cf0c3e68aa81 "kbuild: fix asm-offset generation to work with clang" changed the macros used by devicetable-offsets.c. Copy the new sed code from upstream scripts/Makefile.lib. --- debian/changelog | 1 + debian/rules.d/scripts/mod/Makefile.real | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b912cd734..26a60a85c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (4.12.2-1~exp1) UNRELEASED; urgency=medium [ Ben Hutchings ] * Add script to regenerate lockdown patch series from git * [rt] Disable until it is updated for 4.12 or later + * scripts/mod: Update modpost wrapper for 4.12 -- Ben Hutchings Tue, 18 Jul 2017 00:04:07 +0100 diff --git a/debian/rules.d/scripts/mod/Makefile.real b/debian/rules.d/scripts/mod/Makefile.real index 489ea4f7b..8b097f897 100644 --- a/debian/rules.d/scripts/mod/Makefile.real +++ b/debian/rules.d/scripts/mod/Makefile.real @@ -17,7 +17,7 @@ real-$(TYPE)/devicetable-offsets.s: $(SOURCEDIR)/devicetable-offsets.c real-$(TYPE)/devicetable-offsets.h: real-$(TYPE)/devicetable-offsets.s echo >$@ "#define __DEVICEVTABLE_OFFSETS_H__" - sed -ne "/^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" $< >>$@ + sed -ne "s:^[[:space:]]*\.ascii[[:space:]]*\"\(.*\)\".*:\1:; \ + /^->/{s:->#\(.*\):/* \1 */:; \ + s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ + s:->::; p;}" $< >>$@