diff --git a/Makefile b/Makefile index 68781c97ab..13882020ff 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = /bin/bash GITHUB_ACTOR = $(shell git remote -v | grep origin | head -1 | cut -d/ -f4) GITHUB_HEAD_REF = $(shell git rev-parse --abbrev-ref HEAD) -amd64-lean-desktop-image: +amd64-lean-desktop-uefi-image: # Run the build script cd ci/amd64 && \ bash packer.build.amd64-debian.sh \ @@ -28,7 +28,7 @@ amd64-lean-desktop-image: # List the generated files ls -lah ci/amd64/builds/raspiblitz-amd64-debian-lean-qemu/raspiblitz-amd64-debian-lean.qcow2.* -amd64-lean-server-image: +amd64-lean-server-legacyboot-image: # Run the build script cd ci/amd64 && \ bash packer.build.amd64-debian.sh \ @@ -54,7 +54,7 @@ amd64-lean-server-image: # List the generated files ls -lah ci/amd64/builds/raspiblitz-amd64-debian-lean-qemu/raspiblitz-amd64-debian-lean.qcow2.* -amd64-fatpack-image: +amd64-fatpack-desktop-uefi-image: # Run the build script cd ci/amd64 && \ bash packer.build.amd64-debian.sh \ diff --git a/ci/README.md b/ci/README.md index 44b8f6be0c..339018afbc 100644 --- a/ci/README.md +++ b/ci/README.md @@ -7,16 +7,16 @@ - [Local build](#local-build) - [Generate an arm64-rpi image](#generate-an-arm64-rpi-image) - - [Generate an amd64 image](#generate-an-amd64-image) + - [Generate an amd64 image with gnome desktop](#generate-an-amd64-image-with-gnome-desktop) - [Images generated in github actions](#images-generated-in-github-actions) - [Write the image to a disk connected with USB](#write-the-image-to-a-disk-connected-with-usb) - [Convert the qcow2 volume to a raw disk image](#convert-the-qcow2-volume-to-a-raw-disk-image) - [Write to a disk connected with USB with Balena Etcher or `dd`](#write-to-a-disk-connected-with-usb-with-balena-etcher-or-dd) - [Extend the partition on the new disk (optional)](#extend-the-partition-on-the-new-disk-optional) - [The first boot](#the-first-boot) - - [fatpack image](#fatpack-image) + - [the default image with desktop](#the-default-image-with-desktop) - [lean image](#lean-image) - - [Add Gnome desktop (optional)](#add-gnome-desktop-optional) + - [Add Gnome desktop to the server image (optional)](#add-gnome-desktop-to-the-server-image-optional) - [Add wifi (optional)](#add-wifi-optional) - [Add wifi driver (optional)](#add-wifi-driver-optional) - [Workflow notes](#workflow-notes) @@ -59,7 +59,7 @@ The workflow locally and in github actions generates a .qcow2 format amd64 image * libvirt / virsh / virt-manager (https://virt-manager.org/) * written to disk and booted with legacy boot (non-UEFI) ``` - make amd64-lean-desktop-image + make amd64-lean-desktop-uefi-image ``` * find the compressed .qcow2 image and sha256 hashes in the `ci/amd64/builds` directory @@ -69,7 +69,7 @@ The workflow locally and in github actions generates a .qcow2 format amd64 image https://github.com/rootzoll/raspiblitz/actions/workflows/amd64-lean-image.yml?query=workflow%3Aamd64-lean-image-build+branch%3Adev+is%3Asuccess++ ``` # unzip to the same directory - unzip raspiblitz-amd64-image-YEAR-MM-DD-COMMITHASH.zip + unzip ./raspiblitz-amd64-image-YEAR-MM-DD-COMMITHASH.zip ``` ## Write the image to a disk connected with USB ### Convert the qcow2 volume to a raw disk image @@ -78,7 +78,7 @@ https://github.com/rootzoll/raspiblitz/actions/workflows/amd64-lean-image.yml?qu # unzip gzip -dkv raspiblitz-amd64-debian-lean.qcow2.gz # convert - qemu-img convert raspiblitz-amd64-debian-lean.qcow2 raspiblitz-amd64-debian-lean.img + qemu-img convert ./raspiblitz-amd64-debian-lean.qcow2 ./raspiblitz-amd64-debian-lean.img ``` ### Write to a disk connected with USB with Balena Etcher or `dd`