rootfs/Makefile

cleanups

4 files changed, 18 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index c1dfb8a..e29dbb7 100644
--- a/Makefile
+++ b/Makefile
@@ -274,7 +274,8 @@ initrd: install
 update: apt-get-update-stamp
         git pull --ff-only --recurse-submodules
 
-upgrade: install-submodules install initrd
+upgrade: install-submodules install
+        ./src/mkinitramfs-samizdat -f
 
 upgrade-key: upgrade key
 
@@ -289,6 +290,7 @@ $(PERSIST_FILE):
 usb emu efi: initrd rootfs
 key keymu emu-key: initrd
 cleanmu: rootfs-clean total-destroy emu
+up: update upgrade
 mu: up cleanmu
 
 usb emu key keymu emu-key total-destroy efi:
diff --git a/kiki b/kiki
deleted file mode 160000
-Subproject a791ba78a5e63bb96de359ee53251e1e79e25d8
diff --git a/partitions/Makefile b/partitions/Makefile
index 91a60d9..e51ddd7 100644
--- a/partitions/Makefile
+++ b/partitions/Makefile
@@ -33,13 +33,20 @@ optional_persist_disk != [ ! -e $(PERSIST_FILE) ] || printf %s '-drive file=$(PE
 usb: $(whole)
         usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb"
 
+
 # QEMU_DISPLAY_OPTIONS = -nographic
 QEMU_DISPLAY_OPTIONS = -display gtk
 
-QEMU_OPTIONS = $(QEMU_BIOS_OPTIONS) $(QEMU_DISPLAY_OPTIONS)
+define QEMU_OPTIONS
+-global isa-fdc.fdtypeA=none
+$(QEMU_BIOS_OPTIONS)
+$(QEMU_DISPLAY_OPTIONS)
+endef
 
 define emu
-        NO_AT_BRIDGE=1 qemu-system-x86_64 ${QEMU_OPTIONS} -m 800 -enable-kvm -boot c \
+        NO_AT_BRIDGE=1 qemu-system-x86_64 \
+          ${QEMU_OPTIONS:%=%} \
+          -m 800 -enable-kvm -boot c \
           -drive file=$(1),media=disk,driver=raw \
           $(optional_persist_disk)
 endef
diff --git a/rootfs/Makefile b/rootfs/Makefile
index 09dba42..3c7cf0a 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -12,11 +12,14 @@ patchfs ?= samizdat.patch.btrfs
 
 .DEFAULT_GOAL = all
 
-.PHONY: all rootfs patchfs gold
-all: $(rootfs) $(patchfs) $(gold)
+.PHONY: all rootfs patchfs clean
+all: $(rootfs) $(patchfs)
+
+clean = $(patchfs) $(rootfs) $(rootfs:%.seed.btrfs=%.btrfs)
+clean := $(clean) $(clean:%=%.tmp)
 
 clean:
-        rm -f $(patsubst %.seed.btrfs,%.btrfs,$(rootfs)) $(rootfs) $(patchfs) $(gold)
+        rm -f $(clean)
 
 rootfs: $(rootfs)
 patchfs: $(patchfs)