projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 2068d368 FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> | |
| 3 | Date: Tue, 3 Apr 2018 14:59:26 +0200 | |
| 4 | Subject: [PATCH] Revert "UBUNTU: [Packaging] retpoline -- add safe usage hint | |
| 5 | support" | |
| 6 | MIME-Version: 1.0 | |
| 7 | Content-Type: text/plain; charset=UTF-8 | |
| 8 | Content-Transfer-Encoding: 8bit | |
| 9 | ||
| 10 | This (partially) reverts commit 1e39020902132b3065bedf0a0c33031e89f9f57a. | |
| 11 | ||
| 12 | this modifies the upstream kernel build to call an Ubuntu script which | |
| 13 | we remove before building. it would also be required by any module | |
| 14 | builds afterwards and is not shipped by Ubuntu's kernel packages either. | |
| 15 | ||
| 16 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 17 | --- | |
| 18 | scripts/Makefile.build | 10 +--------- | |
| 19 | 1 file changed, 1 insertion(+), 9 deletions(-) | |
| 20 | ||
| 21 | diff --git a/scripts/Makefile.build b/scripts/Makefile.build | |
| 22 | index 9dc3f41f4ff5..36247e983f4b 100644 | |
| 23 | --- a/scripts/Makefile.build | |
| 24 | +++ b/scripts/Makefile.build | |
| 25 | @@ -297,27 +297,19 @@ objtool_dep = $(objtool_obj) \ | |
| 26 | $(wildcard include/config/orc/unwinder.h \ | |
| 27 | include/config/stack/validation.h) | |
| 28 | ||
| 29 | -ifdef CONFIG_RETPOLINE | |
| 30 | -cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/debian/scripts/retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))"; | |
| 31 | -else | |
| 32 | -cmd_ubuntu_retpoline = | |
| 33 | -endif | |
| 34 | - | |
| 35 | define rule_cc_o_c | |
| 36 | $(call echo-cmd,checksrc) $(cmd_checksrc) \ | |
| 37 | $(call cmd_and_fixdep,cc_o_c) \ | |
| 38 | $(cmd_checkdoc) \ | |
| 39 | $(call echo-cmd,objtool) $(cmd_objtool) \ | |
| 40 | $(cmd_modversions_c) \ | |
| 41 | - $(call echo-cmd,ubuntu-retpoline) $(cmd_ubuntu_retpoline) \ | |
| 42 | $(call echo-cmd,record_mcount) $(cmd_record_mcount) | |
| 43 | endef | |
| 44 | ||
| 45 | define rule_as_o_S | |
| 46 | $(call cmd_and_fixdep,as_o_S) \ | |
| 47 | $(call echo-cmd,objtool) $(cmd_objtool) \ | |
| 48 | - $(cmd_modversions_S) \ | |
| 49 | - $(call echo-cmd,ubuntu-retpoline) $(cmd_ubuntu_retpoline) | |
| 50 | + $(cmd_modversions_S) | |
| 51 | endef | |
| 52 | ||
| 53 | # List module undefined symbols (or empty line if not enabled) | |
| 54 | -- | |
| 55 | 2.14.2 | |
| 56 |