diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-filesystems/recipes-utils/udevil/files | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | blackbird-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz blackbird-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-filesystems/recipes-utils/udevil/files')
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch b/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch new file mode 100644 index 000000000..355e93a37 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch @@ -0,0 +1,12 @@ +Fix compilation with GCC6 + +--- a/src/device-info.c 2013-12-09 14:59:27.000000000 +0100 ++++ b/src/device-info.c 2017-03-13 07:06:25.506666680 +0100 +@@ -3,6 +3,7 @@ + * contains code excerpts from udisks v1.0.4 + ************************************************************************** */ + ++#include <sys/stat.h> + #include "device-info.h" + + static char * diff --git a/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch b/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch new file mode 100644 index 000000000..f014a0f53 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch @@ -0,0 +1,32 @@ +From 80b087193698632e525b90d45b4a49e61e343e1c Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski <krzk@kernel.org> +Date: Thu, 13 Jul 2017 21:30:35 +0200 +Subject: [PATCH] etc: Makefile.am: Use systemd_unitdir instead of libdir + +Proper directory for installing systemd services is systemd_unitdir, not +libdir. + +Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> +--- + etc/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/etc/Makefile.am b/etc/Makefile.am +index 9b6e7522c20f..6d663241a72f 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -16,8 +16,8 @@ if ADD_SYSTEMD + test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \ + $(srcdir)/systemd/devmon \ + $(DESTDIR)/$(sysconfdir)/conf.d/devmon +- test -d $(DESTDIR)/$(libdir)/systemd/system || \ +- mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system ++ test -d $(DESTDIR)/$(systemd_unitdir)/system || \ ++ mkdir -p -- $(DESTDIR)/$(systemd_unitdir)/system + $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \ +- $(DESTDIR)/$(libdir)/systemd/system/devmon@.service ++ $(DESTDIR)/$(systemd_unitdir)/system/devmon@.service + endif +-- +2.11.0 + |