diff options
Diffstat (limited to 'host/rootfs')
| -rw-r--r-- | host/rootfs/Makefile | 15 | ||||
| -rw-r--r-- | host/rootfs/default.nix | 2 | ||||
| -rw-r--r-- | host/rootfs/shell.nix | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 4c187b0..f4b17a0 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -1,18 +1,7 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> -# qemu-kvm is non-standard, but is present in at least Fedora and -# Nixpkgs. If you don't have qemu-kvm, you'll need to set e.g. -# QEMU_KVM = qemu-system-x86_64 -enable-kvm. -QEMU_KVM = qemu-kvm - -VERITYSETUP = veritysetup - -# tar2ext4 will leave half a filesystem behind if it's interrupted -# half way through. -build/rootfs.ext4: build/rootfs.tar - tar2ext4 -i build/rootfs.tar -o $@.tmp - mv $@.tmp $@ +include ../../lib/common.mk FILES = \ etc/fonts/fonts.conf \ @@ -47,6 +36,8 @@ LINKS = bin sbin BUILD_FILES = build/etc/mdev/modalias.sh build/etc/s6-rc +build/rootfs.ext4: + build/empty: mkdir -p $@ diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index acc0719..95bb3a8 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> # SPDX-FileCopyrightText: 2022 Unikie -import ../../nix/eval-config.nix ( +import ../../lib/eval-config.nix ( { config, src, ... }: let inherit (config) pkgs; in pkgs.pkgsStatic.callPackage ( diff --git a/host/rootfs/shell.nix b/host/rootfs/shell.nix index 94e84be..fea9b16 100644 --- a/host/rootfs/shell.nix +++ b/host/rootfs/shell.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> # SPDX-FileCopyrightText: 2022 Unikie -import ../../nix/eval-config.nix ({ config, ... } @ args: +import ../../lib/eval-config.nix ({ config, ... } @ args: let rootfs = import ./. { inherit config; }; |