diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-03 15:09:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 11:09:05 +0100 |
commit | f9c6b40fb116c12701c12bb28b4b2b909578c823 (patch) | |
tree | 12088587bf27984ff5f9fdecb769d7ebddee7926 /meta/recipes-bsp | |
parent | 9b5bc946e52c76b0f15c3576d9c6168a3bfcb767 (diff) | |
download | ast2050-yocto-poky-f9c6b40fb116c12701c12bb28b4b2b909578c823.zip ast2050-yocto-poky-f9c6b40fb116c12701c12bb28b4b2b909578c823.tar.gz |
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.
(From OE-Core rev: 93805abedb5563a91886f330153b179033a29d11)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/acpid/acpid.inc | 24 | ||||
-rw-r--r-- | meta/recipes-bsp/acpid/acpid/acpid.service | 10 | ||||
-rw-r--r-- | meta/recipes-bsp/acpid/acpid/set_socket_noblock.patch | 10 | ||||
-rw-r--r-- | meta/recipes-bsp/acpid/acpid_2.0.22.bb (renamed from meta/recipes-bsp/acpid/acpid_1.0.10.bb) | 5 |
4 files changed, 23 insertions, 26 deletions
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc index fad7afd..9b4c3a5 100644 --- 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 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 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 index df55bad..603fc2b 100644 --- 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" |