Apertis CI robot authored 2 years ago and Ritesh Raj Sarraf committed 2 years ago

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

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

The upstream check condition was incorrect, as in the opposite. This
change ensures that the check for the d/p/series file is proper

This ultimately resulted in missing a crtitical patch for the Apertis
infrastructure, d/p/Revert-um-Monitor-error-events-in-IRQ-controller.patch

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

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

The below patches are dropped upstream.
02_x-terminal-emulator.patch
03_uml_switch.patch

https://salsa.debian.org/uml-team/user-mode-linux/-/commit/f77f369666d3208fb95723b279650fda8d4a37c1



So remove them from debian/patches/series.

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

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

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

Merge remote-tracking branch 'origin/apertis/v2023dev3' into proposed-updates/debian/unstable/a18db5d9

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

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

Manually update UML configs to Linux 5.16. This was processed manually
because UML 5.16 is already removed from the Debian archives

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

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>

The UML fails to access internet when ran in Docker container on GitLab CI.
Both patches has been removed during latest update of UML. Re-adding them
allows to run Apertis build correctly.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>

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

Merge remote-tracking branch 'origin/apertis/v2023dev1' into proposed-updates/debian/unstable/bb364fe1

* origin/apertis/v2023dev1: (23 commits)
  Release user-mode-linux version 5.15um1+apertis2
  Disable VMAP_STACK
  Release user-mode-linux version 5.15um1+apertis1
  Release user-mode-linux version 5.15um1+apertis1
  Release user-mode-linux version 5.14um1+apertis2
  hostfs: Fix writeback of dirty pages
  Refresh Apertis only downstream patch
  Release user-mode-linux verison 5.14um1+apertis1
  Refresh the automatically detected licensing information
  Import Debian version 5.10um3
  Release user-mode-linux version 5.10um1co2
  Fix early exit of fakemachine when calling uml backend
  Release user-mode-linux version 5.10um1co1
  Add d/apertis/component pointing to sdk
  Import Debian version 5.10um1
  Update changelog for release
  Update changelog for Apertis
  Release 5.4um1co2
  config.amd64: Set CONFIG_HW_RANDOM=y.
  debian/rules: Actually use parallel build options
  ...

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

After upgrading to 5.15 UML started to support VMAP_STACK making
CONFIG_VMAP_STACK to be used, however, after this change random
hangs were detected. Disable the use of VMP_STACK until a proper
fix is implemented.

http://lists.infradead.org/pipermail/linux-um/2022-January/002024.html



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

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

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

Hostfs was not setting up the backing device information, which means it
uses the noop bdi. The noop bdi does not have the writeback capability
enabled, which in turns means  dirty pages never got written back to
storage.

In other words programs using mmap to write to files on  hostfs never
actually got their data written out...

Fix this by simply setting up the bdi with default settings as all the
required code for writeback is already in place.

https://lkml.org/lkml/2021/11/5/95



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

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

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

Merge remote-tracking branch 'origin/apertis/v2022pre' into proposed-updates/debian/unstable/a8037944

* origin/apertis/v2022pre:
  Refresh the automatically detected licensing information
  Import Debian version 5.10um3
  Release user-mode-linux version 5.10um1co2
  Fix early exit of fakemachine when calling uml backend
  Release user-mode-linux version 5.10um1co1
  Add d/apertis/component pointing to sdk
  Import Debian version 5.10um1
  Update changelog for release
  Update changelog for Apertis
  Release 5.4um1co2
  config.amd64: Set CONFIG_HW_RANDOM=y.
  debian/rules: Actually use parallel build options
  Release user-mode-linux version 5.4um1co1
  Don't print hashes in changelog
  Import Apertis version 5.4-1um-2

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

Apertis CI authored 4 years ago and Ritesh Raj Sarraf committed 4 years ago

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

Apertis CI authored 4 years ago and Ritesh Raj Sarraf committed 4 years ago

This change has caused a regression in User Mode Linux, which affects us
on the Apertis project, wherein fakemachine/debos exits straightway when
run in our gitlab CI.

A proper fix, still pending, should come through the upstream Linux
updates channel

For more details, please see: https://phabricator.apertis.org/T7721



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

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

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

* origin/debian/bullseye:
  Import Debian version 5.10um1

user-mode-linux (5.10um1) unstable; urgency=medium

  [ Debian Janitor ]
  * [4b95d20] Trim trailing whitespace.

  [ Ritesh Raj Sarraf ]
  * [96b5aeb] Prepare for Linux 5.10
  * [1f00328] Update UML configs for Linux 5.10
  * [7177cae] Set priority to optional
  * [235490c] Rename d/NEWS.Debian to d/NEWS

user-mode-linux (5.9um1) unstable; urgency=medium

  * [016b157] Prepare for Linux 5.9
  * [ecd8715] Enable VirtIO UML and update config for Linux 5.9
  * [533ed9e] Update build dependency on vde to reflect name change

user-mode-linux (5.8um1) unstable; urgency=medium

  * [b7db191] Prepare for Linux 5.8 (Closes: #971135)
  * [9ca8d98] Update kernel configs for Linux 5.8
  * [3d34593] Disable BPFILTER for architecture i386
    - For reasons unclear, having BPFILTER enabled in the config makes kbuild
      think the config is incomplete. So lets not block because of it

Since all downstream Apertis changes were merged upstream, there's no
more delta.

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