summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-01-26 14:56:41 +0100
committerFlorian Klink <flokli@flokli.de>2020-04-17 00:27:19 +0200
commitba770e599c3489856054e23f1b8d09684195f619 (patch)
tree3a0bfca6651d85e5bcc2d857277982e687cc172b /pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch
parentd1009f4d99dbb6600f08ab0ef214806acc675670 (diff)
downloadnixpkgs-ba770e599c3489856054e23f1b8d09684195f619.tar
nixpkgs-ba770e599c3489856054e23f1b8d09684195f619.tar.gz
nixpkgs-ba770e599c3489856054e23f1b8d09684195f619.tar.bz2
nixpkgs-ba770e599c3489856054e23f1b8d09684195f619.tar.lz
nixpkgs-ba770e599c3489856054e23f1b8d09684195f619.tar.xz
nixpkgs-ba770e599c3489856054e23f1b8d09684195f619.tar.zst
nixpkgs-ba770e599c3489856054e23f1b8d09684195f619.zip
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)
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch
new file mode 100644
index 00000000000..624811f5ea3
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch
@@ -0,0 +1,32 @@
+From 0f434c6baee63eff913f36aee839df3718a75d4a Mon Sep 17 00:00:00 2001
+From: Nikolay Amiantov <ab@fmap.me>
+Date: Thu, 7 Jul 2016 02:47:13 +0300
+Subject: [PATCH 11/27] Fix hwdb paths
+
+Patch by vcunat.
+---
+ src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
+index 58124abd21..d80e408b8c 100644
+--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
+@@ -298,13 +298,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
+ }
+ 
+ static const char hwdb_bin_paths[] =
+-        "/etc/systemd/hwdb/hwdb.bin\0"
+         "/etc/udev/hwdb.bin\0"
+-        "/usr/lib/systemd/hwdb/hwdb.bin\0"
+-#if HAVE_SPLIT_USR
+-        "/lib/systemd/hwdb/hwdb.bin\0"
+-#endif
+-        UDEVLIBEXECDIR "/hwdb.bin\0";
++        ;
+ 
+ _public_ int sd_hwdb_new(sd_hwdb **ret) {
+         _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
+-- 
+2.24.1
+