|
 |
4f94566 |
From db970ea57e722e7c2ca683e402d7f6e26335eb95 Mon Sep 17 00:00:00 2001
|
|
|
4f94566 |
From: Armin K <krejzi@email.com>
|
|
|
4f94566 |
Date: Tue, 4 Mar 2014 16:23:41 +0100
|
|
|
4f94566 |
Subject: [PATCH] build-sys: Don't distribute generated udev rule
|
|
|
4f94566 |
|
|
|
4f94566 |
It contains hardcoded path to systemd-sysctl executable which
|
|
|
4f94566 |
is /usr/lib/systemd/systemd-sysctl on latest stable release and
|
|
|
4f94566 |
as such it will complain at runtime if rootprefix != prefix
|
|
|
4f94566 |
|
|
|
4f94566 |
[zj: readd the file to nodist_udevrules_DATA]
|
|
|
4f94566 |
|
|
|
4f94566 |
(cherry picked from commit e2eb18d56b14eeb405706970f0460d8539cdcf23)
|
|
|
4f94566 |
(cherry picked from commit 66f231f4c71dfb11dc4552cb337571d3e3019c81)
|
|
|
4f94566 |
---
|
|
|
4f94566 |
Makefile.am | 4 +++-
|
|
|
4f94566 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
4f94566 |
|
|
|
4f94566 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
1cc3df3 |
index df476ce60e..5cf03c0aed 100644
|
|
|
4f94566 |
--- a/Makefile.am
|
|
|
4f94566 |
+++ b/Makefile.am
|
|
|
4f94566 |
@@ -2224,7 +2224,6 @@ INSTALL_DIRS += \
|
|
|
4f94566 |
$(sysconfdir)/udev/hwdb.d
|
|
|
4f94566 |
|
|
|
4f94566 |
dist_udevrules_DATA += \
|
|
|
4f94566 |
- rules/99-systemd.rules \
|
|
|
4f94566 |
rules/42-usb-hid-pm.rules \
|
|
|
4f94566 |
rules/50-udev-default.rules \
|
|
|
4f94566 |
rules/60-drm.rules \
|
|
|
4f94566 |
@@ -2241,6 +2240,9 @@ dist_udevrules_DATA += \
|
|
|
4f94566 |
rules/80-net-name-slot.rules \
|
|
|
4f94566 |
rules/95-udev-late.rules
|
|
|
4f94566 |
|
|
|
4f94566 |
+nodist_udevrules_DATA += \
|
|
|
4f94566 |
+ rules/99-systemd.rules
|
|
|
4f94566 |
+
|
|
|
4f94566 |
dist_udevhwdb_DATA = \
|
|
|
4f94566 |
hwdb/20-pci-vendor-model.hwdb \
|
|
|
4f94566 |
hwdb/20-pci-classes.hwdb \
|