From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Date: Mon, 23 Jun 2014 11:43:59 +0200
Subject: [Buildroot] [Patch v2 1/1] systemd: rework network/tty units
 installation
In-Reply-To: <53A7C0CA.9020406@mind.be>
References: <1403383853-7490-1-git-send-email-eric.le.bihan.dev@free.fr>
 <53A7C0CA.9020406@mind.be>
Message-ID: <20140623094359.GA2439@ned>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Hi!
On Mon, Jun 23, 2014 at 07:53:14AM +0200, Arnout Vandecappelle wrote:
> On 21/06/14 22:50, Eric Le Bihan wrote:
> > The installation of the network.service and serial-getty.service unit
> > files are now performed via the <pkg>_INIT_SYSTEMD mechanism instead of
> > an installation hook.
> >
> > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> > ---
> >  package/systemd/systemd.mk | 34 +++++++++++++++++-----------------
> >  1 file changed, 17 insertions(+), 17 deletions(-)
> >
> > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> > index f3874db..1a606cd 100644
> > --- a/package/systemd/systemd.mk
> > +++ b/package/systemd/systemd.mk
> > @@ -101,6 +101,13 @@ ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
> >  SYSTEMD_CONF_OPT += --enable-networkd
> >  else
> >  SYSTEMD_CONF_OPT += --disable-networkd
> > +define SYSTEMD_INSTALL_SERVICE_NETWORK
> > +	$(INSTALL) -D -m 644 package/systemd/network.service \
> > +		$(TARGET_DIR)/etc/systemd/system/network.service
> > +	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> > +	ln -fs ../network.service \
> > +		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
> > +endef
> >  endif
> >
> >  ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)
> > @@ -131,11 +138,6 @@ define SYSTEMD_INSTALL_INIT_HOOK
> >  	ln -fs ../../../lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target
> >  endef
> >
> > -define SYSTEMD_INSTALL_TTY_HOOK
> > -	rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty at tty1.service
> > -	ln -fs ../../../../lib/systemd/system/serial-getty at .service $(TARGET_DIR)/etc/systemd/system/getty.target.wants/serial-getty@$(BR2_TARGET_GENERIC_GETTY_PORT).service
> > -endef
> > -
> >  define SYSTEMD_INSTALL_MACHINEID_HOOK
> >  	touch $(TARGET_DIR)/etc/machine-id
> >  endef
> > @@ -145,28 +147,26 @@ define SYSTEMD_SANITIZE_PATH_IN_UNITS
> >  		-exec $(SED) 's,$(HOST_DIR),,g' {} \;
> >  endef
> >
> > -define SYSTEMD_INSTALL_NETWORK_HOOK
> > -	$(INSTALL) -D -m 644 package/systemd/network.service \
> > -		$(TARGET_DIR)/etc/systemd/system/network.service
> > -	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> > -	ln -fs ../network.service \
> > -		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
> > -endef
> > -
> >  SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
> >  	SYSTEMD_INSTALL_INIT_HOOK \
> >  	SYSTEMD_INSTALL_TTY_HOOK \
>
>  This line should be removed as well.
Of course! Silly me... Will resend.
>  Otherwise, looks good to me.
Thanks for the review!

Best regards,
ELB