This reverts commit e954d2be.

This was a workaround for odd nodes packages that apt was
not able to parse. It has been fixed in apt 2.3.10 (Bookworm)
with https://salsa.debian.org/apt-team/apt/-/merge_requests/167

.

Having this workaround leads to other apt failures
to resolve dependencies (because of conflicts between
rustc and rustc-web).

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Walter Lozano authored 5 months ago and Dylan Aïssi committed 5 months ago

When ci-license-scan tries to fill copyright information from d/copyright
it includes \n if they are present in copyright information. If later,
there is copyright data, the \n is placed in the middle creating an invalid
copyright file.

To overcome this issue, strip \n from the copyright.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Ryan Gonzalez authored 1 year ago and Walter Lozano committed 1 year ago

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Ryan Gonzalez authored 1 year ago and Walter Lozano committed 1 year ago

Inserting fixup paragraphs at the end of the file violates the Debian
standard ordering, where copyright paragrahs are ordered from least to
most specific. In order to fix this, we can define the "broadness" of
each Files pattern in a paragrahs, then split up the paragraph and
insert into the copyright file at positions that maintain the
broadness ordering.

Fixes apertis-issues#519.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Levent Komurcu authored 2 years ago and Tino Lippold committed 1 year ago

apt_source.sh script places credentials to sources.list file. This will cause
apt to generate a warning message everytime said repository is hit.

(N: Usage of apt_auth.conf(5) should be preferred over embedding login
information directly in sources.list(5) entry for 'https://.......')

This change will automatically seperate credentials from sources.list file to
auth.conf file

This change was cherry picked from GitLab repository
https://gitlab.apertis.org/infrastructure/apertis-image-recipes


from commit aa830587d5f2ed8e0cb62b040a2143fa18668315.

Signed-off-by: Komurcu Levent <levent.komurcu@nl.bosch.com>
(cherry picked from commit aa830587d5f2ed8e0cb62b040a2143fa18668315)

With package user-mode-linux being dropped, drop the corresponding test
as well.

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

With v2024, our need for user-mode-linux packae is over. As such, drop
the user-mode-linux package starting with this release

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

Signed-off-by: Apertis CI <devel@lists.apertis.org>

As it is needed to generate the BOM include python3-apt.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

We have a feature in our CI setup, wherein we can inject certain extra
apt repositories to the build environment

In our case, we usually enable the debian repositories for certain use
cases. But we also need the archive keyring to be able to validate the
authenticity of the extra repository added.

Having the debian-archive-keying package in the package source builder
can be handy, with the only exception that the docker image will be
slightly larger in size.

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

Emanuele Aina authored 1 year ago and Sjoerd Simons committed 1 year ago

The FOSSology experiment never saw traction, and nobody noticed when
submission to the server got disabled.

Let's then retire the experiment by dropping the hooks to submit
contents there, while the service itself is getting decommissioned.

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

Signed-off-by: Apertis CI <devel@lists.apertis.org>

We used to build our docs with `hotdoc` and that required some special
bits.

We're still using Pandoc and LaTeX which are annoyingly special as
well, but definitely less unique.

We moved the website hosting our documentation to Hugo a long time ago,
which this image does not even ship, and the last usage for generating
PDF has been dropped a few months ago:
docs/apertis-website!508



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

On commit 419f9c7c duplicate files entries were removed to have a cleaner
report. However, this change caused that different passes of the scanner
resulted in file lists with different ordering. Even if results provide
same information, the fact the ordering is different cause that our CI
machinery triggers a new commit to update the scan report.

Fix the issue by sorting the list of files in the copyright fixups.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

When fixups based on d/copyrigth information are applied, the same paragraph
is computed as many times as files are present, causing the same file to
appear multiple time.

A proper fix requires a rework of the fixups, but as first step avoid
having multiple instances of the same file.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

During license scan some fixups are possible by guessing license and
copyright from other sources, like debian/copyright. To do this the
ci-license-scan removes paragraphs and and new ones with the fixup
information. A common example of this scenario is UNKNOWN licenses
which are guessed from debian/copyright.

However, the "removal" is not supported by the library, the scripts
relies in knowing the internal data structure to accoplish this.

Unfortunately, since Bookworm, the data structure is more complex and
preserves a low level copy of the data which is used on dumping. As a
consequence, when dumping the new copyright the fixup information is
not present.

Workaround the issue by using the old version of the dump.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Vignesh Raman authored 1 year ago and Dylan Aïssi committed 1 year ago

This commit introduces the --date argument to the deb-git-version-gen command,
allowing users to specify a specific date which is passed to debchange command
for the changelog entry being edited.

Example usage:
$ deb-git-version-gen --distro="apertis" --date="Fri, 30 Jun 2023 13:55:28 +0530" --dch

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

Signed-off-by: Apertis CI <devel@lists.apertis.org>

Also include gzip as a package to replace to get its full version instead
of the busybox one.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Instruct apt to resolve the conflicts with essential packages to allow
the switch to the full version instead of manually calling dpkg.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Since systemd-resolved is not installed by default include it as it is
needed by debos.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

This reverts commit 232021c9.

This reverts commit fb4c138c.

Walter Lozano authored 3 years ago and Ritesh Raj Sarraf committed 1 year ago

Add an overlay for package-source-builder in order to allow build source
stage to pass.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 1 year ago and Ritesh Raj Sarraf committed 1 year ago

HMI component is not longer supported, so remove references to it.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 1 year ago and Ritesh Raj Sarraf committed 1 year ago

After rebasing on top of Debian Bookworm the script to replace gplv2
packages does not work since it raises errors due to the conflict
with the versions installed.

In order to overcome this issue manually remove the packages.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Walter Lozano authored 1 year ago and Ritesh Raj Sarraf committed 1 year ago

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Vignesh Raman authored 1 year ago and Dylan Aïssi committed 1 year ago

When building packages, wrap-and-sort fails with the below error,
raise SyntaxOrParseError(
debian._deb822_repro.types.SyntaxOrParseError: Syntax or Parse error on the line: "%if USE_SYSTEM_ZLIB\n"

wrap-and-sort works in bullseye python-debian version 0.1.39 and in
bookworm version 0.1.49 it fails to parse debian/control.in files.

We don't need to use wrap-and-sort on all files in debian/ folder,
but only on debian/control to fix the issue with node-* packages.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

During the rebase the base distribution will Debian so it makes sense to
have different variables, some to point to the base distributions and others
to point to the actual image to be created.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Since package like apertis-dev-tools are only available in Apertis
repositories add them.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

For the use case of building pure Debian packages, we only need the
package-source-builder. So, lets just disable the rest of the images.

And also add the Debian specific bits to get the debootstrap work

This is the same approach done in d285422a.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

In order to proceed with the rebase we need stable docker images with all
the needed dependencies available. To do that switch to Debian Bookworm
as mirror.

This same approach was used in 788aa27a.

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Signed-off-by: Apertis CI <devel@lists.apertis.org>

If we're not running ostree-receive, we don't need to worry about this
being set.

https://phabricator.apertis.org/T8427



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

We want this for the Flatpak builds.

https://phabricator.apertis.org/T8427



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Using a default doesn't really make sense now that both the image pushes
*and* Flatpaks need their own config files.

https://phabricator.apertis.org/T8427



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

https://phabricator.apertis.org/T8427



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

These contain the newest ostree-push release and will be run on our
infrastructure to accept pushes from v2024dev1's ostree-push version. In
order to run it, two external files need to be mounted into
/opt/ostree-receive/data:

- /opt/ostree-receive/data/authorized_keys: SSH authorized_keys file
- /opt/ostree-receive/data/ostree-receive.conf: ostree-receive's config

https://phabricator.apertis.org/T8427



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Signed-off-by: Apertis CI <devel@lists.apertis.org>