From 8b1788e1bf54022608bb7bd9e72aea1a8b3bf286 Mon Sep 17 00:00:00 2001 From: mono wock Date: Sat, 22 Jan 2022 15:43:27 +0000 Subject: Add linux-firmware-marvell for Surface Pro 6 wi-fi --- configs/releng/packages.x86_64 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 9079c06..aaf2416 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -51,6 +51,7 @@ libusb-compat linux linux-atm linux-firmware +linux-firmware-marvell livecd-sounds lsscsi lvm2 -- cgit v1.2.3-70-g09d2 From 18bb8c2b4559087f7d70e8b92c87505a327790e5 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Sat, 22 Jan 2022 12:08:14 +0200 Subject: configs/*/airootfs/etc/systemd/network/20-ethernet.network: add a comment to document why an interface name glob is used This documents the changes made in !177 inside the .network files themselves. Related to #142. --- configs/baseline/airootfs/etc/systemd/network/20-ethernet.network | 3 +++ configs/releng/airootfs/etc/systemd/network/20-ethernet.network | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network index e8842f2..4b6a2ab 100644 --- a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network @@ -1,4 +1,7 @@ [Match] +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index f2a7d60..9ada778 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,4 +1,7 @@ [Match] +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. Name=en* Name=eth* -- cgit v1.2.3-70-g09d2 From 720516e6fd4411d76c87e09d9da393a4d10b2c21 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Fri, 28 Jan 2022 11:03:05 +0200 Subject: configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf: update ExecStart Update the drop-in to more closely match getty@.service of systemd 250. Use example from https://wiki.archlinux.org/title/getty#Virtual_console --- .../airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index d1d8474..b9d22eb 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,3 +1,3 @@ [Service] ExecStart= -ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux +ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root - $TERM -- cgit v1.2.3-70-g09d2 From 6c1b4663d919e01b80f6d1c941c97aa18fdaf894 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 29 Jan 2022 17:13:24 +0100 Subject: Add the installation of latest archlinux-keyring to CI .gitlab-ci.yml: Install the latest archlinux-keyring before installing anything else. This is to make sure to not run into outdated keys upon updating, which is a problem because we can currently not even ensure a keyring that is valid longer than one month... https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/4 --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c674294..63fd96f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,11 @@ stages: check: before_script: + # NOTE: Install latest archlinux-keyring before upgrading system. In the + # future this should not be needed anymore when we can guarantee a valid + # keyring for longer: + # https://gitlab.archlinux.org/archlinux/archlinux-keyring/-/issues/4 + - pacman -Sy --needed --noconfirm archlinux-keyring - pacman --noconfirm -Syu --needed make shellcheck script: - make check -- cgit v1.2.3-70-g09d2 From 8d2d779ec1287b349ea55c91df80ae8788362c1f Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 30 Jan 2022 21:08:30 +0100 Subject: Add info about adding a changelog entry for merge requests CONTRIBUTING.rst: Add info about adding a changelog entry for merge requests, explaining where in the file it needs to be added. --- CONTRIBUTING.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index bffc49d..3c80f6e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -19,6 +19,14 @@ All ash and bash scripts are linted using shellcheck: make lint +Changelog +========= + +When adding, changing or removing something in a merge request, add a sentence to the `CHANGELOG.rst `_ +explaining it. +The changelog entry needs to be added to the unreleased section at the top, as that section is used for the next +release. + Testing ======= -- cgit v1.2.3-70-g09d2 From cd1438757647425abfa78fdba06e241c7da0db11 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 30 Jan 2022 21:26:43 +0100 Subject: Add contributing guideline about merge requests CONTRIBUTING.rst: Elaborate on when merge requests are merged using `--no-ff` or `--ff`. --- CONTRIBUTING.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 3c80f6e..ba8bf4a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -27,6 +27,20 @@ explaining it. The changelog entry needs to be added to the unreleased section at the top, as that section is used for the next release. +Merge requests and signed commits +================================= + +Merge requests are not required to contain signed commits (using ``git commit -S`` - see `man 1 git-commit +`_). +The project maintainers may rebase a given merge request branch at their discretion (if possible), which may remove +signed commits. + +The tip of the project's default branch is required to be a signed commit by the project maintainers. +For external contributors this means, that their merge request will be merged using ``--no-ff`` (see `man 1 git-merge +`_) in a signed merge commit, while contributions by the project maintainers +may be merged using ``--ff`` when the top-most commit of the source branch is signed by a valid PGP key of the given +maintainer. + Testing ======= -- cgit v1.2.3-70-g09d2 From 21ca345720e0067f6b2817dd66e82029a52395e0 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 30 Jan 2022 21:38:10 +0100 Subject: Limit triggering a CI build to change of non-code files .gitlab-ci.yml: Only trigger builds in CI when changing code files or profiles. --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63fd96f..89671f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,13 @@ build_short: matrix: - BUILD_SCRIPT_ARGS: baseline bootstrap - BUILD_SCRIPT_ARGS: releng bootstrap + only: + changes: + - archiso/* + - configs/**/* + - Makefile + - .gitlab-ci.yml + - .gitlab/ci/* build_long: extends: .build @@ -49,3 +56,10 @@ build_long: - BUILD_SCRIPT_ARGS: releng netboot tags: - fast-single-thread + only: + changes: + - archiso/* + - configs/**/* + - Makefile + - .gitlab-ci.yml + - .gitlab/ci/* -- cgit v1.2.3-70-g09d2 From 549ce5bc4bd2745de9156fb84d415d67b2d4d17f Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 30 Jan 2022 21:47:36 +0100 Subject: Set all build steps to be interruptable .gitlab-ci.yml: Set all build steps to be interruptable, so they will be interrupted if a newer commit is pushed on the same branch, which also triggers CI. --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89671f8..84ae892 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ check: script: - make check stage: check + interruptible: true build_short: extends: .build @@ -45,6 +46,7 @@ build_short: - Makefile - .gitlab-ci.yml - .gitlab/ci/* + interruptible: true build_long: extends: .build @@ -63,3 +65,4 @@ build_long: - Makefile - .gitlab-ci.yml - .gitlab/ci/* + interruptible: true -- cgit v1.2.3-70-g09d2 From 5b950589ac2f6c7f4e2c65a1eedf4824aeac564f Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Jan 2022 17:28:36 +0100 Subject: Limit CI pipelines on default branch and merge requests .gitlab-ci.yml: Only run build pipelines on default branch and merge requests if they change code or profile files. --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84ae892..628c28f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,9 @@ build_short: - BUILD_SCRIPT_ARGS: baseline bootstrap - BUILD_SCRIPT_ARGS: releng bootstrap only: + refs: + - master + - merge_requests changes: - archiso/* - configs/**/* @@ -59,6 +62,9 @@ build_long: tags: - fast-single-thread only: + refs: + - master + - merge_requests changes: - archiso/* - configs/**/* -- cgit v1.2.3-70-g09d2 From a814f1484c21370cae9c9a62ac2833e8d24dd3dd Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Jan 2022 17:05:03 +0100 Subject: Add changelog for 61 CHANGELOG.rst: Add changelog entry for 61. --- CHANGELOG.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a166bf7..0eb97f9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,27 @@ Changed Removed ------- +[61] - 2022-01-31 +================= + +Added +----- + +- Add linux-firmware-marvell to the list of packages in the releng profile (e.g. for Surface Pro 6 WiFi support) +- Add documentation to systemd-networkd configuration files +- Add information about the use of changelog and merge requests to the contributing guidelines +- Make the CI pipelines more efficient by automatically cancelling running pipelines if they are superseded by a newer + commit and by only running build pipelines on code or profile changes + +Changed +------- + +- Fix an issue where mkarchiso is failing to raise an error when the ``mmd`` and ``mcopy`` commands are not found +- Fix an issue where the architecture detection in mkarchiso fails due to an unset ``arch`` variable in the profile + +Removed +------- + [60] - 2021-12-28 ================= -- cgit v1.2.3-70-g09d2