diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-07-18 04:05:42 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-07-18 04:45:51 +0100 |
| commit | 0e64929fc56e7520b59cab3d1538197797777827 (patch) | |
| tree | c399191d7998c6a31cf4f5f951f3ab7c6618a63d | |
| parent | 880703ae0529dcc2d8e20d284e6a40e37c4104c5 (diff) | |
| download | kernel_replicant_linux-0e64929fc56e7520b59cab3d1538197797777827.tar.gz kernel_replicant_linux-0e64929fc56e7520b59cab3d1538197797777827.tar.bz2 kernel_replicant_linux-0e64929fc56e7520b59cab3d1538197797777827.zip | |
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.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.d/scripts/mod/Makefile.real | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index b912cd734058..26a60a85c39a 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 <ben@decadent.org.uk> 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 489ea4f7b55b..8b097f8970f1 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;}" $< >>$@ |