From 5e4232d389d15d5db6952de7dadab1db427ae8d3 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 26 Dec 2021 12:36:12 +0100 Subject: [PATCH] util/liveiso: Merge build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60372 Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- util/liveiso/build-console.sh | 3 --- util/liveiso/build-graphical.sh | 3 --- util/liveiso/build.sh | 13 +++++++++++++ 3 files changed, 13 insertions(+), 6 deletions(-) delete mode 100755 util/liveiso/build-console.sh delete mode 100755 util/liveiso/build-graphical.sh create mode 100755 util/liveiso/build.sh 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 '' -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 '' -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 " + echo "No config given. Exiting." + exit 1 +fi + +nix-build '' \ + -A config.system.build.isoImage \ + -I nixos-config=$config