Small cleanups on the ostree recipes (!100) · Merge requests · infrastructure / apertis-image-recipes

Merged Emanuele Aina requested to merge wip/em/misc into apertis/v2019dev0 6 years ago

Mar 13, 2019

Clarify the actual reason machine-id can't be truncated earlier · e8691e70

Emanuele Aina authored 6 years ago

Even after fixing https://github.com/systemd/systemd/issues/11925

 we
would still have issues by truncating the /etc/machine-id earlies, as
the actual problem is that the systemd-boot tools rely on it being set
for dual-boot scenarios:
* to avoid conflicts when creating entries, see the `90-loaderentry` kernel
  install trigger
* to set the entries for the currently booted installation as default in
  the loader.conf generated by `bootctl install`

In our image this is not useful, as the actual machine-id is supposed to be
uniquely generated on the first boot. However the impact is negligible, as
things still work albeit the code used to potentially disambiguate entries
doesn't match a real machine-id.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

e8691e70

Drop the "00000000.0" timestamp defaults · 70ad2ee3

Emanuele Aina authored 6 years ago


Jenkins is actually defining the full names for every artifact anyway and the
default is not particularly useful when building stuff locally without passing
any parameter so let's ensure the default names are sane and drop the
00000000.0 default.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

70ad2ee3

sdk: Explicitly pass devroot URL · 2734ec48

Emanuele Aina authored 6 years ago


Use a single parameter to speciffy the devroot to be downloaded and installed as
it is done for the mediapack.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

2734ec48

ostree-commit: Export the list of files that will get committed · a3138910

Emanuele Aina authored 6 years ago


Do like all the other artifacts and export the file listing.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

a3138910

ostree: Subsume ostree-prepare.sh into the recipe itself · 76b11dea

Emanuele Aina authored 6 years ago


The previous machine-id rework already moved one bit of ostree-prepare.sh
out of it, let's directly embed the two remaining commands in the
recipe directly for simplicity.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

76b11dea

ostree-commit: Provide descriptions for steps that lacked one · c1dcaac7
Emanuele Aina authored 6 years ago
```
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
```
c1dcaac7

ostree-commit: Commit by default to the uefi board/branch · 7333ffe4

Emanuele Aina authored 6 years ago


Target by default the apertis/v2019dev0/amd64-uefi/minimal OSTree branch
and not the lxc one, as that may be quite surprising when not explicitly
setting the board parameter.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

7333ffe4

Small cleanups on the ostree recipes

Merge request reports

Activity