aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2018-07-18 15:31:28 +0800
committerKhem Raj <raj.khem@gmail.com>2018-07-20 16:07:12 -0700
commitdce3d8139d969e276f1d39de81862a8e05aa13bf (patch)
tree6060418a6d1206779e7318ff1f45d7e754cc5379
parent2a43b9ce84392fbebc104c2957178ba458d0702e (diff)
downloadmeta-openembedded-contrib-dce3d8139d969e276f1d39de81862a8e05aa13bf.tar.gz
meta-openembedded-contrib-dce3d8139d969e276f1d39de81862a8e05aa13bf.tar.bz2
meta-openembedded-contrib-dce3d8139d969e276f1d39de81862a8e05aa13bf.zip
udisks2: 2.7.6 -> 2.7.7
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch35
-rw-r--r--meta-oe/recipes-support/udisks/udisks2_2.7.7.bb (renamed from meta-oe/recipes-support/udisks/udisks2_2.7.6.bb)3
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch b/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
deleted file mode 100644
index 1cbd877517..0000000000
--- a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7fdd4acdf6daf95c5cc74e968f4710513c8ddaea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 23 Mar 2018 18:33:52 +0100
-Subject: [PATCH] data: fix out of tree build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| sed: can't read udisks2.service.in: No such file or directory
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/storaged-project/udisks/pull/510
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- data/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index ddf9e3d6..b38928c8 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -22,7 +22,7 @@ systemdservicedir = $(systemdsystemunitdir)
- systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
-
- $(systemdservice_DATA): udisks2.service.in Makefile
-- @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" udisks2.service.in > udisks2.service
-+ @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $(srcdir)/udisks2.service.in > udisks2.service
- endif
-
- udevrulesdir = $(udevdir)/rules.d
---
-2.14.3
-
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb b/meta-oe/recipes-support/udisks/udisks2_2.7.7.bb
index 4d22afd0d5..ac86a69ee1 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.7.7.bb
@@ -20,10 +20,9 @@ RDEPENDS_${PN} = "acl"
SRC_URI = " \
git://github.com/storaged-project/udisks.git \
- file://0001-data-fix-out-of-tree-build.patch \
file://non-gnu-libc.patch \
"
-SRCREV = "b6471f2e99f6aa1133af0de658f1fa05c748932c"
+SRCREV = "fcf888ca00980f75ce0c47041629b3d77e9f352e"
S = "${WORKDIR}/git"
CVE_PRODUCT = "udisks"