diff options
| author | Tim Sander <tim01@vlsi.informatik.tu-darmstadt.de> | 2010-06-01 00:33:06 +0200 |
|---|---|---|
| committer | Tim Sander <tim01@vlsi.informatik.tu-darmstadt.de> | 2010-06-01 20:58:01 +0200 |
| commit | abc5694ecd2a945160b452596a49f58f5011cd71 (patch) | |
| tree | f3e7fbc613767a1a85296f7d99974bca718459cb /rules/upstart.make | |
| parent | 14bd09b5fce4f423bb2aefbf57554a5d18c41d51 (diff) | |
| download | ptxdist-abc5694ecd2a945160b452596a49f58f5011cd71.tar.gz ptxdist-abc5694ecd2a945160b452596a49f58f5011cd71.tar.xz | |
upstart: v6.6, unbreak, add new generic init files
Diffstat (limited to 'rules/upstart.make')
| -rw-r--r-- | rules/upstart.make | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/rules/upstart.make b/rules/upstart.make index 38d2badd8..c588ba743 100644 --- a/rules/upstart.make +++ b/rules/upstart.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de> +# 2010 by Tim Sander <tim.sander@hbm.com> # # See CREDITS for details about who has contributed to this project. # @@ -16,10 +17,10 @@ PACKAGES-$(PTXCONF_UPSTART) += upstart # # Paths and names # -UPSTART_VERSION := 0.5.1 +UPSTART_VERSION := 0.6.6 UPSTART := upstart-$(UPSTART_VERSION) -UPSTART_SUFFIX := tar.bz2 -UPSTART_URL := http://upstart.ubuntu.com/download/0.5/$(UPSTART).$(UPSTART_SUFFIX) +UPSTART_SUFFIX := tar.gz +UPSTART_URL := http://upstart.ubuntu.com/download/0.6/$(UPSTART).$(UPSTART_SUFFIX) UPSTART_SOURCE := $(SRCDIR)/$(UPSTART).$(UPSTART_SUFFIX) UPSTART_DIR := $(BUILDDIR)/$(UPSTART) @@ -41,8 +42,10 @@ UPSTART_ENV := $(CROSS_ENV) # # autoconf # + UPSTART_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ + --disable-compiler-coverage \ --disable-nls \ --enable-threads=posix \ --disable-rpath \ @@ -51,7 +54,6 @@ UPSTART_AUTOCONF := \ --enable-threading \ --enable-compiler-warnings \ --enable-compiler-optimisations \ - --disable-compiler-coverage \ --enable-linker-optimisations \ --with-gnu-ld \ --without-libpth-prefix \ @@ -76,22 +78,36 @@ $(STATEDIR)/upstart.targetinstall: @$(call install_fixup, upstart,DESCRIPTION,missing) @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/init) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/halt) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/shutdown) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/stop) + @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/initctl) + @$(call install_link, upstart, initctl, /usr/sbin/reload) + @$(call install_link, upstart, initctl, /usr/sbin/restart) + @$(call install_link, upstart, initctl, /usr/sbin/start) + @$(call install_link, upstart, initctl, /usr/sbin/stop) + @$(call install_link, upstart, initctl, /usr/sbin/status) @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/reboot) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/poweroff) + @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/shutdown) + @$(call install_link, upstart, reboot, /usr/sbin/halt) + @$(call install_link, upstart, reboot, /usr/sbin/poweroff) @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/runlevel) @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/telinit) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/start) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/status) - @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/initctl) @$(call install_copy, upstart, 0, 0, 0755, /etc/init.d/conf.d) @$(call install_copy, upstart, 0, 0, 0755, /etc/init.d/jobs.d) @$(call install_copy, upstart, 0, 0, 0644, -, /etc/dbus-1/system.d/Upstart.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/rcS.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/rc.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/mount.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/networking.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/network-interface.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/hostname.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/ttyS.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/syslogd.conf) + + @$(call install_alternative, upstart, 0, 0, 0755, /etc/network/interfaces) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/init/loadmodules.conf) + @$(call install_alternative, upstart, 0, 0, 0644, /etc/modules) @$(call install_finish, upstart) @$(call touch) |