diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-10 20:07:13 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-12-13 21:36:44 -0500 |
| commit | 919aa45e43a84d40c27c83f6117cfa6542cee14e (patch) | |
| tree | 5da5152ca40016670a066abd948b0960da2c0d4b /kernel/Makefile | |
| parent | 82fab442f5322b016f72891c0db2436c6a6c20b7 (diff) | |
MODSIGN: Avoid using .incbin in C source
Using the asm .incbin statement in C sources breaks any gcc wrapper which
assumes that preprocessed C source is self-contained. Use a separate .S
file to include the siging key and certificate.
[ This means we no longer need SYMBOL_PREFIX which is defined in kernel.h
from cbdbf2abb7844548a7d7a6a2ae7af6b6fbcea401, so I removed it -- RR ]
Tested-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 86e3285ae7e5..0bd9d436341e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -54,7 +54,7 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o | |||
| 54 | obj-$(CONFIG_PROVE_LOCKING) += spinlock.o | 54 | obj-$(CONFIG_PROVE_LOCKING) += spinlock.o |
| 55 | obj-$(CONFIG_UID16) += uid16.o | 55 | obj-$(CONFIG_UID16) += uid16.o |
| 56 | obj-$(CONFIG_MODULES) += module.o | 56 | obj-$(CONFIG_MODULES) += module.o |
| 57 | obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o | 57 | obj-$(CONFIG_MODULE_SIG) += module_signing.o modsign_pubkey.o modsign_certificate.o |
| 58 | obj-$(CONFIG_KALLSYMS) += kallsyms.o | 58 | obj-$(CONFIG_KALLSYMS) += kallsyms.o |
| 59 | obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o | 59 | obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o |
| 60 | obj-$(CONFIG_KEXEC) += kexec.o | 60 | obj-$(CONFIG_KEXEC) += kexec.o |
| @@ -139,7 +139,7 @@ ifeq ($(CONFIG_MODULE_SIG),y) | |||
| 139 | extra_certificates: | 139 | extra_certificates: |
| 140 | touch $@ | 140 | touch $@ |
| 141 | 141 | ||
| 142 | kernel/modsign_pubkey.o: signing_key.x509 extra_certificates | 142 | kernel/modsign_certificate.o: signing_key.x509 extra_certificates |
| 143 | 143 | ||
| 144 | ############################################################################### | 144 | ############################################################################### |
| 145 | # | 145 | # |
