All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jérôme Pouiller" <jezz@sysmic.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] initscripts: new package
Date: Mon, 13 Oct 2014 12:50:24 +0200	[thread overview]
Message-ID: <6226941.eYITS00seb@sagittea> (raw)
In-Reply-To: <1413190990-24136-1-git-send-email-maxime.hadjinlian@gmail.com>

Hello Maxime,

On Monday 13 October 2014 11:03:10 Maxime Hadjinlian wrote:
> 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 <maxime.hadjinlian@gmail.com>
> ---
>  package/busybox/busybox.mk            |  6 ++++
>  package/initscripts/busybox_inittab   | 36 +++++++++++++++++++++++
>  package/initscripts/init.d/S20urandom | 54
> +++++++++++++++++++++++++++++++++++ package/initscripts/init.d/S40network |
> 25 ++++++++++++++++
>  package/initscripts/init.d/rcK        | 27 ++++++++++++++++++
>  package/initscripts/init.d/rcS        | 27 ++++++++++++++++++
>  package/initscripts/initscripts.mk    | 28 ++++++++++++++++++
>  package/initscripts/sysvinit_inittab  | 25 ++++++++++++++++
>  package/sysvinit/inittab              | 25 ----------------
>  package/sysvinit/sysvinit.mk          | 11 +++++--
>  system/skeleton/etc/init.d/S20urandom | 54
> ----------------------------------- system/skeleton/etc/init.d/S40network |
> 25 ----------------
>  system/skeleton/etc/init.d/rcK        | 27 ------------------
>  system/skeleton/etc/init.d/rcS        | 27 ------------------
>  system/skeleton/etc/inittab           | 36 -----------------------
>  15 files changed, 237 insertions(+), 196 deletions(-)
>  create mode 100644 package/initscripts/busybox_inittab
>  create mode 100755 package/initscripts/init.d/S20urandom
>  create mode 100755 package/initscripts/init.d/S40network
>  create mode 100755 package/initscripts/init.d/rcK
>  create mode 100755 package/initscripts/init.d/rcS
>  create mode 100644 package/initscripts/initscripts.mk
>  create mode 100644 package/initscripts/sysvinit_inittab
>  delete mode 100644 package/sysvinit/inittab
>  delete mode 100755 system/skeleton/etc/init.d/S20urandom
>  delete mode 100755 system/skeleton/etc/init.d/S40network
>  delete mode 100755 system/skeleton/etc/init.d/rcK
>  delete mode 100755 system/skeleton/etc/init.d/rcS
>  delete mode 100644 system/skeleton/etc/inittab
Can you sent it using -M option in order to make it more readable?

[...]
> diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
> index d588122..d515882 100644
> --- a/package/sysvinit/sysvinit.mk
> +++ b/package/sysvinit/sysvinit.mk
> @@ -11,9 +11,13 @@ SYSVINIT_SITE =
[...]
>  	done
> +<<<<<<< HEAD
>  	# Override BusyBox's inittab with an inittab compatible with
>  	# sysvinit
>  	$(INSTALL) -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab
> +=======
> +>>>>>>> initscripts: new package
Something goes wrong here :-)


[...]
-- 
J?r?me Pouiller, Sysmic
Embedded Linux specialist
http://www.sysmic.fr

  reply	other threads:[~2014-10-13 10:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-13  9:03 [Buildroot] [PATCH] initscripts: new package Maxime Hadjinlian
2014-10-13 10:50 ` Jérôme Pouiller [this message]
2014-10-13 12:32   ` Maxime Hadjinlian
  -- strict thread matches above, loose matches on Subject: below --
2014-10-13 10:03 Maxime Hadjinlian
2014-10-13 10:21 ` Baruch Siach
2014-10-13 10:23   ` Maxime Hadjinlian
2014-10-13 15:53 Maxime Hadjinlian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6226941.eYITS00seb@sagittea \
    --to=jezz@sysmic.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.