Sjoerd Simons authored 6 years ago and Emanuele Aina committed 6 years ago

/etc/machine-id is expected to either contain a UUID or be *empty*.
using echo doesn't result in an empty file, it generates a file with
just a newline.

Switch to using truncate so it's actually an empty file. Fixes systemd
being unhappy about the content.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Sjoerd Simons authored 6 years ago and Emanuele Aina committed 6 years ago

Make sure ospacks and images don't accidentally get build against 18.12

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

When virtualization is available, Debos uses systemd-nspawn to run commands in
the "chroot".

systemd-nspawn automatically takes care of setting up a working
/etc/resolv.conf, usually by bind mounting the "host" one:

 https://www.freedesktop.org/software/systemd/man/systemd-nspawn.html#--resolv-conf=

In our case, the host is the VM managed by fakemachine, which is configured to
use systemd-resolved.

The end result is that the stub /etc/resolv.conf pointing to 127.0.0.53 is
copied to our rootfs and included in the generated ospack.

This is arguably a weird corner of Debos, the resolv.conf file should really
not persist out of the chroot:

 https://phabricator.apertis.org/T4308



However, in the past ConnMan used to ship a tmpfiles.d snippet to overwrite
it with a link to /var/run/connman/resolv.conf but since commit 45ccde23a90c
shipped in ConnMan 1.36 the snippet has been changed to no longer overwrite
existing files, causing DNS resolution to fail on our images.

By dropping /etc/resolv.conf at the end of each recipe, after all the
chroot:true actions, we should be able to ensure that the final artifacts
don't ship it and at runtime the ConnMan tmpfiles.d snippet should work
 again as intended.

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

Subsume the unit mounting a tmpfs on /media that was formerly shipped by
apertis-customizations.

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

The apertis-customization package used to ship in tmpfiles.d/apertis.conf a
link from /etc/machine-id to /var/lib/dbus/machine-id to ensure that the
machine-id is unique.

This is now done automatically provided that /etc/machine-id is a empty file.

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

Subsume the apertis-create-homedir systemd unit creating $HOME at boot time
that was formerly shipped by apertis-customizations.

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

The `$arch-$platform` overlay mechanism was a relic of the old
`cb_build` pipeline. Split it up into semantic overlays and include them
only where appropriate.

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

The catch-all arch-platform overlay was a relic of the old `cb_build`
pipeline. Split it up into semantic overlays and include them only
where appropriate.

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

Emanuele Aina authored 6 years ago and Andrej Shadura committed 6 years ago

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

Emanuele Aina authored 6 years ago and Andrej Shadura committed 6 years ago

Now that the ospack recipes have been split they can default to the
correct type.

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

Emanuele Aina authored 6 years ago and Andrej Shadura committed 6 years ago

Add the timestamp as `BUILD_ID` and the image type as `VARIANT_ID`
in `/etc/os-release`, so at some point we'll be able to phase
out `/etc/image_version`.

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

From now on, sysroots will be for debugging and related purposes,
devroot will be used for foreign archirecture compilation etc.

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Ritesh Raj Sarraf authored 6 years ago and Andrej Shadura committed 6 years ago

This is a derivative of image type 'sdk' with 'ivitools' disabled
Apertis: T5428

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>

Use just a single board definition for both SDK images, and
symlinks for the overlay.

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>

Once upon a time, when Apertis was still using live-build, scripts
had to indicate in their extension if they had to be run in the chroot
environment or outside of it.

With Debos this is no longer needed, so drop the weird extensions that
were cargo-culted in this repository. :)

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

The default demopack installs media files in `/home/shared`: by
including them only in the ospack they are unavailble on the ostree
images as the whole `/home` gets filtered out during `ostree commit`.

Moving the extraction of the demopack when the full filesystem gets
deployed to the images makes the media files available on ostree images
as well.

See https://phabricator.apertis.org/T5313



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

Emanuele Aina authored 6 years ago and Frédéric Dalleau committed 6 years ago

Split the filelist extraction from the pkglist as it may be useful to
insert a cleanup phase between the two.

Also rework the pkglist extraction to capture the whole dpkg status file
rather than only a subset of it, in order to preserve as much
information as possible.

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

Emanuele Aina authored 6 years ago and Frédéric Dalleau committed 6 years ago

Make ospack and sysroot recipes take a generic basename for the output
artifacts, to which the `.tar.gz` file extension is appended by the
recipe itself. The recipes for the images already works this way as it
works better when generating multiple artifacts.

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

Dash is great as a system shell, but it's pretty horrible as a user
shell as there is no tab completion or history. There are things that
the busybox ash applet does provide making it a lot more pleasant to
use, while only less then 500 kilobytes to the ospack.

As an added benefit this gives easy acces to the wget/nc/ip busybox
applets.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

Developers would benefit from pregenerated listings to avoid downloading
and unpacking all the ospacks just to check the version of a shipped
package or the availability of a file.

Being able to rely on pregenerated package and file listings would help
speed up the checks needed by T5042 to identify which images are
affected.

Signed-off-by: Andrew Lee (李健秋) <andrew.lee@collabora.co.uk>

Need `libelf-dev` package to be pre-installed for correct build of
VirtualBox guest additions.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.co.uk>
Reviewed-by: Emanuele Aina <emanuele.aina@collabora.com>
Differential Revision: https://phabricator.apertis.org/D7911

Apertis: https://phabricator.apertis.org/T5035



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

debos will soon by default let debootstrap check gpg keys. As the
apertis gpg key isn't typically in the hosts default set add it to the
recipe directly.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

The chaiwala-user-session-wayland package conflicts with lightdm and cause
issues such as the user being unable to mount vbox additions.

This fix updates the image recipe to only enable chaiwala-user-session-wayland
on target and development images.

Apertis: https://phabricator.apertis.org/T5017



Signed-off-by: Andre Moreira Magalhaes <andre.magalhaes@collabora.co.uk>

Andrew Lee (李健秋) authored 6 years ago and Andrej Shadura committed 6 years ago

We need newer dosfstools from Debian stretch. However the new dostools
is licensed as GPL-3+ from Debian stretch. And we want to keep target
GPL-3 free.

So here is a patch to move dosfstools from target to development in
ospack recipe.

Apertis: https://phabricator.apertis.org/T4969



Signed-off-by: Andrew Lee (李健秋) <andrew.lee@collabora.co.uk>
Reviewed-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7894

Nodm is buggy ([1]) and its upstream stopped maintaining it ([2]).
Since the only reason nodm is used is to provide autologin, and
lightdm supports that and is actively maintained upstream, in
Debian and Ubuntu, it is more sustainable to use it instead of
nodm.

Drop nodm package and its configuration, ship lightdm and its
configuration instead.

[1]: https://github.com/spanezz/nodm/issues/5
[2]: https://github.com/spanezz/nodm/issues/8



Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7875

Removed packages `linux-tools-*` since kernel do not provide them anymore.
Add `linux-perf` package instead to provide needed functionality.
Removed `linux-headers-generic` package from SDK set -- correct version
is proposed in `development` package set.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Reviewed-by: Emanuele Aina <emanuele.aina@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7871

In Debian there is no package `linux-headers-generic` and corresponding
packages includes target architecture in their name.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Reviewed-by: Frédéric Dalleau <frederic.dalleau@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7861

Ritesh Raj Sarraf authored 6 years ago and Ritesh Raj Sarraf committed 6 years ago

We need to have the target mount point /Applications available for
Applications.mount unit to work because the rootfs is mounted read-only

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.co.uk>
Reviewed-by: Frédéric Dalleau <frederic.dalleau@collabora.com>
Reviewed-by: Denis Pynkin <denis.pynkin@collabora.com>
Differential Revision: https://phabricator.apertis.org/D7854

The x11-xserver-utils package is only available on the :development
repositories, so it caused the target image to fail to build.

Given that it is only needed on the SDK images, move its entry to a
properly fenced section.

Signed-off-by: Andrew Lee (李健秋) <andrew.lee@collabora.co.uk>
Reviewed-by: Emanuele Aina <emanuele.aina@collabora.com>
Differential Revision: https://phabricator.apertis.org/D7805

After installing the Guest additions in VirtualBox 5.2, xrandr is
executed when the XServer starts. The utility is not found on the
sdk, and an error message is displayed.
Avoid that by adding xrandr to sdk image.

Signed-off-by: Frédéric Dalleau <frederic.dalleau@collabora.co.uk>
Reviewed-by: Denis Pynkin <denis.pynkin@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7803

We setup a sysroot mechanism, but this is specific to ade, which currently
is deemed ivi specific.

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>

Differential Revision: https://phabricator.apertis.org/D7802

Not all users of Apertis are going to be interested in lxc. Make the
installation of the LXC components optional, but enabled by default.

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>

Differential Revision: https://phabricator.apertis.org/D7801

The items in these repos can be thought of as quite ivi specific, only use
them for ivi images. Move impacted packages to ivi specific sections.

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>

Differential Revision: https://phabricator.apertis.org/D7800

We are now utilising Apertis for non-IVI related uses. There are a large
number of packages install, which will not be of interest to users in
these other areas. Start separating out the some components so that
more targeted images can be produced with a common core.

For now we will be forking these files. The separation intends to make it
easier for derivatives of these files to stay in sync with core changes.

Signed-off-by: Martyn Welch <martyn@welchs.me.uk>

Differential Revision: https://phabricator.apertis.org/D7799

Andrew Lee (李健秋) authored 7 years ago and Andrej Shadura committed 7 years ago

As new version of mesa package that we updated in apertis that already
dropped libegl1-mesa-drivers transitional package.

So that we shouldn't keep install libegl1-mesa-drivers from our images.

This commit is to drop libegl1-mesa-drivers from ospack, uefi and sdk
images.

Signed-off-by: Andrew Lee (李健秋) <andrew.lee@collabora.co.uk>
Reviewed-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7779

Denis Pynkin authored 7 years ago and Andrej Shadura committed 7 years ago

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>

`debos` supports keyring-package in debootstrap action, but no
keyringpackage. This change syncs to proper field key.

Signed-off-by: Héctor Orón Martínez <hector.oron@collabora.co.uk>
Reviewed-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7642

Due to pam_cgfs utils are needed for unprivileged LXC containers
creation. We should should install libpam-cgfs package together with
LXC in Apertis images.

This is a fixup for previous commit which landed wrongly with
'git phab land'.

Apertis: https://phabricator.apertis.org/T4606


Signed-off-by: Andrew Lee (李健秋) <andrew.lee@collabora.co.uk>
Reviewed-by: Denis Pynkin <denis.pynkin@collabora.com>
Differential Revision: https://phabricator.apertis.org/D7629