diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-10-09 11:07:55 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-10-09 11:07:55 +0200 |
| commit | 2bb54e72c16f97cc3ab0a07ea026f9dfcdc241d0 (patch) | |
| tree | 0ba86f928c45f986dafe9c658e7a79b95328e6cf /packages | |
| parent | b67ec86cc0e66d56668061493d947d13484b02e7 (diff) | |
| download | embtoolkit-2bb54e72c16f97cc3ab0a07ea026f9dfcdc241d0.tar.gz embtoolkit-2bb54e72c16f97cc3ab0a07ea026f9dfcdc241d0.tar.bz2 embtoolkit-2bb54e72c16f97cc3ab0a07ea026f9dfcdc241d0.tar.xz | |
Packages: upstart: fix upstart integration and document it more
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/system/upstart/upstart.kconfig | 6 | ||||
| -rw-r--r-- | packages/system/upstart/upstart.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/system/upstart/upstart.kconfig b/packages/system/upstart/upstart.kconfig index 4eb47fd..581b63e 100644 --- a/packages/system/upstart/upstart.kconfig +++ b/packages/system/upstart/upstart.kconfig @@ -24,7 +24,7 @@ ################################################################################ config EMBTK_HAVE_UPSTART - bool "Have upstart" + bool "Have upstart (please see the note aboput busybox)" select KEMBTK_EGLIBC_OPTION_EGLIBC_UTMPX if EMBTK_CLIB_EGLIBC select KEMBTK_UCLIBC_UCLIBC_HAS_UTMPX if EMBTK_CLIB_UCLIBC select EMBTK_HAVE_LIBNIH @@ -48,6 +48,10 @@ config EMBTK_HAVE_UPSTART their parent process * Communication with the init daemon over D-Bus + NOTE: WARNING!!! + If you use busybox beside upstart, you need to disable busybox + init facilities. + choice prompt "upstart version you wish" depends on EMBTK_HAVE_UPSTART diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk index e98a51d..3686060 100644 --- a/packages/system/upstart/upstart.mk +++ b/packages/system/upstart/upstart.mk @@ -39,9 +39,6 @@ UPSTART_PKGCONFIGS = UPSTART_DEPS := libnih_install upstart_install: $(UPSTART_BUILD_DIR)/.installed - @test -e $(UPSTART_BUILD_DIR)/.installed || \ - $(MAKE) $(UPSTART_BUILD_DIR)/.installed - $(MAKE) $(UPSTART_BUILD_DIR)/.special $(UPSTART_BUILD_DIR)/.installed: $(UPSTART_DEPS) download_upstart \ $(UPSTART_BUILD_DIR)/.decompressed $(UPSTART_BUILD_DIR)/.configured @@ -49,9 +46,8 @@ $(UPSTART_BUILD_DIR)/.installed: $(UPSTART_DEPS) download_upstart \ upstart-$(UPSTART_VERSION) in your root filesystem...") $(call EMBTK_KILL_LT_RPATH,$(UPSTART_BUILD_DIR)) $(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt + $(Q)$(MAKE) -C $(UPSTART_BUILD_DIR) DESTDIR=$(ROOTFS)/ install + $(Q)-rm -rf $(ROOTFS)/share @touch $@ download_upstart: |