simplify the makefile

support x86_64 only

Author: h908714124

Make.rules

@@ -1,106 +0,0 @@
-EFISIGNED = $(patsubst %.efi,%-signed.efi,$(EFIFILES))
-MANPAGES = $(patsubst doc/%.1.in,doc/%.1,$(wildcard doc/*.1.in))
-HELP2MAN = help2man
-ARCH	 = $(shell uname -m | sed 's/i.86/ia32/;s/arm.*/arm/')
-ifeq ($(ARCH),ia32)
-ARCH3264 = -m32
-else ifeq ($(ARCH),x86_64)
-ARCH3264 =
-else ifeq ($(ARCH),aarch64)
-ARCH3264 =
-else ifeq ($(ARCH),arm)
-ARCH3264 =
-else
-$(error unknown architecture $(ARCH))
-endif
-INCDIR	   = -I$(TOPDIR)include/ -I/usr/include/efi -I/usr/include/efi/$(ARCH) -I/usr/include/efi/protocol
-CPPFLAGS   = -DCONFIG_$(ARCH)
-CFLAGS	   = -O2 -g $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check
-LDFLAGS	   = -nostdlib
-CRTOBJ		= crt0-efi-$(ARCH).o
-CRTPATHS	= /lib /lib64 /lib/efi /lib64/efi /usr/lib /usr/lib64 /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi
-CRTPATH		= $(shell for f in $(CRTPATHS); do if [ -e $$f/$(CRTOBJ) ]; then echo $$f; break; fi; done)
-CRTOBJS		= $(CRTPATH)/$(CRTOBJ)
-# there's a bug in the gnu tools ... the .reloc section has to be
-# aligned otherwise the file alignment gets screwed up
-LDSCRIPT	= elf_$(ARCH)_efi.lds
-LDFLAGS		+= -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -L /usr/lib -L /usr/lib64 -T $(LDSCRIPT)
-LOADLIBES	= -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
-FORMAT		= --target=efi-app-$(ARCH)
-OBJCOPY		= objcopy
-MYGUID		= 11111111-2222-3333-4444-123456789abc
-INSTALL		= install
-BINDIR		= $(DESTDIR)/usr/bin
-MANDIR		= $(DESTDIR)/usr/share/man/man1
-EFIDIR		= $(DESTDIR)/usr/share/efitools/efi
-DOCDIR		= $(DESTDIR)/usr/share/efitools
-
-# globally use EFI calling conventions (requires gcc >= 4.7)
-CFLAGS += -DGNU_EFI_USE_MS_ABI
-CFLAGS += -D_XOPEN_SOURCE=700
-CFLAGS += -D_DEFAULT_SOURCE
-
-ifeq ($(ARCH),x86_64)
-  CFLAGS += -DEFI_FUNCTION_WRAPPER -mno-red-zone
-endif
-
-ifeq ($(ARCH),ia32)
-  CFLAGS += -mno-red-zone
-endif
-
-ifeq ($(ARCH),arm)
-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
-  FORMAT = -O binary
-endif
-
-ifeq ($(ARCH),aarch64)
-  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
-  FORMAT = -O binary
-endif
-
-%.so: %.o
-	$(LD) $(LDFLAGS) $^ -o $@ $(LOADLIBES)
-	# check we have no undefined symbols
-	nm -D $@ | grep ' U ' && exit 1 || exit 0
-
-%.h: %.auth
-	./xxdi.pl $< > $@
-
-%.hash: %.efi hash-to-efi-sig-list
-	./hash-to-efi-sig-list $< $@
-
-%-blacklist.esl: %.crt cert-to-efi-hash-list
-	./cert-to-efi-sig-list $< $@
-
-%-hash-blacklist.esl: %.crt cert-to-efi-hash-list
-	./cert-to-efi-hash-list $< $@
-
-%.esl: %.crt cert-to-efi-sig-list
-	./cert-to-efi-sig-list -g $(MYGUID) $< $@
-
-%.o: %.c
-	$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-
-%.crt:
-	openssl req -new -x509 -newkey rsa:2048 -subj "/CN=$*/" -keyout $*.key -out $@ -days 3650 -nodes -sha256
-
-%.cer: %.crt
-	openssl x509 -in $< -out $@ -outform DER
-
-%-subkey.csr:
-	openssl req -new -newkey rsa:2048 -keyout $*-subkey.key -subj "/CN=Subkey $* of KEK/" -out $@ -nodes
-
-%-subkey.crt: %-subkey.csr KEK.crt
-	openssl x509 -req -in $< -CA DB.crt -CAkey DB.key -set_serial 1 -out $@ -days 365
-
-##
-# No need for KEK signing
-##
-#%-kek-signed.efi: %.efi KEK.crt
-#	sbsign --key KEK.key --cert KEK.crt --output $@ $<
-
-%.a:
-	ar rcv $@ $^
-
-doc/%.1: doc/%.1.in %
-	$(HELP2MAN) --no-info -i $< -o $@ ./$*

Makefile

@@ -1,26 +1,18 @@
-BINARIES = efi-updatevar
+BINARY = efi-updatevar
 
-export TOPDIR	:= $(shell pwd)/
+CFLAGS = 
+CFLAGS += -Iinclude
+CFLAGS += -I/usr/include/efi
+CFLAGS += -Wall
+CFLAGS += -pedantic-errors
 
-include Make.rules
+all: $(BINARY).o lib/guid.o lib/kernel_efivars.o
+	$(CC) $(CFLAGS) -o $(BINARY) $^
 
-efi-updatevar: efi-updatevar.o lib/lib.a
-	$(CC) $(ARCH3264) -o $@ $< lib/lib.a
-
-all: $(BINARIES) $(MANPAGES)
-
-install: all
-	$(INSTALL) -m 755 -d $(MANDIR)
-	$(INSTALL) -m 644 $(MANPAGES) $(MANDIR)
-	$(INSTALL) -m 755 -d $(BINDIR)
-	$(INSTALL) -m 755 $(BINARIES) $(BINDIR)
-	$(INSTALL) -m 755 -d $(DOCDIR)
-	$(INSTALL) -m 644 README COPYING $(DOCDIR)
-
-lib/lib.a:
-	$(MAKE) -C lib $(notdir $@)
+%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 clean:
-	rm -f $(BINARIES) *.o
-	rm -f doc/*.1
-	$(MAKE) -C lib clean
+	rm -f $(BINARY)
+	rm -f  *.o
+	rm -f lib/*.o

README.md

@@ -57,7 +57,7 @@ This may only work in setup mode.
 
 To verify that the system is in setup mode, run `mokutil --sb-state` or `sbctl status`.
 
-Now copy each vardata file to its correct destination in the efivars fs:
+Now copy each vardata file to its correct destination in the efivars filesystem:
 
 ```sh
 sudo chattr -i /sys/firmware/efi/efivars/*
@@ -68,5 +68,5 @@ sudo cp /tmp/PK.vardata /sys/firmware/efi/efivars/PK-8be4df61-93ca-11d2-aa0d-00e
 
 Notes:
 
-* The destination filenames in the efivars fs look random, but they are always the same.
+* The destination filenames in the efivars filesystem look random, but they are always the same.
 * After copying `PK.vardata`, the system should not be in setup mode anymore.

doc/cert-to-efi-hash-list.1.in

@@ -67,7 +67,7 @@ int main(int argc, char *argv[]) {
 
   EFI_GUID *owner = get_owner(var);
   if (!owner) {
-    printf(RED "[ERROR]" NC " Variable must be one of: PK, KEK, db, dbx\n", var);
+    printf(RED "[ERROR]" NC " Variable must be one of: PK, KEK, db, dbx\n");
     return 1;
   }