Commit graph

1220 commits

Author SHA1 Message Date
David Runge
cd14387576
Add contributing guideline about merge requests
CONTRIBUTING.rst:
Elaborate on when merge requests are merged using `--no-ff` or `--ff`.
2022-01-30 21:26:43 +01:00
David Runge
8d2d779ec1
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.
2022-01-30 21:11:37 +01:00
David Runge
6c1b4663d9
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
2022-01-29 18:42:48 +01:00
nl6720
720516e6fd
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
2022-01-28 11:03:05 +02:00
nl6720
18bb8c2b45
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.
2022-01-22 19:17:34 +02:00
nl6720
7cbd25d20a
Merge remote-tracking branch 'origin/merge-requests/228'
* origin/merge-requests/228:
  Add linux-firmware-marvell for Surface Pro 6 wi-fi

Update packages.x86_64

See merge request archlinux/archiso!228
2022-01-22 19:15:44 +02:00
mono wock
8b1788e1bf Add linux-firmware-marvell for Surface Pro 6 wi-fi 2022-01-22 11:46:40 -05:00
nl6720
f8225782e2
Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git
By weltio weltio

move $arch override to before it is used

closes https://gitlab.archlinux.org/archlinux/archiso/-/issues/163

* initial: arch=""
* _read_profile: packages="${profile}/packages.${arch}"
* _set_overrides: [[ -n "$arch" ]] || arch="$(uname -m)"

$arch is not defined in _read_profile if arch is not defined in profiledef.sh and packages is not updated after _set_overrides

[[ -n "$arch" ]] || arch="$(uname -m)" should be moved from _set_overrides to _read_profile.
2022-01-22 13:16:10 +02:00
weltio weltio
742619240c https://gitlab.archlinux.org/archlinux/archiso/-/issues/163 2022-01-21 09:49:49 +00:00
nl6720
e2e4f3d619
Merge branch 'hayao0819/archiso-fix-mmd-validation-error'
* hayao0819/archiso-fix-mmd-validation-error:
  mkarchiso: Fix mmd-command check
2022-01-09 11:14:10 +02:00
hayao
025d6b828f mkarchiso: Fix mmd-command check
valication_error variable is not changed when mmd and/or mcopy are missing.
2022-01-08 02:18:09 +00:00
David Runge
324bab5c4e
Merge branch 'version/60'
* version/60:
  Add changelog for version 60
  Add dummy changelog entry
2021-12-28 11:24:31 +01:00
David Runge
5b01770f7b
Add changelog for version 60
CHANGELOG.rst:
Add a changelog entry for version 60.
2021-12-28 10:27:55 +01:00
David Runge
3c0720b72f
Add dummy changelog entry
CHANGELOG.rst:
Add a dummy changelog entry that serves as entry for any unreleased changes.
2021-12-28 10:20:44 +01:00
David Runge
f67f61f4b1
Merge branch 'nl6720_developer'
* nl6720_developer:
  Add nl6720 to the list of maintainers
2021-12-28 10:15:22 +01:00
David Runge
8d20de7c0f
Add nl6720 to the list of maintainers
README.rst:
Add nl6720 to the list of maintainers eligible to craft releases using the PGP key with the ID
`BB8E6F1B81CF0BB301D74D1CBF425A01E68B38EF`.
2021-12-18 22:37:05 +01:00
nl6720
754caf0ca2
Merge branch '151-mkarchiso-should-show-code-signing-certificates-none-if-no-keys-cerfificates-are-specified'
* 151-mkarchiso-should-show-code-signing-certificates-none-if-no-keys-cerfificates-are-specified:
  mkarchiso: show "Code signing certificates: None" if no keys/certificates are specified
2021-12-10 13:18:41 +02:00
nl6720
dae5494ca1
mkarchiso: show "Code signing certificates: None" if no keys/certificates are specified
Fixes #151.
2021-12-10 13:15:13 +02:00
nl6720
01d03eb8b5
Merge branch 'rm-archiso_shutdown'
* rm-archiso_shutdown:
  configs/releng/airootfs/etc/mkinitcpio.conf: remove archiso_shutdown
2021-12-10 08:51:21 +02:00
nl6720
e785ee2cee
configs/releng/airootfs/etc/mkinitcpio.conf: remove archiso_shutdown
The archiso_shutdown hook has been obsolete since mkinitcpio 16.
https://lists.archlinux.org/pipermail/arch-dev-public/2013-December/025742.html

Related to mkinitcpio/mkinitcpio-archiso#8.
2021-12-02 14:49:10 +02:00
David Runge
b8c9b9b403
Merge remote-tracking branch 'origin/changelog/59'
* origin/changelog/59:
  Add changelog for v59
2021-11-30 23:18:58 +01:00
David Runge
12b31c8778
Add changelog for v59
CHANGELOG.rst:
Add changelog information for v59.
2021-11-30 23:11:42 +01:00
David Runge
547678627d
Merge remote-tracking branch 'deimosian/deimosian-master-patch-67154'
* deimosian/deimosian-master-patch-67154:
  Fixes failure to retry script download. Tested and verified the issue is resolved.
2021-11-30 23:05:58 +01:00
Howard Hicks
679bfc8c9f Fixes failure to retry script download. Tested and verified the issue is resolved.
The curl --retry-connrefused option is used with not instead of the --retry <num> option to add an extra type of failure to retry on, without --retry <num> it does not retry at all even on a connection refused. 

https://man.archlinux.org/man/curl.1.en
2021-11-30 22:03:09 +00:00
David Runge
2cbf5abe62
Merge remote-tracking branch 'tomty89/grub_refind'
* tomty89/grub_refind:
  Add grub and refind back
2021-11-30 21:25:18 +01:00
Tom Yan
2f88ba3cc1 Add grub and refind back
"rescue/installation actions for {grub,refind} should be run from
within a chroot" is a false statement. See --boot-directory of
grub-install and --root of refind-install. (In the case of grub,
there are people that do not use the ugly grub-mkconfig at all.)
2021-11-30 18:40:45 +00:00
David Runge
6cd4a64caa
Merge remote-tracking branch 'nl6720/more-quiet'
* nl6720/more-quiet:
  mkarchiso: use mkfs.erofs --quiet in quiet mode
  mkarchiso: use mksquashfs -quiet instead of redirecting its stdout to /dev/null
  mkarchiso: do not show subdirectory sizes in netboot mode
  mkarchiso: redirect command -v output to /dev/null
  mkarchiso: silence xorriso's note about SOURCE_DATE_EPOCH
  mkarchiso: silence mkfs.fat in quiet mode
2021-11-30 19:39:46 +01:00
nl6720
a7f879fcdd
mkarchiso: use mkfs.erofs --quiet in quiet mode
erofs-utils 1.4 introduced a --quiet option.

Related to #148.
2021-11-22 12:04:35 +02:00
nl6720
8cfe29043f
mkarchiso: use mksquashfs -quiet instead of redirecting its stdout to /dev/null
mksquashfs supports a -quiet option since squashfs-tools 4.4.
Use this option in non-verbose mode instead of redirecting stdout of the whole command to /dev/null.

This allows to have only one instance of mksquashfs in _run_mksquashfs instead of multiple ones in if-then-else.

Related to #148.
2021-11-05 13:01:28 +02:00
nl6720
009140bd8b
mkarchiso: do not show subdirectory sizes in netboot mode
Only the total size is relevant.

Related to #148.
2021-11-05 12:44:03 +02:00
nl6720
5738f40aa9
mkarchiso: redirect command -v output to /dev/null
The output is irrelevant, we only need the return code.

Related to #148.
2021-11-05 12:44:01 +02:00
nl6720
ad6d65ab87
mkarchiso: silence xorriso's note about SOURCE_DATE_EPOCH
The `xorriso -as mkisofs` option `-quiet` is interpreted too late. Use native xorriso option `-report_about SORRY` instead and ensure it is the first option.

Related to #148.
2021-11-05 12:43:48 +02:00
nl6720
d2addb25c9
mkarchiso: silence mkfs.fat in quiet mode
mkfs.fat does not have a -q/--quiet option, so redirect its stdout to /dev/null instead.
See https://github.com/dosfstools/dosfstools/issues/103 .

Related to #148.
2021-11-04 07:58:12 +02:00
David Runge
1c42553c35
Merge remote-tracking branch 'nl6720/netboot-no-bootmodes'
* nl6720/netboot-no-bootmodes:
  mkarchiso: do not require setting boot modes when building only netboot artifacts
2021-11-03 09:29:59 +01:00
nl6720
662027ef80
mkarchiso: do not require setting boot modes when building only netboot artifacts
netboot does not need any of the boot loaders or their files.

Fixes #150.
2021-11-02 21:10:07 +02:00
David Runge
2f207fdafc
Merge remote-tracking branch 'nl6720/date'
* nl6720/date:
  mkarchiso: replace external date command with printf
2021-11-02 20:06:40 +01:00
nl6720
f8862c2621
mkarchiso: replace external date command with printf
printf is a bash builtin, so by using it an external command can be avoided.
Due to the differences between date(1) and strftime(3), the time zone output will not contain a colon anymore. Fortunately, that is still a supported format according to https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC .
2021-11-02 20:57:47 +02:00
David Runge
a37c320a34
Merge remote-tracking branch 'nl6720/mailmap'
* nl6720/mailmap:
  Add .mailmap file
2021-11-02 19:39:55 +01:00
nl6720
caf64e05ef
Add .mailmap file
Use .mailmap to fix author names and emails in git log / git shortlog -e.

Fixes #103.
2021-08-31 11:56:48 +03:00
David Runge
85596573ed
Merge branch 'changelog/58'
* changelog/58:
  Add changelog for v58
2021-08-25 14:52:01 +02:00
David Runge
fbe48dd7d2
Add changelog for v58
CHANGELOG.rst:
Add changelog entries for v58.
2021-08-25 14:10:06 +02:00
David Runge
087ee83335
Merge remote-tracking branch 'nl6720/fix-unbound-variables-in-_validate_options'
* nl6720/fix-unbound-variables-in-_validate_options:
  mkarchiso: error out of iso and netboot build modes if no boot modes are specified
  mkarchiso: split out build mode specific checks from _validate_options to _validate_requirements_buildmode_*
  mkarchiso: fix unbound variable errors in _validate_options
2021-08-25 12:08:37 +02:00
nl6720
d2315bc98d
mkarchiso: error out of iso and netboot build modes if no boot modes are specified 2021-08-25 00:29:35 +03:00
nl6720
f3959d6ef0
mkarchiso: split out build mode specific checks from _validate_options to _validate_requirements_buildmode_*
The bootstrap build mode does not use packages.${arch}, ${bootmodes[@]} or $airootfs_image_type so there's no need to validate them.
Requirements common to iso and netboot are checked with the _validate_common_requirements_buildmode_iso_netboot function.

Fixes #149.

* Rename _validate_requirements_buildmode_all to _validate_common_requirements_buildmode_all to prevent potential conflicts since we are using _validate_requirements_buildmode_${_buildmode} to run the functions.
* Improve searching in an array. See https://stackoverflow.com/a/15394738.
2021-08-25 00:29:35 +03:00
nl6720
8d18d8f745
mkarchiso: fix unbound variable errors in _validate_options
$pkg_list_from_file and $bootstrap_pkg_list_from_file are arrays, they must be referenced as such. Fixes https://bugs.archlinux.org/task/71852.

Remove quotes from arithmetic expressions.
2021-08-25 00:29:35 +03:00
David Runge
019f5aaeb6
Merge remote-tracking branch 'nl6720/gpg-sender'
* nl6720/gpg-sender:
  .gitlab/ci/build_archiso.sh: use mkarchiso's -G option
  mkarchiso: support setting gpg sender
  mkarchiso: add some sane gpg options to override those set in user's gpg.conf
2021-08-24 23:27:17 +02:00
nl6720
3c6cdb1469
.gitlab/ci/build_archiso.sh: use mkarchiso's -G option
Set gpg's --sender.
2021-08-25 00:26:07 +03:00
nl6720
59dffcf11a
mkarchiso: support setting gpg sender
Add new -G option to set gpg's --sender. This allows to see who signed the rootfs image without needing to import the gpg key from the keyring in initramfs.
2021-08-25 00:26:07 +03:00
nl6720
ea9572b98e
mkarchiso: add some sane gpg options to override those set in user's gpg.conf
* Add --batch, since gpg is run in a script.
* Add --no-armor (this is the default). Armored output provides no benifit here.
* Add --no-include-key-block (this is the default). There is no need to have the gpg key in the signature. The mkinitcpio hook will verify the signature against the included keyring.

Remove the output files before running gpg. Otherwise gpg --batch will fail if they exist.
2021-08-25 00:26:07 +03:00
David Runge
d3caf6f3a1
Merge remote-tracking branch 'nl6720/openssh-8.7p1'
* nl6720/openssh-8.7p1:
  configs/*/airootfs/etc/ssh/sshd_config: update to openssh 8.7p1-1
2021-08-24 23:25:06 +02:00