summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-05-09 22:08:30 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-05-09 22:08:30 +0000
commit8805a80d179564eaaf4e3c40a10c7b4a63efcbee (patch)
treed8752f11021c264b563acf8ace63a1f98e5864fe /packages
parentb621d23ceff0fe79d9ade6516c42d7fe7c2e815a (diff)
parent13e5f954fc508e978daca70db46af1d20ae1bcbc (diff)
merge of '2baf3a1fbd62929bb0545e9e479b7a34b21190a2'
and '7ce8482617dacb21bddaed0ba9c8a445bbf9dfdf'
Diffstat (limited to 'packages')
-rw-r--r--packages/upstart/upstart.inc17
-rw-r--r--packages/upstart/upstart_0.3.8.bb2
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/upstart/upstart.inc b/packages/upstart/upstart.inc
index c1eaaeb45f..59f21c9ed5 100644
--- a/packages/upstart/upstart.inc
+++ b/packages/upstart/upstart.inc
@@ -2,10 +2,25 @@ SECTION = "base"
PRIORITY = "optional"
DEPENDS = ""
DESCRIPTION = "Event driven system init"
-LICENSE = "MPL LGPL"
+LICENSE = "GPL"
inherit autotools pkgconfig
+# --enable-compat builds halt, reboot, shutdown tools
+EXTRA_OECONF += "--enable-compat"
+
do_stage () {
autotools_stage_all
}
+
+# libupstart can be used for upstart event generation from other programs.
+# However it is not used by upstart itself, so package it seperately.
+PACKAGES =+ "libupstart libupstart-dev"
+FILES_libupstart += "${libdir}/libupstart.so.*"
+FILES_libupstart-dev += "${libdir}/libupstart.* ${includedir}/upstart/"
+
+# upstart-sysvcompat provides Sys V Init compatible tools: halt, reboot,
+# shutdown, telinit. These might be needed by other scripts.
+PACKAGES =+ "upstart-sysvcompat upstart-sysvtools-doc"
+FILES_upstart-sysvcompat += "${sbindir}/reboot ${sbindir}/halt ${sbindir}/shutdown ${sbindir}/telinit"
+FILES_upstart-sysvcompat-doc += "${mandir}/*/reboot.* ${mandir}/*/halt.* ${mandir}/*/shutdown.* ${mandir}/*/telinit.*"
diff --git a/packages/upstart/upstart_0.3.8.bb b/packages/upstart/upstart_0.3.8.bb
index 6300270796..5a4cf872a8 100644
--- a/packages/upstart/upstart_0.3.8.bb
+++ b/packages/upstart/upstart_0.3.8.bb
@@ -3,5 +3,5 @@ require upstart.inc
SRC_URI = "http://upstart.ubuntu.com/download/0.3/upstart-${PV}.tar.bz2 \
file://autoconf_version.patch;patch=1"
-PR = "r0"
+PR = "r1"