proxmox-mirrors/efi-boot-shim
1
0
Fork 0
mirror of https://git.proxmox.com/git/efi-boot-shim synced 2025-07-26 23:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated version 13~z1 from 'upstream/13_z1'

Browse Source 
with Debian dir e38346a2ee
This commit is contained in:
Mathieu Trudel-Lapierre 2017-09-29 11:18:56 -04:00
commit 81250bb1a1
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,4 +1,4 @@
VERSION = 12 VERSION = 13
ifneq ($(origin RELEASE),undefined) ifneq ($(origin RELEASE),undefined)
DASHRELEASE ?= -$(RELEASE) DASHRELEASE ?= -$(RELEASE)
else else
@ -171,7 +171,7 @@ shim.cer: shim.crt
.NOTPARALLEL: shim_cert.h .NOTPARALLEL: shim_cert.h
shim_cert.h: shim.cer shim_cert.h: shim.cer
echo "static UINT8 shim_cert[] = {" > $@ echo "static UINT8 shim_cert[] __attribute__((__unused__)) = {" > $@
$(HEXDUMP) -v -e '1/1 "0x%02x, "' $< >> $@ $(HEXDUMP) -v -e '1/1 "0x%02x, "' $< >> $@
echo "};" >> $@ echo "};" >> $@
@ -337,7 +337,7 @@ clean:
$(MAKE) -C Cryptlib/OpenSSL -f $(TOPDIR)/Cryptlib/OpenSSL/Makefile clean $(MAKE) -C Cryptlib/OpenSSL -f $(TOPDIR)/Cryptlib/OpenSSL/Makefile clean
$(MAKE) -C lib -f $(TOPDIR)/lib/Makefile clean $(MAKE) -C lib -f $(TOPDIR)/lib/Makefile clean
rm -rf $(TARGET) $(OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb $(BOOTCSVNAME) rm -rf $(TARGET) $(OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb $(BOOTCSVNAME)
rm -f *.debug *.so *.efi *.efi.* *.tar.* version.c rm -f *.debug *.so *.efi *.efi.* *.tar.* version.c buildid
GITTAG = $(VERSION) GITTAG = $(VERSION)

13
buildid.c
View File

@ -113,6 +113,7 @@ static void handle_one(char *f)
char *b = NULL; char *b = NULL;
size_t sz; size_t sz;
uint8_t *data; uint8_t *data;
ssize_t written;
if (!strcmp(f, "-")) { if (!strcmp(f, "-")) {
fd = STDIN_FILENO; fd = STDIN_FILENO;
@ -132,10 +133,14 @@ static void handle_one(char *f)
b = alloca(sz * 2 + 1); b = alloca(sz * 2 + 1);
data2hex(data, sz, b); data2hex(data, sz, b);
if (b) { if (b) {
write(1, f, strlen(f)); written = write(1, f, strlen(f));
write(1, " ", 1); if (written < 0)
write(1, b, strlen(b)); errx(1, "Error writing build id");
write(1, "\n", 1); written = write(1, " ", 1);
written = write(1, b, strlen(b));
if (written < 0)
errx(1, "Error writing build id");
written = write(1, "\n", 1);
} }
} }
elf_end(elf); elf_end(elf);

2
commit
View File

@ -1 +1 @@
23ce039c434d164a3848c829b237899cc17c1d21 5e827007b3d95c4ce999422462248f5e7d3f270f