| Message ID | 3516437e82a882bdc06039cc9dbb9cd7b67b14ad.1337947838.git.maxime.ripard@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:
Hi,
Maxime> Since we have now two uncompatible init systems, and we want
Maxime> only one of them at the same time in use in the rootfs, we need
Maxime> to select a particular init system. This patch also adds
Maxime> $(PKG)_INSTALL_INIT_SYSTEMD and $(PKG)_INSTALL_INIT_SYSV hooks
Maxime> that are called when the matching init systems are selected to
Maxime> install properly the init scripts of the package.
Looks good, just a small comment:
Maxime> +++ b/target/generic/Config.in
Maxime> @@ -37,6 +37,34 @@ comment "udev requires a toolchain with LARGEFILE + WCHAR support"
Maxime> endchoice
Maxime> +choice
Maxime> + prompt "Init system"
Maxime> + default BR2_INIT_BUSYBOX
Maxime> + help
Maxime> + To select systemd, you first need to have dbus and udev enabled
That comment seems wrong as you are selecting dbus and DYNAMIC_UDEV
which ends up selecting udev.
Maxime> +
Maxime> +config BR2_INIT_BUSYBOX
Maxime> + bool "Busybox init"
Maxime> + select BR2_PACKAGE_BUSYBOX
Maxime> +
Maxime> +config BR2_INIT_SYSV
Maxime> + bool "Use systemV init"
Maxime> + select BR2_PACKAGE_SYSVINIT
Maxime> +
Maxime> +config BR2_INIT_SYSTEMD
Maxime> + bool "Use systemd"
You added "Use " in front of sysv + systemd, but not busybox - And
"init" after busybox + sysv. I suggest you drop both so it becomes just
busybox/systemv/systemd.
Maxime> + depends on BR2_LARGEFILE
Maxime> + depends on BR2_USE_WCHAR
Maxime> + depends on BR2_INET_IPV6
Maxime> + select BR2_PACKAGE_DBUS
You don't really need to select UDEV as it gets selected by systemd.
Maxime> + select BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
Maxime> + select BR2_PACKAGE_SYSTEMD
Maxime> +
Maxime> +comment 'systemd requires largefile, wchar and IPv6 support'
Maxime> + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_INET_IPV6)
Maxime> +
Maxime> +endchoice
Maxime> +
Maxime> config BR2_ROOTFS_DEVICE_TABLE
Maxime> string "Path to the permission tables"
Maxime> default "target/generic/device_table.txt"
Maxime> --
Maxime> 1.7.9.5
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/package/sysvinit/Config.in b/package/sysvinit/Config.in index 34ec391..d91c643 100644 --- a/package/sysvinit/Config.in +++ b/package/sysvinit/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SYSVINIT bool "sysvinit" + depends on BR2_INIT_SYSV help /sbin/init - parent of all processes diff --git a/target/generic/Config.in b/target/generic/Config.in index 88f0718..40009bd 100644 --- a/target/generic/Config.in +++ b/target/generic/Config.in @@ -37,6 +37,34 @@ comment "udev requires a toolchain with LARGEFILE + WCHAR support" endchoice +choice + prompt "Init system" + default BR2_INIT_BUSYBOX + help + To select systemd, you first need to have dbus and udev enabled + +config BR2_INIT_BUSYBOX + bool "Busybox init" + select BR2_PACKAGE_BUSYBOX + +config BR2_INIT_SYSV + bool "Use systemV init" + select BR2_PACKAGE_SYSVINIT + +config BR2_INIT_SYSTEMD + bool "Use systemd" + depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR + depends on BR2_INET_IPV6 + select BR2_PACKAGE_DBUS + select BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV + 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"
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> --- package/pkg-gentargets.mk | 8 ++++++++ package/sysvinit/Config.in | 1 + target/generic/Config.in | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+)