From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/3] Migrate the packages to the new infra
Date: Tue, 20 Dec 2011 22:29:19 +0100 [thread overview]
Message-ID: <201112202229.19551.arnout@mind.be> (raw)
In-Reply-To: <1322047811-12933-4-git-send-email-maxime.ripard@free-electrons.com>
On Wednesday 23 November 2011 12:30:11 Maxime Ripard wrote:
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
I only did a partial review, so no Reviewed-by tag.
[snip]
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 73c4969..0ff27ca 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -30,11 +30,7 @@ endif
>
> # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
> ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
> -define BUSYBOX_INSTALL_MDEV_SCRIPT
> - [ -f $(TARGET_DIR)/etc/init.d/S10mdev ] || \
> - install -D -m 0755 package/busybox/S10mdev \
> - $(TARGET_DIR)/etc/init.d/S10mdev
> -endef
> +BUSYBOX_INIT_SYSV += package/busybox/S10mdev
This is not actually equivalent: the original makes sure not to overwrite
an existing S10mdev (coming from the skeleton). Perhaps patch 2/3 should
include this test as well.
> define BUSYBOX_INSTALL_MDEV_CONF
> [ -f $(TARGET_DIR)/etc/mdev.conf ] || \
> install -D -m 0644 package/busybox/mdev.conf \
> @@ -139,6 +135,7 @@ define BUSYBOX_SET_INIT
> endef
> endif
>
> +ifeq ($(BR2_INIT_BUSYBOX)$(BR2_INIT_SYSV),y)
> define BUSYBOX_INSTALL_LOGGING_SCRIPT
> if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
> [ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \
> @@ -146,12 +143,15 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT
> $(TARGET_DIR)/etc/init.d/S01logging; \
> else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
> endef
> +else
> +define BUSYBOX_INSTALL_LOGGING_SCRIPT
> +endef
> +endif
This else part is not necessary: an undefined variable evaluates to nothing.
>
> # We do this here to avoid busting a modified .config in configure
> BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
>
> define BUSYBOX_CONFIGURE_CMDS
> - $(BUSYBOX_SET_SYSKLOGD)
> $(BUSYBOX_SET_BB_PWD)
> $(BUSYBOX_SET_LARGEFILE)
> $(BUSYBOX_SET_IPV6)
> @@ -177,7 +177,6 @@ define BUSYBOX_INSTALL_TARGET_CMDS
> $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
> $(TARGET_DIR)/usr/share/udhcpc/default.script; \
> fi
> - $(BUSYBOX_INSTALL_MDEV_SCRIPT)
> $(BUSYBOX_INSTALL_MDEV_CONF)
> $(BUSYBOX_INSTALL_LOGGING_SCRIPT)
> endef
[snip]
By the way, doesn't systemd support sysv-style init scripts as well?
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
next prev parent reply other threads:[~2011-12-20 21:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 11:30 [Buildroot] [RFC] Add systemd to buildroot Maxime Ripard
2011-11-23 11:30 ` [Buildroot] [PATCH 1/3] Add the systemd package Maxime Ripard
2011-11-23 11:57 ` Baruch Siach
2011-11-23 13:53 ` Maxime Ripard
2011-12-20 7:05 ` Arnout Vandecappelle
2012-01-02 9:35 ` Maxime Ripard
2011-11-23 11:30 ` [Buildroot] [PATCH 2/3] Rework of the init system Maxime Ripard
2011-12-20 8:03 ` Arnout Vandecappelle
2012-01-02 9:52 ` Maxime Ripard
2012-01-02 14:52 ` Thomas Petazzoni
2012-01-06 7:13 ` Arnout Vandecappelle
2012-01-06 9:15 ` Maxime Ripard
2012-01-09 6:37 ` Arnout Vandecappelle
2011-11-23 11:30 ` [Buildroot] [PATCH 3/3] Migrate the packages to the new infra Maxime Ripard
2011-12-20 21:29 ` Arnout Vandecappelle [this message]
2012-01-02 10:02 ` Maxime Ripard
2012-01-06 6:52 ` Arnout Vandecappelle
2011-11-23 14:05 ` [Buildroot] [RFC] Add systemd to buildroot Maxime Ripard
2011-11-23 21:14 ` Belisko Marek
2011-11-23 21:35 ` Maxime Ripard
2011-12-20 21:14 ` Arnout Vandecappelle
2011-12-14 10:43 ` Maxime Ripard
2011-12-20 6:49 ` Arnout Vandecappelle
2012-01-02 9:58 ` Maxime Ripard
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=201112202229.19551.arnout@mind.be \
--to=arnout@mind.be \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox