Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60372 )
Change subject: util/liveiso: Merge build scripts ......................................................................
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 --- D util/liveiso/build-console.sh D util/liveiso/build-graphical.sh A util/liveiso/build.sh 3 files changed, 13 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/util/liveiso/build-console.sh b/util/liveiso/build-console.sh deleted file mode 100755 index ced2ca7..0000000 --- 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 8e79478..0000000 --- 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 0000000..ee63bc5 --- /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