Skip to content

Commit

Permalink
Update README and makefile build script
Browse files Browse the repository at this point in the history
  • Loading branch information
jhenstridge committed Jul 4, 2024
1 parent 7fa5a72 commit a9d0108
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

EXTRA_SNAPS =
ALL_SNAPS = $(EXTRA_SNAPS) evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-system-monitor gnome-text-editor gnome-weather loupe snapd-desktop-integration snap-store ubuntu-core-desktop-init workshops
ALL_SNAPS = $(EXTRA_SNAPS) firefox
all: pc.tar.gz

pc.img: ubuntu-core-desktop-22-amd64.model $(EXTRA_SNAPS)
pc.img: ubuntu-core-desktop-24-amd64.model $(EXTRA_SNAPS)
rm -rf img/
ubuntu-image snap --output-dir img --image-size 20G \
$(foreach snap,$(ALL_SNAPS),--snap $(snap)) $<
mv img/pc.img .

pc-dangerous.img: ubuntu-core-desktop-22-amd64-dangerous.model $(EXTRA_SNAPS)
pc-dangerous.img: ubuntu-core-desktop-24-amd64-dangerous.model $(EXTRA_SNAPS)
rm -rf dangerous/
ubuntu-image snap --output-dir dangerous --image-size 20G \
$(foreach snap,$(ALL_SNAPS),--snap $(snap)) $<
Expand Down
20 changes: 16 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ in a Qemu virtual machine by following these instructions:
# Delete VM if already registered
virsh --connect qemu:///session undefine --nvram core-desktop
virt-install --connect qemu:///session --name core-desktop \
--memory 2048 --vcpus 2 --boot uefi --os-variant ubuntu22.04 \
--memory 2048 --vcpus 2 --boot uefi --os-variant ubuntu24.04 \
--video virtio,accel3d=no --graphics spice \
--import --disk path=$(pwd)/pc.img,format=raw
```
Expand Down Expand Up @@ -50,12 +50,24 @@ repositories. Namely:
| Snap | Repo | Recipe | Notes |
| ---- | ---- | ------ | ----- |
| `core22-desktop` | [core-base-desktop](https://github.com/canonical/core-base-desktop) | [via launchpad](https://launchpad.net/~ubuntu-desktop/+snap/core22-desktop) | base snap, forked from `core22` to integrate GDM graphical login |
| `pc-desktop` | [pc-amd64-gadget-desktop](https://github.com/canonical/pc-amd64-gadget-desktop) | [via launchpad](https://launchpad.net/~ubuntu-desktop/pc-gadget-desktop/+snap/pc-amd64-gadget-desktop-core22) | gadget snap, forked from `pc`, using `core22-desktop` as a base |
| `core24-desktop` | [core-base-desktop:24](https://github.com/canonical/core-base-desktop/tree/24) | [via launchpad](https://launchpad.net/~desktop-snappers/ubuntu-core-desktop/+snap/core24-desktop) | base snap, forked from `core24` to integrate GDM graphical login |
| `pc-desktop` | [pc-amd64-gadget-desktop:24](https://github.com/canonical/pc-amd64-gadget-desktop/tree/24) | [via launchpad](https://launchpad.net/~ubuntu-desktop/pc-gadget-desktop/+snap/pc-amd64-gadget-desktop-core24) | gadget snap, forked from `pc`, using `core24-desktop` as a base |
| `ubuntu-desktop-session` | [ubuntu-desktop-session-snap:24](https://github.com/canonical/ubuntu-desktop-session-snap/tree/24) | [via launchpad](https://launchpad.net/~ubuntu-desktop/+snap/ubuntu-desktop-session-snap-core24) | provides the confined desktop session |
| `snapd` | [ubuntu-core-desktop-snapd:master](https://github.com/canonical/ubuntu-core-desktop-snapd) | [via launchpad](https://launchpad.net/~snappy-dev/+snap/ubuntu-core-desktop-snapd) | a branch of snapd with additional changes not yet merged to mainline |
<details>
<summary>Core 22 Repositories</summary>
| Snap | Repo | Recipe | Notes |
| ---- | ---- | ------ | ----- |
| `core22-desktop` | [core-base-desktop:22](https://github.com/canonical/core-base-desktop/tree/22) | [via launchpad](https://launchpad.net/~ubuntu-desktop/+snap/core22-desktop) | base snap, forked from `core22` to integrate GDM graphical login |
| `pc-desktop` | [pc-amd64-gadget-desktop:22](https://github.com/canonical/pc-amd64-gadget-desktop/tree/22) | [via launchpad](https://launchpad.net/~ubuntu-desktop/pc-gadget-desktop/+snap/pc-amd64-gadget-desktop-core22) | gadget snap, forked from `pc`, using `core22-desktop` as a base |
| `pi-desktop` | [pi-desktop](https://github.com/canonical/pi-desktop) | [via launchpad](https://launchpad.net/~desktop-snappers/+snap/pi-desktop) | Pi gadget snap, forked from `pi`, using `core22-desktop` as a base |
| `ubuntu-desktop-session` | [ubuntu-desktop-session-snap](https://github.com/canonical/ubuntu-desktop-session-snap) | [via launchpad](https://launchpad.net/~ubuntu-desktop/+snap/ubuntu-desktop-session-snap-core22) | provides the confined desktop session |
| `ubuntu-desktop-session` | [ubuntu-desktop-session-snap:22](https://github.com/canonical/ubuntu-desktop-session-snap/tree/22) | [via launchpad](https://launchpad.net/~ubuntu-desktop/+snap/ubuntu-desktop-session-snap-core22) | provides the confined desktop session |
| `snapd` | [ubuntu-core-desktop-snapd](https://github.com/canonical/ubuntu-core-desktop-snapd) | [via ~snappy-dev](https://launchpad.net/~snappy-dev/+snap/ubuntu-core-desktop-snapd) | a branch of snapd with additional changes not yet merged to mainline |
</details>
In addition, the base snap uses packages from the [desktop-snappers
core-desktop
PPA](https://launchpad.net/~desktop-snappers/+archive/ubuntu/core-desktop). This
Expand Down

0 comments on commit a9d0108

Please sign in to comment.