diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 12:36:19 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:37 -0700 |
| commit | 8b3e126484d6790a3cbb6ece87554ed74b2860e0 (patch) | |
| tree | 63a2090250432d6c400108d0c6660555ec8ec41d /meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch | |
| parent | ee25e2f3fdb9c4a6d14179891eb55ac8fa725da4 (diff) | |
| download | meta-openembedded-contrib-8b3e126484d6790a3cbb6ece87554ed74b2860e0.tar.gz | |
udisks: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch')
| -rw-r--r-- | meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch b/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch index 3cc040075f..2823c54f15 100644 --- a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch +++ b/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch @@ -1,4 +1,4 @@ -From 32278297170ffb49116b5789e4a0588b99d02bd0 Mon Sep 17 00:00:00 2001 +From a6eab413f274376cf703a608e2866118291a6185 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri <amarnath.valluri@intel.com> Date: Thu, 9 Feb 2017 11:02:53 +0200 Subject: [PATCH] Make udev rules directory configurable. @@ -9,6 +9,7 @@ libdir, sbindir for installing librares and binaries. Upstream-Status: Inappropriate[Embedded specific] Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> + --- configure.ac | 14 +++----------- data/Makefile.am | 1 - @@ -49,11 +50,11 @@ index 8c4e4c2..a143397 100644 compiler: ${CC} diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..4834960 100644 +index 08af5f4..9329186 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -34,7 +34,6 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile - @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ + @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ endif -udevrulesdir = $(slashlibdir)/udev/rules.d @@ -86,6 +87,3 @@ index 18325f7..0aaec11 100644 umount_udisks_SOURCES = umount-udisks.c umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS) --- -2.7.4 - |