diff options
| author | Tom Rini <[email protected]> | 2019-12-06 16:45:46 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-12-06 16:45:46 -0500 |
| commit | d79ae6aa3087a6434b5ecdb51d20dca20c8e1596 (patch) | |
| tree | ef06de49134213591e529ece83d4cec3095e893e /scripts/Makefile.build | |
| parent | bead4f2f2c85e1bf39d2c80ef733f1325eb336bb (diff) | |
| parent | fb013eee68d08403572ef3c579f6688bbe33fd47 (diff) | |
Merge branch '2019-12-06-master-imports'
- Allow for the sysboot command, which is used to parse extlinux.conf
files to be used without PXE support. There is no functional change
here aside from fixing distro boot in a few cases where we actually
lacked the ability to parse the extlinux.conf file
- Add the x509/pkcs7 parsers from Linux, a pre-requisite to EFI Secure
Boot support.
Diffstat (limited to 'scripts/Makefile.build')
| -rw-r--r-- | scripts/Makefile.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index f7a041296d3..26eb701f8de 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -328,10 +328,10 @@ $(obj)/%.lds: $(src)/%.lds.S FORCE # ASN.1 grammar # --------------------------------------------------------------------------- quiet_cmd_asn1_compiler = ASN.1 $@ - cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \ + cmd_asn1_compiler = $(objtree)/tools/asn1_compiler $< \ $(subst .h,.c,$@) $(subst .c,.h,$@) -$(obj)/%-asn1.c $(obj)/%-asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler +$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/tools/asn1_compiler $(call cmd,asn1_compiler) # Build the compiled-in targets |