summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2021-12-26 12:36:12 +0100
committerFelix Singer <felixsinger@posteo.net>2021-12-26 12:05:23 +0000
commit5e4232d389d15d5db6952de7dadab1db427ae8d3 (patch)
treeef08eaa64856a95ff8553205ec670d01cc4d3fe1
parentf371a78d907666afde4d945a56f9ca1e9c2152c8 (diff)
util/liveiso: Merge build scripts
Merge build scripts to `build.sh`. The new one takes the desired NixOS config as an argument. Example: $ build.sh console.nix Change-Id: I49360a5c57954a205c697a4ae07361779db2aa83 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/60372 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rwxr-xr-xutil/liveiso/build-console.sh3
-rwxr-xr-xutil/liveiso/build-graphical.sh3
-rwxr-xr-xutil/liveiso/build.sh13
3 files changed, 13 insertions, 6 deletions
diff --git a/util/liveiso/build-console.sh b/util/liveiso/build-console.sh
deleted file mode 100755
index ced2ca748c..0000000000
--- a/util/liveiso/build-console.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=console.nix
diff --git a/util/liveiso/build-graphical.sh b/util/liveiso/build-graphical.sh
deleted file mode 100755
index 8e794787a1..0000000000
--- a/util/liveiso/build-graphical.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=graphical.nix
diff --git a/util/liveiso/build.sh b/util/liveiso/build.sh
new file mode 100755
index 0000000000..ee63bc538a
--- /dev/null
+++ b/util/liveiso/build.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+config=$1
+
+if [ -z "$config" ] || [ ! -f "$config" ]; then
+ echo "Usage: $0 <config.nix>"
+ echo "No config given. Exiting."
+ exit 1
+fi
+
+nix-build '<nixpkgs/nixos>' \
+ -A config.system.build.isoImage \
+ -I nixos-config=$config