diff options
Diffstat (limited to 'host/rootfs')
-rw-r--r-- | host/rootfs/Makefile | 9 | ||||
-rw-r--r-- | host/rootfs/default.nix | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 9559c06..4c187b0 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -6,7 +6,6 @@ # QEMU_KVM = qemu-system-x86_64 -enable-kvm. QEMU_KVM = qemu-kvm -SCRIPTS = ../../scripts VERITYSETUP = veritysetup # tar2ext4 will leave half a filesystem behind if it's interrupted @@ -134,10 +133,10 @@ build/rootfs.verity.roothash: build/rootfs.verity build/rootfs.verity.superblock: build/rootfs.verity tail -n +2 build/rootfs.verity > $@ -build/live.img: $(SCRIPTS)/format-uuid.sh $(SCRIPTS)/make-gpt.sh build/rootfs.verity.superblock build/rootfs.verity.roothash build/rootfs.ext4 - $(SCRIPTS)/make-gpt.sh $@.tmp \ - build/rootfs.verity.superblock:2c7357ed-ebd2-46d9-aec1-23d437ec2bf5:$$($(SCRIPTS)/format-uuid.sh "$$(dd if=build/rootfs.verity.roothash bs=32 skip=1 count=1 status=none)") \ - build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$($(SCRIPTS)/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") +build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh build/rootfs.verity.superblock build/rootfs.verity.roothash build/rootfs.ext4 + ../../scripts/make-gpt.sh $@.tmp \ + build/rootfs.verity.superblock:2c7357ed-ebd2-46d9-aec1-23d437ec2bf5:$$(../../scripts/format-uuid.sh "$$(dd if=build/rootfs.verity.roothash bs=32 skip=1 count=1 status=none)") \ + build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$(../../scripts/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") mv $@.tmp $@ run: build/live.img $(EXT_FS) build/rootfs.verity.roothash diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 0a84f55..ad997d1 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -11,7 +11,7 @@ pkgs.pkgsStatic.callPackage ( }: let - inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; + inherit (lib) concatMapStringsSep hasSuffix; inherit (nixosAllHardware.config.hardware) firmware; start-vm = import ../start-vm { @@ -120,11 +120,8 @@ in stdenvNoCC.mkDerivation { name = "spectrum-rootfs"; - src = cleanSourceWith { - filter = name: _type: - name != "${toString ./.}/build" && !(hasSuffix ".nix" name); - src = cleanSource ./.; - }; + inherit (config) src; + sourceRoot = "source/host/rootfs"; nativeBuildInputs = [ s6-rc tar2ext4 ]; |