acpid: upgrade to 2.0.22 and add systemd support

For acpid needs to upgrade to work correctly with the new kernel.
The new version now uses autotools.

Also add systemd unit file.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index fad7afdf268a042e62319357bebe327ecf30a401..9b4c3a5a5d9aa0dd617368348ca52906a4beb56f 100644 (file)
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -4,30 +4,28 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=33140&atid=407341"
 SECTION = "base"
 LICENSE = "GPLv2+"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/acpid2/acpid-${PV}.tar.xz \
            file://init \
-           file://set_socket_noblock.patch "
+           file://acpid.service \
+          "
 
-inherit update-rc.d
+inherit autotools update-rc.d systemd
 
 INITSCRIPT_NAME = "acpid"
 INITSCRIPT_PARAMS = "defaults"
 
-# Makefile ignores our CFLAGS, so override it.
-#
-EXTRA_OEMAKE = "CFLAGS='-W -Wall -Werror -Wundef -Wshadow ${CFLAGS} $(DEFS)'"
+SYSTEMD_PACKAGES = "acpid"
+SYSTEMD_SERVICE_acpid = "acpid.service"
 
-do_compile () {
-       oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-       install -d ${D}${bindir} 
-       oe_runmake 'INSTPREFIX=${D}' install
+do_install_append () {
        install -d ${D}${sysconfdir}/init.d
        sed -e 's,/usr/sbin,${sbindir},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/acpid
        chmod 755 ${D}${sysconfdir}/init.d/acpid
 
        install -d ${D}${sysconfdir}/acpi
        install -d ${D}${sysconfdir}/acpi/events
+
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_unitdir}/system
+       sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/acpid.service
 }

diff --git a/meta/recipes-bsp/acpid/acpid/acpid.service b/meta/recipes-bsp/acpid/acpid/acpid.service
new file mode 100644 (file)
index 0000000..f70e740
--- /dev/null
+++ b/meta/recipes-bsp/acpid/acpid/acpid.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ACPI Event Daemon
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=@SBINDIR@/acpid
+
+[Install]
+WantedBy=multi-user.target

diff --git a/meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch b/meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch
deleted file mode 100644 (file)
index 54d6435..0000000
--- a/meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/acpid.c
-+++ b/acpid.c
-@@ -307,6 +307,7 @@ main(int argc, char **argv)
-                               non_root_clients++;
-                       }
-                       fcntl(cli_fd, F_SETFD, FD_CLOEXEC);
-+                      fcntl(cli_fd, F_SETFL, O_NONBLOCK);
-                       snprintf(buf, sizeof(buf)-1, "%d[%d:%d]",
-                               creds.pid, creds.uid, creds.gid);
-                       acpid_add_client(cli_fd, buf);

diff --git a/meta/recipes-bsp/acpid/acpid_1.0.10.bb b/meta/recipes-bsp/acpid/acpid_2.0.22.bb
similarity index 55%
rename from meta/recipes-bsp/acpid/acpid_1.0.10.bb
rename to meta/recipes-bsp/acpid/acpid_2.0.22.bb
index df55badbd4e24f3692a2683f92e39074d1c0af06..603fc2be9f5e288c2d3350dd5f22010a50858c93 100644 (file)
--- a/meta/recipes-bsp/acpid/acpid_1.0.10.bb
+++ b/meta/recipes-bsp/acpid/acpid_2.0.22.bb
@@ -3,6 +3,5 @@ require acpid.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://acpid.h;endline=24;md5=324a9cf225ae69ddaad1bf9d942115b5"
 
-
-SRC_URI[md5sum] = "61156ef32015c56dc0f2e3317f4ae09e"
-SRC_URI[sha256sum] = "22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760"
+SRC_URI[md5sum] = "c8ba756030d1b21fc973ec3d640f27f1"
+SRC_URI[sha256sum] = "3d11454f4283c8f771d8dbd5eb6b5f2bbd9d94d9f77d68bab89e35d98b67ab31"