diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-05-04 11:20:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-11 10:33:38 +0100 |
commit | db36fc924666e1905bb76c2f86e1642a67564af5 (patch) | |
tree | 8e886a57d910ff8c7fddc629feb4dcac8945e8e6 /meta | |
parent | 06aa0d437148f31ee3d8e21b041467cadb0b298e (diff) | |
download | poky-db36fc924666e1905bb76c2f86e1642a67564af5.tar.gz |
acpid: upgrade to 2.0.27
2.0.26 -> 2.0.27
Remove upstreamed patch:
0001-Fix-out-of-source-build.patch
(From OE-Core rev: 59141d4ad815b5bcbb983e8121e4bcb34efb1174)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch | 46 | ||||
-rw-r--r-- | meta/recipes-bsp/acpid/acpid_2.0.26.bb | 9 | ||||
-rw-r--r-- | meta/recipes-bsp/acpid/acpid_2.0.27.bb | 7 |
3 files changed, 7 insertions, 55 deletions
diff --git a/meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch b/meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch deleted file mode 100644 index d1aa3aa173..0000000000 --- a/meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 5d32b65af750e2007730f3d55a552a186aed81a6 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Wed, 20 Jan 2016 14:08:29 +0200 | ||
4 | Subject: [PATCH] Fix out of source build | ||
5 | |||
6 | Since the source directory contains another config.h, the build | ||
7 | directory should be searched first. | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | [https://sourceforge.net/p/acpid2/tickets/10/] | ||
11 | |||
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
13 | --- | ||
14 | sock.c | 2 +- | ||
15 | ud_socket.c | 2 +- | ||
16 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/sock.c b/sock.c | ||
19 | index 644d460..9e04501 100644 | ||
20 | --- a/sock.c | ||
21 | +++ b/sock.c | ||
22 | @@ -21,7 +21,7 @@ | ||
23 | */ | ||
24 | |||
25 | #ifdef HAVE_CONFIG_H | ||
26 | -#include "config.h" | ||
27 | +#include <config.h> | ||
28 | #endif | ||
29 | |||
30 | #include <unistd.h> | ||
31 | diff --git a/ud_socket.c b/ud_socket.c | ||
32 | index 1790917..83b2aa9 100644 | ||
33 | --- a/ud_socket.c | ||
34 | +++ b/ud_socket.c | ||
35 | @@ -4,7 +4,7 @@ | ||
36 | */ | ||
37 | |||
38 | #ifdef HAVE_CONFIG_H | ||
39 | -#include "config.h" | ||
40 | +#include <config.h> | ||
41 | #endif | ||
42 | |||
43 | #include <stdio.h> | ||
44 | -- | ||
45 | 2.4.0 | ||
46 | |||
diff --git a/meta/recipes-bsp/acpid/acpid_2.0.26.bb b/meta/recipes-bsp/acpid/acpid_2.0.26.bb deleted file mode 100644 index c3bd51f7d6..0000000000 --- a/meta/recipes-bsp/acpid/acpid_2.0.26.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require acpid.inc | ||
2 | |||
3 | SRC_URI += "file://0001-Fix-out-of-source-build.patch" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ | ||
6 | file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" | ||
7 | |||
8 | SRC_URI[md5sum] = "f6d772e35ed907f1cc14ad1a546fd473" | ||
9 | SRC_URI[sha256sum] = "8384f37e4f260f50183e2e20039823d8f06aed9db56924fe92097b7e0b2e0343" | ||
diff --git a/meta/recipes-bsp/acpid/acpid_2.0.27.bb b/meta/recipes-bsp/acpid/acpid_2.0.27.bb new file mode 100644 index 0000000000..509fcfe9af --- /dev/null +++ b/meta/recipes-bsp/acpid/acpid_2.0.27.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require acpid.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ | ||
4 | file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" | ||
5 | |||
6 | SRC_URI[md5sum] = "e41bdf628e122edb4342fca432ea7db9" | ||
7 | SRC_URI[sha256sum] = "820c223e53cc11d9d7229fb1ffc2c2205f1054082c80f83f5a4ec4df16d3a616" | ||