From patchwork Sat Oct 18 14:47:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 400682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 9820514009E for ; Sun, 19 Oct 2014 01:47:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AA52CA1B96; Sat, 18 Oct 2014 14:47:15 +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 Z0P5wcAUaMNl; Sat, 18 Oct 2014 14:47:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 79657A1C2E; Sat, 18 Oct 2014 14:47:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 143601BF9A7 for ; Sat, 18 Oct 2014 14:47:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 10C2232E44 for ; Sat, 18 Oct 2014 14:47:12 +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 MGSVuPu3XoZq for ; Sat, 18 Oct 2014 14:47:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by silver.osuosl.org (Postfix) with ESMTPS id 9B02931B45 for ; Sat, 18 Oct 2014 14:47:10 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id fb4so3237503wid.16 for ; Sat, 18 Oct 2014 07:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dj4rEvfDP2s+DFef2X9Z9Is1peijb2SvjPZIcArHPwM=; b=VRQjn8ZBLIJzffctEILlbpA69ndFVn21X/0zAbrMxjTvWznl+wavzo3ea7SZigP73A cDGlOiyUzPos4nZ+pdzNFMezf5rhXedI+K/rP+MJjDbzDl6y0m5Rh/beepjIQpEbT5xb v6saqjiZVODY1lwO7a3Q+uoQxucLo3E073etjBWMVGyGJt3J0QYv5tN6bSJBnTZbnj4n 8wbVrtDRGKZqumKf0Xd0sMF1sG2upIktW0FLZQ2i3jKPHiXbSP65jNUTXJSlZy92yb6D AhJDaHEKenCECcyQfk8pf+bfZNoGJ7MienL6XqZsgO1c//hPjCFXd7ln4TeH5GvcS+L2 HcjA== X-Received: by 10.180.198.234 with SMTP id jf10mr6406096wic.68.1413643629093; Sat, 18 Oct 2014 07:47:09 -0700 (PDT) Received: from localhost.localdomain (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPSA id cw6sm5427861wjb.18.2014.10.18.07.47.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Oct 2014 07:47:08 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sat, 18 Oct 2014 16:47:00 +0200 Message-Id: <1413643624-14757-2-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1413643624-14757-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1413643624-14757-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 1/5] initscripts: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The folder init.d is currently installed by default since it's part of our skeleton. This patch creates a package out of it and make busybox/sysvinit depends on it. This way, if you chose another init, you don't end up with a useless init.d folder. Signed-off-by: Maxime Hadjinlian --- v3 -> v4: - Fix bug with busybox v2 -> v3: - Fix rebase issues v1 -> v2: - Redo the patch using git format-patch -M --- package/busybox/busybox.mk | 4 ++++ .../inittab => package/initscripts/busybox_inittab | 0 .../etc => package/initscripts}/init.d/S20urandom | 0 .../etc => package/initscripts}/init.d/S40network | 0 .../etc => package/initscripts}/init.d/rcK | 0 .../etc => package/initscripts}/init.d/rcS | 0 package/initscripts/initscripts.mk | 28 ++++++++++++++++++++++ .../inittab => initscripts/sysvinit_inittab} | 0 package/sysvinit/sysvinit.mk | 11 +++++---- 9 files changed, 38 insertions(+), 5 deletions(-) rename system/skeleton/etc/inittab => package/initscripts/busybox_inittab (100%) rename {system/skeleton/etc => package/initscripts}/init.d/S20urandom (100%) rename {system/skeleton/etc => package/initscripts}/init.d/S40network (100%) rename {system/skeleton/etc => package/initscripts}/init.d/rcK (100%) rename {system/skeleton/etc => package/initscripts}/init.d/rcS (100%) create mode 100644 package/initscripts/initscripts.mk rename package/{sysvinit/inittab => initscripts/sysvinit_inittab} (100%) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 73a99fb..422a95d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -16,6 +16,10 @@ BUSYBOX_CFLAGS = \ BUSYBOX_LDFLAGS = \ $(TARGET_LDFLAGS) +# initscripts contains/install only inittab and the init.d folder with base +# scripts. +BUSYBOX_DEPENDENCIES = initscripts + # Link against libtirpc if available so that we can leverage its RPC # support for NFS mounting with BusyBox ifeq ($(BR2_PACKAGE_LIBTIRPC),y) diff --git a/system/skeleton/etc/inittab b/package/initscripts/busybox_inittab similarity index 100% rename from system/skeleton/etc/inittab rename to package/initscripts/busybox_inittab diff --git a/system/skeleton/etc/init.d/S20urandom b/package/initscripts/init.d/S20urandom similarity index 100% rename from system/skeleton/etc/init.d/S20urandom rename to package/initscripts/init.d/S20urandom diff --git a/system/skeleton/etc/init.d/S40network b/package/initscripts/init.d/S40network similarity index 100% rename from system/skeleton/etc/init.d/S40network rename to package/initscripts/init.d/S40network diff --git a/system/skeleton/etc/init.d/rcK b/package/initscripts/init.d/rcK similarity index 100% rename from system/skeleton/etc/init.d/rcK rename to package/initscripts/init.d/rcK diff --git a/system/skeleton/etc/init.d/rcS b/package/initscripts/init.d/rcS similarity index 100% rename from system/skeleton/etc/init.d/rcS rename to package/initscripts/init.d/rcS diff --git a/package/initscripts/initscripts.mk b/package/initscripts/initscripts.mk new file mode 100644 index 0000000..13affe8 --- /dev/null +++ b/package/initscripts/initscripts.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# initscripts +# +################################################################################ + +# source included in buildroot +INITSCRIPTS_SOURCE = + +# Note: We need to override Busybox's inittab with an inittab compatible with +# sysvinit if we want SYSVINIT as our init. +ifeq ($(BR2_PACKAGE_SYSVINIT),y) +define INITSCRIPTS_INSTALL_INITTAB + $(INSTALL) -D -m 0644 package/initscripts/sysvinit_inittab $(TARGET_DIR)/etc/inittab +endef +else +define INITSCRIPTS_INSTALL_INITTAB + $(INSTALL) -D -m 0644 package/initscripts/busybox_inittab $(TARGET_DIR)/etc/inittab +endef +endif + +define INITSCRIPTS_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/etc/init.d + $(INSTALL) -D -m 0755 package/initscripts/init.d/* $(TARGET_DIR)/etc/init.d/ + $(INITSCRIPTS_INSTALL_INITTAB) +endef + +$(eval $(generic-package)) diff --git a/package/sysvinit/inittab b/package/initscripts/sysvinit_inittab similarity index 100% rename from package/sysvinit/inittab rename to package/initscripts/sysvinit_inittab diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index d588122..6793ab8 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -11,9 +11,13 @@ SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit SYSVINIT_LICENSE = GPLv2+ SYSVINIT_LICENSE_FILES = COPYING -# Override BusyBox implementations if BusyBox is enabled. +# initscripts contains/install only inittab and the init.d folder with base +# scripts. +SYSVINIT_DEPENDENCIES = initscripts + +# Override Busybox implementations if Busybox is enabled. ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSVINIT_DEPENDENCIES = busybox +SYSVINIT_DEPENDENCIES += busybox endif define SYSVINIT_DEBIAN_PATCHES @@ -34,9 +38,6 @@ define SYSVINIT_INSTALL_TARGET_CMDS for x in halt init shutdown killall5; do \ $(INSTALL) -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \ done - # Override BusyBox's inittab with an inittab compatible with - # sysvinit - $(INSTALL) -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff ln -sf killall5 $(TARGET_DIR)/sbin/pidof