Upgrade apmd to 3.2.2.

BKrev: 40b42377yh2A0A5W0WtjcGPJE_qVEQ

diff --git a/apmd/apmd-3.2.0-r0/apmd_3.2.0-3.diff b/apmd/apmd-3.2.2/apmd_proxy
similarity index 100%
rename from apmd/apmd-3.2.0-r0/apmd_3.2.0-3.diff
rename to apmd/apmd-3.2.2/apmd_proxy

diff --git a/apmd/apmd-3.2.0-r0/apmwrapper b/apmd/apmd-3.2.2/apmd_proxy.conf
similarity index 100%
rename from apmd/apmd-3.2.0-r0/apmwrapper
rename to apmd/apmd-3.2.2/apmd_proxy.conf

diff --git a/apmd/apmd-3.2.0-r0/compile.patch b/apmd/apmd-3.2.2/apmwrapper
similarity index 100%
rename from apmd/apmd-3.2.0-r0/compile.patch
rename to apmd/apmd-3.2.2/apmwrapper

diff --git a/apmd/apmd-3.2.0-r0/conf.patch b/apmd/apmd-3.2.2/debian.patch
similarity index 100%
rename from apmd/apmd-3.2.0-r0/conf.patch
rename to apmd/apmd-3.2.2/debian.patch

diff --git a/apmd/apmd-3.2.0-r0/devfs.patch b/apmd/apmd-3.2.2/default
similarity index 100%
rename from apmd/apmd-3.2.0-r0/devfs.patch
rename to apmd/apmd-3.2.2/default

diff --git a/apmd/apmd-3.2.0-r0/init b/apmd/apmd-3.2.2/devfs.patch
similarity index 100%
rename from apmd/apmd-3.2.0-r0/init
rename to apmd/apmd-3.2.2/devfs.patch

diff --git a/apmd/apmd-3.2.0-r0/make.patch b/apmd/apmd-3.2.2/hwclock
similarity index 100%
rename from apmd/apmd-3.2.0-r0/make.patch
rename to apmd/apmd-3.2.2/hwclock

diff --git a/apmd/apmd-3.2.0-r0/proxy.patch b/apmd/apmd-3.2.2/init
similarity index 100%
rename from apmd/apmd-3.2.0-r0/proxy.patch
rename to apmd/apmd-3.2.2/init

diff --git a/apmd/apmd-3.2.0-r0/workaround.patch b/apmd/apmd-3.2.2/logcheck.ignore.paranoid
similarity index 100%
rename from apmd/apmd-3.2.0-r0/workaround.patch
rename to apmd/apmd-3.2.2/logcheck.ignore.paranoid

diff --git a/apmd/apmd-3.2.2/workaround.patch b/apmd/apmd-3.2.2/workaround.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
deleted file mode 100644 (file)
index 6eaa218..0000000
--- a/apmd/apmd_3.2.0.oe
+++ /dev/null
@@ -1,66 +0,0 @@
-SECTION = "base"
-PRIORITY = "required"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "virtual/libc libtool-cross"
-DESCRIPTION = "Set of tools for managing notebook power consumption."
-
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
-           file://apmwrapper \
-           file://init"
-SRC_URI_append =" file://apmd_${PV}-3.diff;patch=1"
-SRC_URI_append =" file://workaround.patch;patch=1"
-SRC_URI_append =" file://conf.patch;patch=1"
-SRC_URI_append =" file://proxy.patch;patch=1"
-SRC_URI_append =" file://compile.patch;patch=1"
-SRC_URI_append =" file://make.patch;patch=1"
-
-S = "${WORKDIR}/apmd-${PV}.orig"
-
-do_compile() {
-       oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd
-}
-
-do_stage() {
-       oe_libinstall -so libapm ${STAGING_LIBDIR}
-}
-
-do_install() {
-
-       install -d ${D}/${sysconfdir}
-       install -d ${D}/${sysconfdir}/apm
-       install -d ${D}/${sysconfdir}/apm/event.d
-       install -d ${D}/${sysconfdir}/apm/other.d
-       install -d ${D}/${sysconfdir}/apm/suspend.d
-       install -d ${D}/${sysconfdir}/apm/resume.d
-       install -d ${D}/${sysconfdir}/apm/scripts.d
-       install -d ${D}/${sysconfdir}/default
-       install -d ${D}/${sysconfdir}/init.d
-       install -d ${D}/${sbindir}
-       install -d ${D}/${bindir}
-       install -d ${D}/${libdir}
-       install -d ${D}/${datadir}/apmd
-       install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig
-       install -m 0755 ${WORKDIR}/apmwrapper ${D}/${bindir}/apm
-       install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd
-       install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/
-       install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
-       install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
-       oe_libinstall -so libapm ${D}/${libdir}
-
-       cat ${WORKDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd
-       chmod 755 ${D}/${sysconfdir}/init.d/apmd
-}
-
-pkg_postinst () {
-       if test -n "${D}"; then
-               D="-r $D"
-       fi
-       update-rc.d $D apmd defaults
-}
-
-pkg_prerm () {
-       if test -n "${D}"; then
-               D="-r $D"
-       fi
-       update-rc.d $D apmd remove
-}

diff --git a/apmd/apmd_3.2.2.oe b/apmd/apmd_3.2.2.oe
new file mode 100644 (file)
index 0000000..e69de29