r2311 - in trunk/oe/packages/upstart: . files

stefan at sita.openmoko.org stefan at sita.openmoko.org
Wed Jun 20 23:35:05 CEST 2007


Author: stefan
Date: 2007-06-20 23:35:03 +0200 (Wed, 20 Jun 2007)
New Revision: 2311

Added:
   trunk/oe/packages/upstart/files/autoconf_version.patch
   trunk/oe/packages/upstart/oe-sync
   trunk/oe/packages/upstart/upstart.inc
   trunk/oe/packages/upstart/upstart_0.3.8.bb
Removed:
   trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
   trunk/oe/packages/upstart/upstart_0.3.5.bb
Log:
* Update upstart to 0.3.8. Introduces no problems as we don't use it atm and
  brings us in sync with OE.dev


Added: trunk/oe/packages/upstart/files/autoconf_version.patch
===================================================================
--- trunk/oe/packages/upstart/files/autoconf_version.patch	2007-06-20 18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/files/autoconf_version.patch	2007-06-20 21:35:03 UTC (rev 2311)
@@ -0,0 +1,12 @@
+Index: upstart-0.3.8/configure.ac
+===================================================================
+--- upstart-0.3.8.orig/configure.ac	2007-05-09 22:02:14.000000000 +0200
++++ upstart-0.3.8/configure.ac	2007-05-09 22:02:24.000000000 +0200
+@@ -1,6 +1,6 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_PREREQ(2.60)
++AC_PREREQ(2.59)
+ AC_INIT([upstart], [0.3.8], [upstart-devel at lists.ubuntu.com])
+ AC_COPYRIGHT([[Copyright © 2007 Canonical Ltd.]])
+ AC_CONFIG_SRCDIR([init/main.c])

Deleted: trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
===================================================================
--- trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch	2007-06-20 18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch	2007-06-20 21:35:03 UTC (rev 2311)
@@ -1,62 +0,0 @@
-Index: upstart-0.3.5/init/event.h
-===================================================================
---- upstart-0.3.5.orig/init/event.h	2007-02-09 18:28:56.000000000 +0000
-+++ upstart-0.3.5/init/event.h	2007-03-09 01:43:14.000000000 +0000
-@@ -123,6 +123,13 @@
-  **/
- #define KBDREQUEST_EVENT "kbdrequest"
- 
-+/**
-+ * POWEROKFAIL_EVENT:
-+ *
-+ * Name of the event that we generate when the system power failes
-+ **/
-+#define POWEROKFAIL_EVENT "pwrokfail"
-+
- 
- /**
-  * JOB_STARTING_EVENT:
-Index: upstart-0.3.5/init/main.c
-===================================================================
---- upstart-0.3.5.orig/init/main.c	2007-02-09 21:14:55.000000000 +0000
-+++ upstart-0.3.5/init/main.c	2007-03-09 01:44:34.000000000 +0000
-@@ -64,6 +64,7 @@
- static void reset_console   (void);
- static void crash_handler   (int signum);
- static void cad_handler     (void *data, NihSignal *signal);
-+static void pof_handler     (void *data, NihSignal *signal);
- static void kbd_handler     (void *data, NihSignal *signal);
- static void stop_handler    (void *data, NihSignal *signal);
- static void term_handler    (const char *prog, NihSignal *signal);
-@@ -227,6 +228,8 @@
- 	reboot (RB_DISABLE_CAD);
- 	NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
- 
-+	NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pof_handler, NULL));
-+
- 	/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
- 	 * generate a kbdrequest event.
- 	 */
-@@ -396,6 +399,22 @@
- }
- 
- /**
-+ * pof_handler:
-+ * @data: unused,
-+ * @signal: signal that called this handler.
-+ *
-+ * Handle having recieved the SIGPWR signal, sent to us when the kernel
-+ * detects a power failure. We just generate a
-+ * pwrokfail event.
-+ **/
-+static void
-+pof_handler (void      *data,
-+	     NihSignal *signal)
-+{
-+	event_emit (POWEROKFAIL_EVENT, NULL, NULL);
-+}
-+
-+/**
-  * kbd_handler:
-  * @data: unused,
-  * @signal: signal that called this handler.

Added: trunk/oe/packages/upstart/oe-sync
===================================================================

Added: trunk/oe/packages/upstart/upstart.inc
===================================================================
--- trunk/oe/packages/upstart/upstart.inc	2007-06-20 18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/upstart.inc	2007-06-20 21:35:03 UTC (rev 2311)
@@ -0,0 +1,26 @@
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = ""
+DESCRIPTION = "Event driven system init"
+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.*"

Deleted: trunk/oe/packages/upstart/upstart_0.3.5.bb
===================================================================
--- trunk/oe/packages/upstart/upstart_0.3.5.bb	2007-06-20 18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/upstart_0.3.5.bb	2007-06-20 21:35:03 UTC (rev 2311)
@@ -1,51 +0,0 @@
-DESCRIPTION = "Upstart: An event-based replacement for the /sbin/init daemon"
-HOMEPAGE = "http://upstart.ubuntu.com/"
-SECTION = "base"
-LICENSE = "GPL"
-PR = "r2"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
-
-SRC_URI = "http://upstart.ubuntu.com/download/upstart-0.3.5.tar.bz2 \
-	   file://upstart-0.3.5-pwrokfail.patch;patch=1 \
-	  "
-inherit autotools update-alternatives
-
-ALTERNATIVE_NAME = "init"
-ALTERNATIVE_LINK = "${base_sbindir}/init"
-ALTERNATIVE_PATH = "${base_sbindir}/init.upstart"
-ALTERNATIVE_PRIORITY = 60
-
-EXTRA_OECONF = "--enable-compat=sysv --sbindir=${base_sbindir} --libdir=${base_libdir}"
-#EXTRA_OECONF = "--enable-compat=sysv"
-
-do_configure() {
-	gnu-configize
-	oe_runconf
-}
-
-do_install() {
-	oe_runmake 'DESTDIR=${D}' install
-	mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${PN}
-	# initctl
-	mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
-	# runlevel
-	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
-	# telinit
-	mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
-	# poweroff
-	# logd
-}
-
-pkg_postinst_${PN} () {
-	update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
-	update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
-	update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
-}
-
-pkg_prerm_${PN} () {
-	update-alternatives --remove halt halt.${PN}
-	update-alternatives --remove reboot reboot.${PN}
-	update-alternatives --remove shutdown shutdown.${PN}
-}
-

Added: trunk/oe/packages/upstart/upstart_0.3.8.bb
===================================================================
--- trunk/oe/packages/upstart/upstart_0.3.8.bb	2007-06-20 18:27:57 UTC (rev 2310)
+++ trunk/oe/packages/upstart/upstart_0.3.8.bb	2007-06-20 21:35:03 UTC (rev 2311)
@@ -0,0 +1,7 @@
+require upstart.inc
+
+SRC_URI = "http://upstart.ubuntu.com/download/0.3/upstart-${PV}.tar.bz2 \
+file://autoconf_version.patch;patch=1"
+
+PR = "r1"
+





More information about the commitlog mailing list