From 59141d4ad815b5bcbb983e8121e4bcb34efb1174 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Wed, 4 May 2016 11:20:15 +0300 Subject: acpid: upgrade to 2.0.27 2.0.26 -> 2.0.27 Remove upstreamed patch: 0001-Fix-out-of-source-build.patch Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- .../acpid/acpid/0001-Fix-out-of-source-build.patch | 46 ---------------------- meta/recipes-bsp/acpid/acpid_2.0.26.bb | 9 ----- meta/recipes-bsp/acpid/acpid_2.0.27.bb | 7 ++++ 3 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch delete mode 100644 meta/recipes-bsp/acpid/acpid_2.0.26.bb create mode 100644 meta/recipes-bsp/acpid/acpid_2.0.27.bb (limited to 'meta/recipes-bsp/acpid') 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 @@ -From 5d32b65af750e2007730f3d55a552a186aed81a6 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -Date: Wed, 20 Jan 2016 14:08:29 +0200 -Subject: [PATCH] Fix out of source build - -Since the source directory contains another config.h, the build -directory should be searched first. - -Upstream-Status: Submitted -[https://sourceforge.net/p/acpid2/tickets/10/] - -Signed-off-by: Maxin B. John ---- - sock.c | 2 +- - ud_socket.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sock.c b/sock.c -index 644d460..9e04501 100644 ---- a/sock.c -+++ b/sock.c -@@ -21,7 +21,7 @@ - */ - - #ifdef HAVE_CONFIG_H --#include "config.h" -+#include - #endif - - #include -diff --git a/ud_socket.c b/ud_socket.c -index 1790917..83b2aa9 100644 ---- a/ud_socket.c -+++ b/ud_socket.c -@@ -4,7 +4,7 @@ - */ - - #ifdef HAVE_CONFIG_H --#include "config.h" -+#include - #endif - - #include --- -2.4.0 - 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 @@ -require acpid.inc - -SRC_URI += "file://0001-Fix-out-of-source-build.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" - -SRC_URI[md5sum] = "f6d772e35ed907f1cc14ad1a546fd473" -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 @@ +require acpid.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ + file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" + +SRC_URI[md5sum] = "e41bdf628e122edb4342fca432ea7db9" +SRC_URI[sha256sum] = "820c223e53cc11d9d7229fb1ffc2c2205f1054082c80f83f5a4ec4df16d3a616" -- cgit 1.2.3-korg