merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'

     and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'

4 files changed, 37 insertions, 98 deletions

diff --git a/packages/acpid/acpid.inc b/packages/acpid/acpid.inc
new file mode 100644
index 0000000000..c96f431224
--- /dev/null
+++ b/packages/acpid/acpid.inc
@@ -0,0 +1,32 @@
+SECTION = "base"
+DESCRIPTION = "A daemon for delivering ACPI events."
+LICENSE="GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
+           file://init"
+
+EXTRA_OEMAKE = ""
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+}
+
+do_install () {
+	oe_runmake 'INSTPREFIX=${D}' install
+	install -d ${D}${sysconfdir}/init.d
+	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
+	chmod 755 ${D}${sysconfdir}/init.d/acpid
+}
+
+pkg_postinst () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid defaults
+}
+
+pkg_prerm () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid remove
+}
diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb
index c96f431224..af1d3b2853 100644
--- a/packages/acpid/acpid_1.0.2.bb
+++ b/packages/acpid/acpid_1.0.2.bb
@@ -1,32 +1 @@
-SECTION = "base"
-DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
-           file://init"
-
-EXTRA_OEMAKE = ""
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-	oe_runmake 'INSTPREFIX=${D}' install
-	install -d ${D}${sysconfdir}/init.d
-	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
-	chmod 755 ${D}${sysconfdir}/init.d/acpid
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid remove
-}
+require acpid.inc
diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb
index 4ce3878785..596ef49452 100644
--- a/packages/acpid/acpid_1.0.3.bb
+++ b/packages/acpid/acpid_1.0.3.bb
@@ -1,33 +1,2 @@
-SECTION = "base"
-DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
-   	   file://gcc40.patch;patch=1 \
-           file://init"
-
-EXTRA_OEMAKE = ""
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-	oe_runmake 'INSTPREFIX=${D}' install
-	install -d ${D}${sysconfdir}/init.d
-	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
-	chmod 755 ${D}${sysconfdir}/init.d/acpid
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid remove
-}
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"
diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb
index 4ce3878785..596ef49452 100644
--- a/packages/acpid/acpid_1.0.4.bb
+++ b/packages/acpid/acpid_1.0.4.bb
@@ -1,33 +1,2 @@
-SECTION = "base"
-DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
-   	   file://gcc40.patch;patch=1 \
-           file://init"
-
-EXTRA_OEMAKE = ""
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-	oe_runmake 'INSTPREFIX=${D}' install
-	install -d ${D}${sysconfdir}/init.d
-	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
-	chmod 755 ${D}${sysconfdir}/init.d/acpid
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid remove
-}
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"