From patchwork Wed Jan 16 21:51:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1026233 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vAYUn5ck"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43g10Z2pZ4z9sCh for ; Thu, 17 Jan 2019 08:43:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BF2A525935; Wed, 16 Jan 2019 21:43:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mq+5aPeXcDxc; Wed, 16 Jan 2019 21:43:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8D77D25AA6; Wed, 16 Jan 2019 21:43:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BF47B1BF2EF for ; Wed, 16 Jan 2019 21:43:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BC87785F43 for ; Wed, 16 Jan 2019 21:43:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nx_T5xGbxl4i for ; Wed, 16 Jan 2019 21:43:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5169185C4A for ; Wed, 16 Jan 2019 21:43:00 +0000 (UTC) Received: by mail-lj1-f174.google.com with SMTP id l15-v6so6747157lja.9 for ; Wed, 16 Jan 2019 13:43:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9pH8pRFrdl2CzlMya4OPmkjTnxlO2B/vR+Soq4rpMVI=; b=vAYUn5cklQ7RYzbHCBzTlCenMYStnXgA4kieWvDhECL9VV1GzIoPIelvO5v1HuUN7x ypny0Y/dg1BQMu2CrnRWRe2qUM3Nk7CmfYvRpC5AA06DQoD3xXFp9GsQf1pHuGiH77NM HEMPmuxE4b5voeJuebwqkK87jWIgY4EoIhkp82oh97HmoxyppEjQQ0vNWLnh9zWZqfCs aCssm2qEizPctuxOp9kcgYFW2J2NslvBwwbpUFd7MEOTheYowVjoHP5TSU3MyCI7uw7H FSGfx2gE1pIFPdbTH/XNyr2arjT9vrMgzKBbhLRFP1xbxtBeLCRw5wVIXuu/JVDiMLK8 mImQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9pH8pRFrdl2CzlMya4OPmkjTnxlO2B/vR+Soq4rpMVI=; b=SiZkAWXjLG+tc2XTbMTbfRQCzUNqExdm/eUeu3CJQu8hPeLoa65IEHkqesjzHoYdwP n670lKEvJQltbchzwL2JYMBPlGts5tfc35rmKdJSkjgvMLXxRoaI25o0W9PoRP/59fJ+ LTYEvDNpAcX/r7hfREHPKH7xf8XDljJDeDBRFGWZORxxUguuM1BMiSv+MGTEcIznnRJd 80qQLpjLSX9phGUfObD14GCUhZXEaN1KqmZfAcFN6elQgl/Q75PFwduiBNd8yMOscxZB SUyuk7DSeuMjQv3jPGda3W3mXKtJIXkOUotxcnReR/LmwdjBZBO/hXrylaHHaXGH9nte SUPw== X-Gm-Message-State: AJcUukf9XKKwg1riLbORQadIDT43fLZxUROwxgAuX+emt+tzl5VzI2WZ dfNQ2WP+xGTOTHLzNnZ9uIT6C8AG X-Google-Smtp-Source: ALg8bN7puyFFkpXmF43dEaxHQ8gKVXasiLE8rUOk0FGB+OSQu51WuTUwPYkEJc5M5lbQqOTyYkeFBA== X-Received: by 2002:a2e:3603:: with SMTP id d3-v6mr7733488lja.46.1547674978176; Wed, 16 Jan 2019 13:42:58 -0800 (PST) Received: from vkochan-ThinkPad-T470p.lan ([213.109.80.185]) by smtp.gmail.com with ESMTPSA id p67sm1393016lfe.14.2019.01.16.13.42.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 13:42:57 -0800 (PST) From: Vadim Kochan To: buildroot@buildroot.org Date: Wed, 16 Jan 2019 23:51:34 +0200 Message-Id: <20190116215135.32142-3-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20190116215135.32142-1-vadim4j@gmail.com> References: <20190116215135.32142-1-vadim4j@gmail.com> Subject: [Buildroot] [RFC 2/3] package/s6-linux-init: Allow to install as init system X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add BR2_INIT_S6 option which allows to install minimal init support by s6-linux-init-maker into /etc/s6 and link /sbin/init to it. Also 2 additional files /etc/rc.init and /etc/rc.shutdown are generated as dummy "execline'd" scripts which are triggered by /etc/s6/init. Consider generic tty option support and generate getty service if needed by s6-linux-init-maker. Signed-off-by: Vadim Kochan --- package/s6-linux-init/s6-linux-init.mk | 40 ++++++++++++++++++++++++++++++++++ system/Config.in | 9 ++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 913f837c1f..c298d62477 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -33,6 +33,46 @@ define S6_LINUX_INIT_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef +ifeq ($(BR2_INIT_S6),y) + +# Don't let Busybox to install it's own tools like poweroff, reboot, halt, etc +S6_LINUX_INIT_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) + +S6_LINUX_INIT_MAKER_OPTS = -b /usr/bin -c /etc/s6 + +ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) +S6_LINUX_INIT_MAKER_OPTS += -d 0 +else +S6_LINUX_INIT_MAKER_OPTS += $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS),,-d 1) +endif + +ifeq ($(BR2_TARGET_GENERIC_GETTY),y) +S6_LINUX_INIT_MAKER_OPTS += -G "/sbin/getty -L \ + $(SYSTEM_GETTY_OPTIONS) \ + $(SYSTEM_GETTY_PORT) \ + $(SYSTEM_GETTY_BAUDRATE) \ + $(SYSTEM_GETTY_TERM)" +endif + +define S6_LINUX_INIT_INSTALL_INIT + ln -sf ../etc/s6/init $(TARGET_DIR)/sbin/init + + ln -sf /usr/bin/s6-reboot $(TARGET_DIR)/sbin/reboot + ln -sf /usr/bin/s6-poweroff $(TARGET_DIR)/sbin/poweroff + ln -sf /usr/bin/s6-halt $(TARGET_DIR)/sbin/halt + + echo "#! /usr/bin/execlineb -P" > $(@D)/rc.init + $(INSTALL) -m 0755 $(@D)/rc.init $(TARGET_DIR)/etc/rc.init + echo "#! /usr/bin/execlineb -P" > $(@D)/rc.shutdown + $(INSTALL) -m 0755 $(@D)/rc.shutdown $(TARGET_DIR)/etc/rc.shutdown + + rm -rf $(TARGET_DIR)/etc/s6 + $(HOST_DIR)/bin/s6-linux-init-maker $(S6_LINUX_INIT_MAKER_OPTS) $(TARGET_DIR)/etc/s6 +endef +S6_LINUX_INIT_POST_INSTALL_TARGET_HOOKS += S6_LINUX_INIT_INSTALL_INIT + +endif # BR2_INIT_S6 + HOST_S6_LINUX_INIT_DEPENDENCIES = host-s6 HOST_S6_LINUX_INIT_CONF_OPTS = \ diff --git a/system/Config.in b/system/Config.in index 9941807e5d..5bab283931 100644 --- a/system/Config.in +++ b/system/Config.in @@ -12,6 +12,7 @@ config BR2_ROOTFS_SKELETON_DEFAULT select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_SYSV select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD + select BR2_PACKAGE_SKELETON_INIT_COMMON if BR2_INIT_S6 select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE help Use default target skeleton @@ -124,6 +125,10 @@ comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10" !BR2_TOOLCHAIN_HAS_SSP || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 +config BR2_INIT_S6 + bool "s6" + select BR2_PACKAGE_S6_LINUX_INIT + config BR2_INIT_NONE bool "None" help @@ -342,7 +347,7 @@ config BR2_TARGET_GENERIC_GETTY_TERM string "TERM environment variable" default "vt100" # currently observed only by busybox and sysvinit - depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV + depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV || BR2_INIT_S6 help Specify a TERM type. @@ -350,7 +355,7 @@ config BR2_TARGET_GENERIC_GETTY_OPTIONS string "other options to pass to getty" default "" # currently observed only by busybox and sysvinit - depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV + depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV || BR2_INIT_S6 help Any other flags you want to pass to getty, Refer to getty --help for details.