diff options
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch | 35 | ||||
-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 1cbd87751..000000000 --- a/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 7fdd4acdf6daf95c5cc74e968f4710513c8ddaea Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Fri, 23 Mar 2018 18:33:52 +0100 | ||
4 | Subject: [PATCH] data: fix out of tree build | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | | sed: can't read udisks2.service.in: No such file or directory | ||
10 | |||
11 | Upstream-Status: Submitted [1] | ||
12 | |||
13 | [1] https://github.com/storaged-project/udisks/pull/510 | ||
14 | |||
15 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
16 | --- | ||
17 | data/Makefile.am | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/data/Makefile.am b/data/Makefile.am | ||
21 | index ddf9e3d6..b38928c8 100644 | ||
22 | --- a/data/Makefile.am | ||
23 | +++ b/data/Makefile.am | ||
24 | @@ -22,7 +22,7 @@ systemdservicedir = $(systemdsystemunitdir) | ||
25 | systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) | ||
26 | |||
27 | $(systemdservice_DATA): udisks2.service.in Makefile | ||
28 | - @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" udisks2.service.in > udisks2.service | ||
29 | + @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $(srcdir)/udisks2.service.in > udisks2.service | ||
30 | endif | ||
31 | |||
32 | udevrulesdir = $(udevdir)/rules.d | ||
33 | -- | ||
34 | 2.14.3 | ||
35 | |||
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 4d22afd0d..ac86a69ee 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" | |||
20 | 20 | ||
21 | SRC_URI = " \ | 21 | SRC_URI = " \ |
22 | git://github.com/storaged-project/udisks.git \ | 22 | git://github.com/storaged-project/udisks.git \ |
23 | file://0001-data-fix-out-of-tree-build.patch \ | ||
24 | file://non-gnu-libc.patch \ | 23 | file://non-gnu-libc.patch \ |
25 | " | 24 | " |
26 | SRCREV = "b6471f2e99f6aa1133af0de658f1fa05c748932c" | 25 | SRCREV = "fcf888ca00980f75ce0c47041629b3d77e9f352e" |
27 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
28 | 27 | ||
29 | CVE_PRODUCT = "udisks" | 28 | CVE_PRODUCT = "udisks" |