Commit Graph

11292 Commits

Author SHA1 Message Date
Maximilian Bosch
19de59a9be
Merge pull request #85334 from flokli/systemd-mainline2
systemd: 243.7 -> 245
2020-04-19 16:02:52 +02:00
John Ericson
1ea80c2cc3 Merge remote-tracking branch 'upstream/master' into staging 2020-04-18 15:40:49 -04:00
Jan Tojnar
09c4736405
Merge pull request #83755 from jtojnar/jcat-0.1 2020-04-18 20:38:24 +02:00
Mario Rodas
e5dd52b99d
Merge pull request #85422 from marsam/update-lxc
lxc: 4.0.1 -> 4.0.2
2020-04-18 13:24:22 -05:00
Jan Tojnar
06e5800a73
fwupd: 1.3.9 → 1.4.0
https://github.com/fwupd/fwupd/releases/tag/1.4.0
2020-04-18 19:51:08 +02:00
Pavol Rusnak
fadcfc3ea4
treewide: per RFC45, remove more unquoted URLs 2020-04-18 14:04:37 +02:00
John Ericson
cc880cd91f Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:50:55 -04:00
John Ericson
e99a409065
Merge pull request #85190 from Ericson2314/fwupdate
fwupdate: Clean up -I flags
2020-04-17 18:50:22 -04:00
John Ericson
33c2a76c5e Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:40:51 -04:00
Tim Steinbach
e341107367
linux: 5.4.32 -> 5.4.33 2020-04-17 08:34:01 -04:00
Tim Steinbach
d9258d33be
linux: 4.19.115 -> 4.19.116 2020-04-17 08:34:01 -04:00
Florian Klink
b3f14109a8 systemd: explicitly disable portabled for now
This hasn't worked with 243, let's disable it for now, until we have
tests and can ensure it works and keeps working.
2020-04-17 00:31:03 +02:00
Florian Klink
ce7c1230ea systemd: explicitly disable homed for now
We don't currently have tests to ensure it works and keeps working.

So instead of having it accidentially working, and possibly breaking it
in the future, disable it for now.
2020-04-17 00:30:52 +02:00
Jörg Thalheim
c18ceab106 systemd: remove myself as maintainer 2020-04-17 00:30:52 +02:00
Florian Klink
b0b7f673dc systemd: 245 -> 245.3 2020-04-17 00:30:52 +02:00
Florian Klink
d2871a723a systemd: 244.3 -> 245 2020-04-17 00:30:51 +02:00
Florian Klink
9de0ac3770 systemd: 243.7 -> 244.3
This required some changes in how we treat DEFAULT_PATH_NORMAL.
2020-04-17 00:30:51 +02:00
Florian Klink
b4cbcba5b1 systemd: update paths kmod-static-nodes.service
The previous patch just removed a `ConditionFileNotEmpty=…` line from
`kmod-static-nodes.service` referring to a location not existing on
NixOS. We know better, and can actually replace this Condition to point
to `run/booted-system/kernel-modules/lib/modules/%v/`, instead of just
patching it out.
2020-04-17 00:28:58 +02:00
Florian Klink
a6710adab2 systemd: join 000{3,8}-Don-t-try-to-unmount-nix-or-nix-store.patch 2020-04-17 00:27:30 +02:00
Florian Klink
4f346cd849 systemd: drop 0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch
This was simply undoing a hunk from
0008-Don-t-try-to-unmount-nix-or-nix-store.patch, so drop that one from
there and omit
0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch entirely.
2020-04-17 00:27:29 +02:00
Florian Klink
a16ebf8561 systemd: drop 001{4,5}-{catalog,hwdb}-don-t-update-on-install.patch
These patches removed logic in the meson install phase invoking
`journalctl --update-catalog` and `systemd-hwdb update`, which would
mutate the running system, and obviously fails in the sandbox.

Upstream also knows this is a bad thing if you're not on the machine you
want to deploy to, so there's logic in there to not execute it when
DESTDIR isn't empty. In our case, it is - as we set --prefix instead for
other reasons, but by just setting DESTIDIR to "/", we can still trigger
these things to be skipped.

The patches removed some context from
0018-Install-default-configuration-into-out-share-factory.patch, which
we need to introduce there to make that patch still apply.
2020-04-17 00:27:29 +02:00
Florian Klink
1ad4accdaf systemd: drop 0027-Start-getty-on-lxc.patch
Since quite some time, systemd starts getty on these consoles
automatically.
2020-04-17 00:27:29 +02:00
Florian Klink
22bb3a6771 systemd: remove local-fs patch and revert of it 2020-04-17 00:27:29 +02:00
Florian Klink
ba770e599c systemd: switch from our own fork to upstream repo + local patches
After patching, this produces exactly the same source code as in our
custom fork, but having the actual patches inlined inside nixpkgs makes
it easier to get rid of them.

In case more complicated rebasing is necessary, maintainers can

 - Clone the upstream systemd/systemd[-stable] repo
 - Checkout the current rev mentioned in src
 - Apply the patches from this folder via `git am 00*.patch`
 - Rebase the repo on top of a new version
 - Export the patch series via `git format-patch $newVersion`
 - Update the patches = [ … ] attribute (if necessary)
2020-04-17 00:27:19 +02:00
Mario Rodas
fc7efb2d49
lxc: 4.0.1 -> 4.0.2 2020-04-16 04:20:00 -05:00
Jan Tojnar
4b706490da
Merge branch 'staging-next' into staging 2020-04-16 10:10:38 +02:00
Jan Tojnar
3d8e436917
Merge branch 'master' into staging-next 2020-04-16 10:09:43 +02:00
markuskowa
4289160b17
Merge pull request #85281 from r-ryantm/auto-update/rdma-core
rdma-core: 28.0 -> 29.0
2020-04-15 13:27:20 +02:00
R. RyanTM
d6d2b1ee6d rdma-core: 28.0 -> 29.0 2020-04-15 07:31:00 +00:00
Niklas Hambüchen
f16ae2da3e linux: Enable CONFIG_NET_DROP_MONITOR by default.
Needed for subscribing to dropped packets (e.g. via `dropwatch`).
2020-04-14 20:07:51 +02:00
Maximilian Bosch
401e07d419
Merge pull request #84551 from gnprice/pr-stripDebugList
treewide: Fix types of stripDebugList attrs (and fix doc)
2020-04-14 15:54:52 +02:00
John Ericson
17f2cf93dc fwupdate: Clean up -I flags 2020-04-13 19:21:23 -04:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Jan Tojnar
b4a6714571
Merge branch 'staging-next' into staging 2020-04-13 18:54:59 +02:00
Jan Tojnar
a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Matthew Bauer
156c67858f
Merge pull request #85017 from r-ryantm/auto-update/android-udev-rules
android-udev-rules: 20191103 -> 20200410
2020-04-13 11:11:25 -04:00
Tim Steinbach
f6e64feb14
linux: 5.6.3 -> 5.6.4 2020-04-13 08:36:35 -04:00
Tim Steinbach
bba4a30f8c
linux: 5.5.16 -> 5.5.17 2020-04-13 08:36:27 -04:00
Tim Steinbach
2b6e16abe0
linux: 5.4.31 -> 5.4.32 2020-04-13 08:36:19 -04:00
Tim Steinbach
f47969645b
linux: 4.9.218 -> 4.9.219 2020-04-13 08:36:11 -04:00
Tim Steinbach
e06d2a4682
linux: 4.19.114 -> 4.19.115 2020-04-13 08:36:04 -04:00
Tim Steinbach
f717bfeedb
linux: 4.14.175 -> 4.14.176 2020-04-13 08:35:56 -04:00
Tim Steinbach
3a8f6159cb
linux: 4.4.218 -> 4.4.219 2020-04-13 08:35:32 -04:00
Maximilian Bosch
89d2967c9e
linuxPackages.bpftrace: 0.9.3 -> 0.9.4
https://github.com/iovisor/bpftrace/releases/tag/v0.9.4
2020-04-13 12:03:37 +02:00
R. RyanTM
b1d4fdad19 pam_krb5: 4.8 -> 4.9 2020-04-12 17:43:53 -07:00
R. RyanTM
1c0b645d7b
earlyoom: 1.5 -> 1.6 2020-04-12 09:09:57 +00:00
Edmund Wu
f9ac494891
rtkit: 0.11 -> 0.13 2020-04-11 21:36:43 -04:00
Edmund Wu
363004c7eb
rtkit: cleanup 2020-04-11 17:09:44 -04:00
R. RyanTM
64f80e3397 android-udev-rules: 20191103 -> 20200410 2020-04-11 18:24:40 +00:00
Andreas Stührk
9ddfde8977 v4l2loopback: 0.12.3 -> 0.12.4 2020-04-10 14:22:11 -07:00