Skip to content

Commit

Permalink
ImageBuildRoot: Use ostree checkout for buildroot
Browse files Browse the repository at this point in the history
Currently the buildroot is constructed from scratch using `mmdebstrap`.
That requires knowing the exact apt sources that the branch of the OS
uses. Instead, the buildroot can be created from a checkout of the
ostree that's going to be used for the deployment since it already
contains the appropriate apt/dpkg configuration.

That changes the host requirements from `mmdebstrap` and `rsync` to the
`ostree` CLI package. Ideally an `eos` container would be used rather
than the bespoke `chroot` setup, but that's a bigger change for another
day.

https://phabricator.endlessm.com/T35019
  • Loading branch information
dbnicholson committed Nov 13, 2023
1 parent 3e90d23 commit a8d0732
Show file tree
Hide file tree
Showing 10 changed files with 171 additions and 1,403 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ Setup

Known to work on Debian Buster (10) and newer. Required packages:

* mmdebstrap
* ostree
* gnupg
* python3
* rsync

Image signing
-------------
Expand Down
9 changes: 0 additions & 9 deletions config/defaults.ini
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,6 @@ manifestdir = ${tmpdir}/manifest
# Directories to mount in the buildroot
mounts_add =

# Debian package repository setup for the buildroot
repo = https://deb.endlessos.org/debian
arch = ${build:arch}
codename = ${build:branch}
components = core endless

# Debian release to base on
base = bullseye

# Packages to install in the buildroot
packages_add =
attr
Expand Down
1,211 changes: 0 additions & 1,211 deletions data/keys/debian-archive-keyring.asc

This file was deleted.

29 changes: 0 additions & 29 deletions data/keys/endless-archive-key.asc

This file was deleted.

29 changes: 29 additions & 0 deletions data/keys/eos-ostree-signing-key.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQINBFNzuygBEADeDqJZ3xU2SNfjCiSVcM2NT5G+7tieRtq4gZA0qfEww3J668Bf
2nUaWgQHMEoShaNbfpjANhv41mGF+rJ/yR8ZANmx80n6EvYm9NCtOAhc4O3i3elZ
f26qaEgWUmNZzemqgM2K/rK0aWOEHd8aOW4SrNlW0BIqciUWHPxOUzBbBfUsBxjp
/Xukd9qzi3koHEzvZ7/gWqLIPaaIl3V0owhmcjnbbciJlO7MZbGjaNjrsObxHVtD
KzaB5fLyyN7POZbXL5p1NCPmrqj5U2XY+yW5S6ryQJfkVJ5w0Nv4sLz+R28r1STl
kBjU/is5nN7yAg/5sofQjnmih5Nl4ZKOoKZ8ZShMTmc1aJfSZNRqOPACnJOqc1Bt
kADm6YgB9xoPZ7T+dL612hwsxrRHCCCzoGhLXl8S5/iPkBMe2MPBeYxkq5r3WMzq
uavyFLHTHtQcJmK2bFaD5cHv2MQBKw+oZo80mk0447chBkAWolxFoPSlOE5h0KV8
0WMswq6eEtCN3GPO1mvHXGhcqd6R2nOZkxfVE0sOoRI56iz/GXqpOoVuF4Foj7BT
XpAe8GUBdxe5mu28ogCvNdoyDyUxd+HgrV+7+WQYGcA9T88KC8WM4vdpVcuzQRrf
9NFvlZbGf1ZpWlCRzsg6kWU3TS3TGaz2ImZUVsLULDms6lDojaEezcHG9QARAQAB
tDtFT1MgT1NUcmVlIFNpZ25pbmcgS2V5IDEgKEVPU0sxKSA8bWFpbnRhaW5lcnNA
ZW5kbGVzc20uY29tPokCVQQTAQIAPwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
F4AWIQRjw/zTxI+/EWovSsyeCNjaugL8RgUCXRzVQwUJHHUdGwAKCRCeCNjaugL8
RjC4EACQX8b2nq5b28Vu1SNFizdRARh6+Zn3FzPVaU9UEAHbs+vjCCbuKVs5y0ZG
jt549niTXIXVVuBMw3NndTB2vzXm+rRLX2CnL/0WDYKcbx3qah5+W7nDLShS016d
CBTuw/6CNzg5+yVZbWU7Fi+5Ebfvsk0UQHhXCxk3sukgFmSWIp7tm4/vekER1hfu
L7IVXprzIl4t0Z/ixx1pMu8+6Gvbucq8jUTtE49t0tF3pQZuwECPOJgTA9HFEERc
kyyNqC8bsQa1pnTZMpgo7onL4kzS0ZTOQcO0rE6jaPJu9ZB8iNlVqPTDJ8N8miO/
6l11rMK0lxHnF6vjvcttWE+Em5ls+B1J1RmJKk66DukJn/ZE8gKBRyj9ZmW4sxat
OAtwPsg3ml0xjwqL4BLj03KKnaz/o/THWzlQyKM1WUAJ3fV+28tZNvYfXEkWgIFb
/EZGGh6dhE+GWkwpDbm90UZd4GUvEIOaSg16w39Yj2kGLPUWfZtEW8vQTfVLP1dI
GXS/hTUfo1oi1WpjENEJFONntJUMTxpNitjkq75kdt7ihHMD4kC0cLdiTHNnWCVl
fNFMAPcTQaEJkSP6KEAYFSX1bqVZGPplt+5wE4G/oV4h4QjylkzJovEhbC+6dEFR
yY82fonAdBFWQWkDETqPpZEX/46BwUBUdB4p3YjgmqKoZrIhHg==
=Sic7
-----END PGP PUBLIC KEY BLOCK-----
30 changes: 0 additions & 30 deletions data/keys/eos-pub-archive-key.asc

This file was deleted.

8 changes: 0 additions & 8 deletions helpers/mmdebstrap-cleanup

This file was deleted.

32 changes: 0 additions & 32 deletions helpers/mmdebstrap-setup

This file was deleted.

Loading

0 comments on commit a8d0732

Please sign in to comment.