Commit 81250bb1 authored by Mathieu Trudel-Lapierre's avatar Mathieu Trudel-Lapierre

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

with Debian dir e38346a2eec5376ccf228af4ba0e2d170f07448f
parents a9cd148a 6025103c
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 ...@@ -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: ...@@ -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)
......
...@@ -113,6 +113,7 @@ static void handle_one(char *f) ...@@ -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) ...@@ -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);
......
23ce039c434d164a3848c829b237899cc17c1d21 5e827007b3d95c4ce999422462248f5e7d3f270f
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment