* [Buildroot] [PATCH 1/2] Rework of the init system
2012-06-18 8:50 [Buildroot] [pull request v3] Pull request for branch for-2012.08/systemd Maxime Ripard
@ 2012-06-18 8:50 ` Maxime Ripard
2012-06-18 8:50 ` [Buildroot] [PATCH 2/2] Add systemd unit for lighttpd Maxime Ripard
2012-07-06 7:30 ` [Buildroot] [pull request v3] Pull request for branch for-2012.08/systemd Maxime Ripard
2 siblings, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2012-06-18 8:50 UTC (permalink / raw)
To: buildroot
Since we have now two uncompatible init systems, and we want only one of
them at the same time in use in the rootfs, we need to select a
particular init system. This patch also adds $(PKG)_INSTALL_INIT_SYSTEMD
and $(PKG)_INSTALL_INIT_SYSV hooks that are called when the matching
init systems are selected to install properly the init scripts of the
package.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/busybox/busybox.mk | 7 +++++++
package/pkg-gentargets.mk | 8 ++++++++
target/generic/Config.in | 25 +++++++++++++++++++++++++
3 files changed, 40 insertions(+)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 1d988f8..95bad5e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -134,6 +134,12 @@ define BUSYBOX_DISABLE_MMU_APPLETS
endef
endif
+ifeq ($(BR2_INIT_BUSYBOX),y)
+define BUSYBOX_SET_INIT
+ $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
+endef
+endif
+
define BUSYBOX_INSTALL_LOGGING_SCRIPT
if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
[ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \
@@ -168,6 +174,7 @@ define BUSYBOX_CONFIGURE_CMDS
$(BUSYBOX_NETKITTELNET)
$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
$(BUSYBOX_DISABLE_MMU_APPLETS)
+ $(BUSYBOX_SET_INIT)
$(BUSYBOX_SET_WATCHDOG)
@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
-C $(@D) oldconfig
diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk
index 1c9b458..645f53b 100644
--- a/package/pkg-gentargets.mk
+++ b/package/pkg-gentargets.mk
@@ -133,6 +133,10 @@ $(BUILD_DIR)/%/.stamp_images_installed:
# Install to target dir
$(BUILD_DIR)/%/.stamp_target_installed:
@$(call MESSAGE,"Installing to target")
+ $(if $(BR2_INIT_SYSTEMD),\
+ $($(PKG)_INSTALL_INIT_SYSTEMD))
+ $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
+ $($(PKG)_INSTALL_INIT_SYSV))
$($(PKG)_INSTALL_TARGET_CMDS)
$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
$(Q)touch $@
@@ -151,6 +155,10 @@ $(BUILD_DIR)/%/.stamp_uninstalled:
rm -f $($(PKG)_TARGET_INSTALL_TARGET)
$($(PKG)_UNINSTALL_STAGING_CMDS)
$($(PKG)_UNINSTALL_TARGET_CMDS)
+ $(if $(BR2_INIT_SYSTEMD),\
+ $($(PKG)_UNINSTALL_INIT_SYSTEMD))
+ $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
+ $($(PKG)_UNINSTALL_INIT_SYSV))
# Remove package sources
$(BUILD_DIR)/%/.stamp_dircleaned:
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 88f0718..309ef55 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -37,6 +37,31 @@ comment "udev requires a toolchain with LARGEFILE + WCHAR support"
endchoice
+choice
+ prompt "Init system"
+ default BR2_INIT_BUSYBOX
+
+config BR2_INIT_BUSYBOX
+ bool "Busybox"
+ select BR2_PACKAGE_BUSYBOX
+
+config BR2_INIT_SYSV
+ bool "systemV"
+ select BR2_PACKAGE_SYSVINIT
+
+config BR2_INIT_SYSTEMD
+ bool "systemd"
+ depends on BR2_LARGEFILE
+ depends on BR2_USE_WCHAR
+ depends on BR2_INET_IPV6
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_SYSTEMD
+
+comment 'systemd requires largefile, wchar and IPv6 support'
+ depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_INET_IPV6)
+
+endchoice
+
config BR2_ROOTFS_DEVICE_TABLE
string "Path to the permission tables"
default "target/generic/device_table.txt"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [pull request v3] Pull request for branch for-2012.08/systemd
2012-06-18 8:50 [Buildroot] [pull request v3] Pull request for branch for-2012.08/systemd Maxime Ripard
2012-06-18 8:50 ` [Buildroot] [PATCH 1/2] Rework of the init system Maxime Ripard
2012-06-18 8:50 ` [Buildroot] [PATCH 2/2] Add systemd unit for lighttpd Maxime Ripard
@ 2012-07-06 7:30 ` Maxime Ripard
2 siblings, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2012-07-06 7:30 UTC (permalink / raw)
To: buildroot
Hi Peter,
Do you intend at some point to take these patches ?
You *never* replied to any of these two patches, even though they both
have been floating around for more than half a year now, and this is
beginning to be quite frustrating.
Don't get me wrong, I'm not pushing them, I just want you to at least
acknowledge the existence of these patches and say if you are willing to
accept them or not.
Thanks,
Maxime
Le 18/06/2012 10:50, Maxime Ripard a ?crit :
> The following changes since commit 929c3e89a6715ecfdc8055ec82025cee5e8e23a1:
>
> libfreefare: add missing openssl dependency (2012-06-17 12:19:02 +0200)
>
> are available in the git repository at:
>
> http://git.free-electrons.com/users/maxime-ripard/buildroot for-2012.08/systemd
>
> for you to fetch changes up to 04cbd51ebed54c86ccf8fc03a3fc2eed1383893b:
>
> Add systemd unit for lighttpd (2012-06-18 10:40:29 +0200)
>
> ----------------------------------------------------------------
> Maxime Ripard (2):
> Rework of the init system
> Add systemd unit for lighttpd
>
> package/busybox/busybox.mk | 7 +++++++
> package/lighttpd/lighttpd.mk | 11 +++++++++++
> package/lighttpd/lighttpd.service | 10 ++++++++++
> package/pkg-gentargets.mk | 8 ++++++++
> target/generic/Config.in | 25 +++++++++++++++++++++++++
> 5 files changed, 61 insertions(+)
> create mode 100644 package/lighttpd/lighttpd.service
>
> Thanks,
>
--
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread