cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch

27 lines
829 B
Diff
Raw Normal View History

systemd: 246.6 -> 247-rc2
2020-11-01 15:35:11 +01:00
From d410a7a6d1bb0fe730c3ef690676232bfaa49f85 Mon Sep 17 00:00:00 2001
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-01-26 14:56:41 +01:00
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 11 Feb 2018 04:37:44 +0100
systemd: regenerate patches It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
2020-04-30 01:03:18 +02:00
Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir
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-01-26 14:56:41 +01:00
---
meson.build | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
systemd: 246.6 -> 247-rc2
2020-11-01 15:35:11 +01:00
index f406d595e6..f05f579816 100644
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-01-26 14:56:41 +01:00
--- a/meson.build
+++ b/meson.build
systemd: 246.6 -> 247-rc2
2020-11-01 15:35:11 +01:00
@@ -3517,9 +3517,6 @@ install_data('LICENSE.GPL2',
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-01-26 14:56:41 +01:00
'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
install_dir : docdir)
-meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
-meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
-
############################################################
systemd: 245.7 -> 246
2020-07-31 18:02:33 +02:00
check_help = find_program('tools/check-help.sh')
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-01-26 14:56:41 +01:00
--
systemd: 246.6 -> 247-rc2
2020-11-01 15:35:11 +01:00
2.29.2
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-01-26 14:56:41 +01:00
Reference in a new issue Copy permalink