| Message ID | 1417357142-14307-74-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thomas, All, On 2014-11-30 15:19 +0100, Thomas Petazzoni spake thusly: > As discussed, users should use a rootfs overlay or a post-build script > instead of a custom skeleton to override files installed by Buildroot, > so there is no point in having conditions when installing init scripts > or configuration files. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> But see a comment below... > --- > package/mpd/mpd.mk | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk > index 1eedcbc..ba3bd59 100644 > --- a/package/mpd/mpd.mk > +++ b/package/mpd/mpd.mk > @@ -228,10 +228,7 @@ MPD_CONF_OPTS += --disable-wavpack > endif > > define MPD_INSTALL_EXTRA_FILES > - @if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \ > - $(INSTALL) -D package/mpd/mpd.conf \ > - $(TARGET_DIR)/etc/mpd.conf; \ > - fi > + $(INSTALL) -D package/mpd/mpd.conf $(TARGET_DIR)/etc/mpd.conf Maybe nice to make the access rights explicit with -m 0644, no? Regards, Yann E. MORIN. > endef > > MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES > -- > 2.1.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > As discussed, users should use a rootfs overlay or a post-build script > instead of a custom skeleton to override files installed by Buildroot, > so there is no point in having conditions when installing init scripts > or configuration files. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed with -m 0644 as noted by Yann, thanks.
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 1eedcbc..ba3bd59 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -228,10 +228,7 @@ MPD_CONF_OPTS += --disable-wavpack endif define MPD_INSTALL_EXTRA_FILES - @if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \ - $(INSTALL) -D package/mpd/mpd.conf \ - $(TARGET_DIR)/etc/mpd.conf; \ - fi + $(INSTALL) -D package/mpd/mpd.conf $(TARGET_DIR)/etc/mpd.conf endef MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
As discussed, users should use a rootfs overlay or a post-build script instead of a custom skeleton to override files installed by Buildroot, so there is no point in having conditions when installing init scripts or configuration files. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/mpd/mpd.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)