diff options
Diffstat (limited to 'release')
| -rw-r--r-- | release/live/Makefile | 9 | ||||
| -rw-r--r-- | release/live/default.nix | 12 |
2 files changed, 7 insertions, 14 deletions
diff --git a/release/live/Makefile b/release/live/Makefile index 773d597..f887f0a 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -10,15 +10,14 @@ MCOPY = mcopy MKFS_FAT = mkfs.fat MMD = mmd OBJCOPY = objcopy -SCRIPTS = ../../scripts TRUNCATE = truncate VERITYSETUP = veritysetup -build/live.img: $(SCRIPTS)/format-uuid.sh $(SCRIPTS)/make-gpt.sh build/boot.fat build/rootfs.verity.superblock build/rootfs.verity.roothash $(ROOT_FS) $(EXT_FS) - $(SCRIPTS)/make-gpt.sh $@.tmp \ +build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh build/boot.fat build/rootfs.verity.superblock build/rootfs.verity.roothash $(ROOT_FS) $(EXT_FS) + ../../scripts/make-gpt.sh $@.tmp \ build/boot.fat:c12a7328-f81f-11d2-ba4b-00a0c93ec93b \ - 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)") \ - $(ROOT_FS):4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$($(SCRIPTS)/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") \ + 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)") \ + $(ROOT_FS):4f68bce3-e8cd-4db1-96e7-fbcaf984b709:$$(../../scripts/format-uuid.sh "$$(head -c 32 build/rootfs.verity.roothash)") \ $(EXT_FS):9293e1ff-cee4-4658-88be-898ec863944f mv $@.tmp $@ diff --git a/release/live/default.nix b/release/live/default.nix index 4301ccc..66bba26 100644 --- a/release/live/default.nix +++ b/release/live/default.nix @@ -9,13 +9,12 @@ let inherit (config) pkgs; - inherit (pkgs.lib) cleanSource cleanSourceWith hasSuffix toUpper; + inherit (pkgs.lib) hasSuffix toUpper; extfs = pkgs.pkgsStatic.callPackage ../../host/initramfs/extfs.nix { inherit config; }; rootfs = import ../../host/rootfs { inherit config; }; - scripts = import ../../scripts { inherit config; }; initramfs = import ../../host/initramfs { inherit config rootfs; }; efiArch = stdenv.hostPlatform.efiArch; in @@ -23,12 +22,8 @@ in stdenvNoCC.mkDerivation { name = "spectrum-live.img"; - src = cleanSourceWith { - filter = name: _type: - name != "${toString ./.}/build" && - !(hasSuffix ".nix" name); - src = cleanSource ./.; - }; + inherit (config) src; + sourceRoot = "source/release/live"; nativeBuildInputs = [ cryptsetup dosfstools jq mtools util-linux ]; @@ -40,7 +35,6 @@ stdenvNoCC.mkDerivation { EFINAME = "BOOT${toUpper efiArch}.EFI"; buildFlags = [ "build/live.img" ]; - makeFlags = [ "SCRIPTS=${scripts}" ]; installPhase = '' runHook preInstall |