From 6df607bfd330111bf86e34e2fe9f16984267844d Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Wed, 20 Jan 2016 17:58:47 +0200 Subject: acpid: upgrade to 2.0.26 2.0.25 -> 2.0.26 a) Fixed an out of tree build error with musl b) Updated HOMEPAGE and BUGTRACKER info (From OE-Core rev: 9590dd6c89d6d99419cc0f0619ac4fe854150c9b) Signed-off-by: Maxin B. John Signed-off-by: Richard Purdie --- meta/recipes-bsp/acpid/acpid.inc | 4 +- .../acpid/acpid/0001-Fix-out-of-source-build.patch | 46 ++++++++++++++++++++++ meta/recipes-bsp/acpid/acpid_2.0.25.bb | 7 ---- meta/recipes-bsp/acpid/acpid_2.0.26.bb | 9 +++++ 4 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch delete mode 100644 meta/recipes-bsp/acpid/acpid_2.0.25.bb create mode 100644 meta/recipes-bsp/acpid/acpid_2.0.26.bb (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc index e0156192a0..12ec19bbb0 100644 --- a/meta/recipes-bsp/acpid/acpid.inc +++ b/meta/recipes-bsp/acpid/acpid.inc @@ -1,6 +1,6 @@ SUMMARY = "A daemon for delivering ACPI events" -HOMEPAGE = "http://sourceforge.net/projects/acpid/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=33140&atid=407341" +HOMEPAGE = "http://sourceforge.net/projects/acpid2" +BUGTRACKER = "http://sourceforge.net/p/acpid2/tickets/?source=navbar" SECTION = "base" LICENSE = "GPLv2+" 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 new file mode 100644 index 0000000000..d1aa3aa173 --- /dev/null +++ b/meta/recipes-bsp/acpid/acpid/0001-Fix-out-of-source-build.patch @@ -0,0 +1,46 @@ +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.25.bb b/meta/recipes-bsp/acpid/acpid_2.0.25.bb deleted file mode 100644 index f00d25af5e..0000000000 --- a/meta/recipes-bsp/acpid/acpid_2.0.25.bb +++ /dev/null @@ -1,7 +0,0 @@ -require acpid.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5" - -SRC_URI[md5sum] = "69bb0cc4a0a89eb2dfecc4851087f568" -SRC_URI[sha256sum] = "0b700a8072bec162c512f72cbe419195601ab3e0ffd2138f9bd95ed3097a5c68" diff --git a/meta/recipes-bsp/acpid/acpid_2.0.26.bb b/meta/recipes-bsp/acpid/acpid_2.0.26.bb new file mode 100644 index 0000000000..c3bd51f7d6 --- /dev/null +++ b/meta/recipes-bsp/acpid/acpid_2.0.26.bb @@ -0,0 +1,9 @@ +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" -- cgit 1.2.3-korg