Skip to contentSkip to conversation

Misc trivial improvements

PATCH Superseded Thomas Petazzoni 3 participants 78 messages Nov 27, 2014 – Nov 28, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

v2 cover Misc trivial improvements

This series does miscellaneous improvements to packages, mainly:

* Convert the remaining init script installation logic to <pkg>_INSTALL_INIT_SYSV.

* Do not install or remove man pages in packages, since we don't care about documentation in the target.

* Fixup a number of "for" loops to properly bail out if one iteration of the loop fails instead of silently ignoring the error. Not all for loops have been inspected yet, so it's only a partial work.

* Install init scripts and configuration files unconditionally, even though the skeleton has installed its own version of the file. People are encouraged to use the rootfs overlay or the post-build script mechanisms.

* Misc other small stuff.

Changes since v1:

* Rebase on top of the next branch.
* Add more patches to remove the conditional installations.

Thanks,

Thomas

Thomas Petazzoni (74):
vsftpd: use <pkg>_INSTALL_INIT_SYSV and rename init script
vsftpd: don't install manpages
vsftpd: rename patches to the new naming convention
radvd: use <pkg>_INSTALL_INIT_SYSV
thttpd: use the <pkg>_INSTALL_INIT_SYSV mechanism
busybox: use <pkg>_INSTALL_INIT_SYSV mechanism
portmap: use <pkg>_INSTALL_INIT_SYSV mechanism
portmap: don't install manpages
portmap: improve installation of binaries
stunnel: use the <pkg>_INSTALL_INIT_SYSV mechanism
gdk-pixbuf: use <pkg>_INSTALL_INIT_SYSV mechanism
proftpd: use <pkg>_INSTALL_INIT_SYSV mechanism
samba: use <pkg>_INSTALL_INIT_SYSV mechanism
input-event-daemon: use <pkg>_INSTALL_INIT_SYSV mechanism
ifplugd: use <pkg>_INSTALL_INIT_SYSV mechanism
nfs-utils: use <pkg>_INSTALL_INIT_SYSV mechanism
netatalk: use <pkg>_INSTALL_INIT_SYSV mechanism
mongoose: use <pkg>_INSTALL_INIT_SYSV mechanism
gpsd: use <pkg>_INSTALL_INIT_SYSV mechanism
olsr: use <pkg>_INSTALL_INIT_SYSV mechanism
pango: use <pkg>_INSTALL_INIT_SYSV mechanism
xapp_xdm: use <pkg>_INSTALL_INIT_SYSV mechanism
tftpd: use <pkg>_INSTALL_INIT_SYSV mechanism
openvpn: use <pkg>_INSTALL_INIT_SYSV mechanism
tinyhttpd: use <pkg>_INSTALL_INIT_SYSV mechanism
at: use <pkg>_INSTALL_INIT_SYSV mechanism
mpd: use <pkg>_INSTALL_INIT_SYSV mechanism
snowball-init: use <pkg>_INSTALL_INIT_SYSV mechanism
wipe: don't install man pages
ndisc6: remove man page related code
tree: don't install man page
iostat: don't install man page
iostat: remove legacy code
pptp-linux: don't install man page
gnupg: don't both removing a man page
rp-pppoe: don't install man pages
rp-pppoe: bail out of installation fails
alsa-utils: add error handling to for loop
coreutils: add error handling to for loop
ebtables: add error handling to for loop
flot: add error handling to for loop
googlefontdirectory: add error handling to for loop
gptfdisk: add error handling to for loop
irda-utils: add error handling to for loop
jimtcl: add error handling to for loop
live555: add error handling to for loop
lockfile-progs: add error handling to for loop
qt5base: add error handling to for loop
qtuio: add error handling to for loop
sound-theme-borealis: add error handling to for loop
xenomai: add error handling to for loop
aiccu: install init script and config file unconditionally
busybox: install init script and config file unconditionally
busybox: install init script unconditionally
iucode-tool: install init script unconditionally
lighttpd: install init script and config file unconditionally
rpcbind: install init script unconditionally
rsyslog: install init script and config file unconditionally
transmission: install init script unconditionally
stunnel: install configuration file unconditionally
input-event-daemon: install configuration file unconditionally
fluxbox: install session file unconditionally
proftpd: install configuration file unconditionally
samba: install configuration file unconditionally
logrotate: install configuration file unconditionally
nss-mdns: install configuration file unconditionally
ifplugd: install configuration files unconditionally
sysklogd: install configuration file unconditionally
screen: install configuration file unconditionally
usbmount: install configuration file unconditionally
php: install configuration file unconditionally
inadyn: install configuration file unconditionally
mpd: install configuration file unconditionally
toolchain: install nssswitch.conf configuration file unconditionally

 package/aiccu/aiccu.mk                             |  6 +--
 package/alsa-utils/alsa-utils.mk                   |  2 +-
 package/at/at.mk                                   |  4 +-
 package/busybox/busybox.mk                         | 35 ++++++++--------
 package/coreutils/coreutils.mk                     |  2 +-
 package/dmraid/dmraid.mk                           |  5 +--
 package/ebtables/ebtables.mk                       |  2 +-
 package/flot/flot.mk                               |  2 +-
 package/fluxbox/fluxbox.mk                         |  4 +-
 package/gdk-pixbuf/gdk-pixbuf.mk                   |  4 +-
 package/gnupg/gnupg.mk                             |  3 +-
 package/googlefontdirectory/googlefontdirectory.mk |  2 +-
 package/gpsd/gpsd.mk                               |  9 +++--
 package/gptfdisk/gptfdisk.mk                       |  2 +-
 package/ifplugd/ifplugd.mk                         | 19 +++++----
 package/inadyn/inadyn.mk                           |  6 +--
 package/input-event-daemon/input-event-daemon.mk   | 13 +++---
 package/iostat/iostat.mk                           |  4 --
 package/irda-utils/irda-utils.mk                   |  2 +-
 package/iucode-tool/iucode-tool.mk                 |  5 +--
 package/jimtcl/jimtcl.mk                           |  2 +-
 package/lighttpd/lighttpd.mk                       | 46 ++++++++--------------
 package/live555/live555.mk                         |  2 +-
 package/lockfile-progs/lockfile-progs.mk           |  2 +-
 package/logrotate/logrotate.mk                     |  4 +-
 package/mongoose/mongoose.mk                       |  3 ++
 package/mpd/mpd.mk                                 | 12 +++---
 package/ndisc6/ndisc6.mk                           |  7 +---
 package/netatalk/netatalk.mk                       |  9 ++---
 package/nfs-utils/nfs-utils.mk                     |  9 +++--
 package/nss-mdns/nss-mdns.mk                       |  4 +-
 package/olsr/olsr.mk                               |  5 ++-
 package/openvpn/openvpn.mk                         |  3 ++
 package/pango/pango.mk                             |  4 +-
 package/php/php.mk                                 |  6 +--
 package/portmap/portmap.mk                         | 14 +++----
 package/pptp-linux/pptp-linux.mk                   |  1 -
 package/proftpd/proftpd.mk                         | 11 +++---
 package/qt5/qt5base/qt5base.mk                     |  2 +-
 package/qtuio/qtuio.mk                             |  6 +--
 package/radvd/radvd.mk                             |  6 +--
 package/rp-pppoe/rp-pppoe.mk                       |  5 +--
 package/rpcbind/rpcbind.mk                         |  5 +--
 package/rsyslog/rsyslog.mk                         | 14 +++----
 package/samba/samba.mk                             | 17 ++++----
 package/screen/screen.mk                           |  4 +-
 package/snowball-init/snowball-init.mk             |  2 +-
 .../sound-theme-borealis/sound-theme-borealis.mk   |  2 +-
 package/stunnel/stunnel.mk                         | 14 ++++---
 package/sysklogd/sysklogd.mk                       |  6 +--
 package/tftpd/tftpd.mk                             |  5 ++-
 package/thttpd/thttpd.mk                           |  7 +++-
 package/tinyhttpd/tinyhttpd.mk                     |  5 ++-
 package/transmission/transmission.mk               |  5 +--
 package/tree/tree.mk                               |  2 -
 package/usbmount/usbmount.mk                       |  4 +-
 ...px-builddef.patch => 0001-utmpx-builddef.patch} |  0
 ...efile.patch => 0002-dont-force-largefile.patch} |  0
 package/vsftpd/{vsftpd-init => S70vsftpd}          |  0
 package/vsftpd/vsftpd.mk                           | 11 ++----
 package/wipe/wipe.mk                               |  1 -
 package/x11r7/xapp_xdm/xapp_xdm.mk                 |  4 +-
 package/xenomai/xenomai.mk                         |  2 +-
 toolchain/toolchain.mk                             |  6 +--
 64 files changed, 177 insertions(+), 233 deletions(-)
 rename package/vsftpd/{vsftpd-0001-utmpx-builddef.patch => 0001-utmpx-builddef.patch} (100%)
 rename package/vsftpd/{vsftpd-dont-force-largefile.patch => 0002-dont-force-largefile.patch} (100%)
 rename package/vsftpd/{vsftpd-init => S70vsftpd} (100%)
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH v2 1/74 vsftpd: use <pkg>_INSTALL_INIT_SYSV and rename init script

This commit changes the vsftpd package to use the <pkg>_INSTALL_INIT_SYSV mechanism to install its init script, and renames the init script in the Buildroot source tree to match how it's named on the target.

Also, the init script is now installed unconditionally, as is done in most packages.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/vsftpd/{vsftpd-init => S70vsftpd} | 0
 package/vsftpd/vsftpd.mk                  | 7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename package/vsftpd/{vsftpd-init => S70vsftpd} (100%)
package/vsftpd/S70vsftpd renamed from package/vsftpd/vsftpd-init +0 -0
similarity index 100%
rename from package/vsftpd/vsftpd-init
rename to package/vsftpd/S70vsftpd
package/vsftpd/vsftpd.mk +4 -3
index cab5afb..1c468ed 100644
@@ -43,15 +43,16 @@ define VSFTPD_BUILD_CMDS
 		LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D)
 endef
 
+define VSFTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd
+endef
+
 define VSFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd
 	$(INSTALL) -D -m 644 $(@D)/vsftpd.8 \
 		$(TARGET_DIR)/usr/share/man/man8/vsftpd.8
 	$(INSTALL) -D -m 644 $(@D)/vsftpd.conf.5 \
 		$(TARGET_DIR)/usr/share/man/man5/vsftpd.conf.5
-	test -f $(TARGET_DIR)/etc/init.d/S70vsftpd || \
-		$(INSTALL) -D -m 755 package/vsftpd/vsftpd-init \
-			$(TARGET_DIR)/etc/init.d/S70vsftpd
 	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
 		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
 			$(TARGET_DIR)/etc/vsftpd.conf
Signature · 1 line
2.1.0
author
#2 lore raw

PATCH v2 2/74 vsftpd: don't install manpages

In reply to Thomas Petazzoni

Installing manpages to the target is quite useless, since we don't support installing documentation on the target.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/vsftpd/vsftpd.mk | 4 ----
 1 file changed, 4 deletions(-)
package/vsftpd/vsftpd.mk +0 -4
index 1c468ed..b94328d 100644
@@ -49,10 +49,6 @@ endef
 
 define VSFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd
-	$(INSTALL) -D -m 644 $(@D)/vsftpd.8 \
-		$(TARGET_DIR)/usr/share/man/man8/vsftpd.8
-	$(INSTALL) -D -m 644 $(@D)/vsftpd.conf.5 \
-		$(TARGET_DIR)/usr/share/man/man5/vsftpd.conf.5
 	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
 		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
 			$(TARGET_DIR)/etc/vsftpd.conf
Signature · 1 line
2.1.0
author
#3 lore raw

PATCH v2 3/74 vsftpd: rename patches to the new naming convention

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 .../{vsftpd-0001-utmpx-builddef.patch => 0001-utmpx-builddef.patch}       | 0
 ...{vsftpd-dont-force-largefile.patch => 0002-dont-force-largefile.patch} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/vsftpd/{vsftpd-0001-utmpx-builddef.patch => 0001-utmpx-builddef.patch} (100%)
 rename package/vsftpd/{vsftpd-dont-force-largefile.patch => 0002-dont-force-largefile.patch} (100%)
package/vsftpd/0001-utmpx-builddef.patch renamed from package/vsftpd/vsftpd-0001-utmpx-builddef.patch +0 -0
similarity index 100%
rename from package/vsftpd/vsftpd-0001-utmpx-builddef.patch
rename to package/vsftpd/0001-utmpx-builddef.patch
package/vsftpd/0002-dont-force-largefile.patch renamed from package/vsftpd/vsftpd-dont-force-largefile.patch +0 -0
similarity index 100%
rename from package/vsftpd/vsftpd-dont-force-largefile.patch
rename to package/vsftpd/0002-dont-force-largefile.patch
Signature · 1 line
2.1.0
author
#4 lore raw

PATCH v2 4/74 radvd: use <pkg>_INSTALL_INIT_SYSV

In reply to Thomas Petazzoni

This commit changes the radvd to use the <pkg>_INSTALL_INIT_SYSV mechanism instead of using a post install target hook. We also use a full destination path when calling $(INSTALL).

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/radvd/radvd.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/radvd/radvd.mk +2 -4
index e0d4f69..e65d74a 100644
@@ -12,10 +12,8 @@ RADVD_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 # For radvd-01-drop-check.patch & radvd-02-drop-stack-protector.patch
 RADVD_AUTORECONF = YES
 
-define RADVD_INSTALL_INITSCRIPT
-	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d
+define RADVD_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d/S50radvd
 endef
 
-RADVD_POST_INSTALL_TARGET_HOOKS += RADVD_INSTALL_INITSCRIPT
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#5 lore raw

PATCH v2 5/74 thttpd: use the <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/thttpd/thttpd.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/thttpd/thttpd.mk +5 -2
index 70a90fd..1a028c8 100644
@@ -31,8 +31,6 @@ define THTTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/scripts/thttpd_wrapper $(TARGET_DIR)/usr/sbin/thttpd_wrapper
 	$(SED) 's:/usr/local/sbin:/usr/sbin:g' -e \
 		's:/usr/local/www:/var/www:g' $(TARGET_DIR)/usr/sbin/thttpd_wrapper
-	$(INSTALL) -D -m 0755 $(@D)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
-	$(SED) 's:/usr/local/sbin:/usr/sbin:g' $(TARGET_DIR)/etc/init.d/S90thttpd
 	$(INSTALL) -d $(TARGET_DIR)/var/www/data
 	$(INSTALL) -d $(TARGET_DIR)/var/www/logs
 	echo "dir=/var/www/data" > $(TARGET_DIR)/var/www/thttpd_config

@@ -41,4 +39,9 @@ define THTTPD_INSTALL_TARGET_CMDS
 	echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/var/www/thttpd_config
 endef
 
+define THTTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 $(@D)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd
+	$(SED) 's:/usr/local/sbin:/usr/sbin:g' $(TARGET_DIR)/etc/init.d/S90thttpd
+endef
+
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#6 lore raw

PATCH v2 6/74 busybox: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/busybox/busybox.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/busybox/busybox.mk +4 -1
index f0fa851..eb2f3f1 100644
@@ -218,8 +218,11 @@ 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)
+endef
+
+define BUSYBOX_INSTALL_INIT_SYSV
+	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
 	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
 	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 endef
Signature · 1 line
2.1.0
author
#7 lore raw

PATCH v2 7/74 portmap: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

We also switch to using a full destination path as the second argument of $(INSTALL).

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/portmap/portmap.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/portmap/portmap.mk +4 -2
index 0189597..dd60809 100644
@@ -30,8 +30,10 @@ define PORTMAP_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/share/man/man8/pmap_dump.8
 	$(INSTALL) -D $(@D)/pmap_set.8 \
 		$(TARGET_DIR)/usr/share/man/man8/pmap_set.8
-	$(INSTALL) -m 0755 package/portmap/S13portmap \
-		$(TARGET_DIR)/etc/init.d
+endef
+
+define PORTMAP_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 package/portmap/S13portmap $(TARGET_DIR)/etc/init.d/S13portmap
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#8 lore raw

PATCH v2 8/74 portmap: don't install manpages

In reply to Thomas Petazzoni

We no longer support having documentation on the target, so there's no point in carrying code to install man pages.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/portmap/portmap.mk | 6 ------
 1 file changed, 6 deletions(-)
package/portmap/portmap.mk +0 -6
index dd60809..d5d43bf 100644
@@ -24,12 +24,6 @@ define PORTMAP_INSTALL_TARGET_CMDS
 	for sbin in $(PORTMAP_SBINS); do \
 		$(INSTALL) -D $(@D)/$$sbin $(TARGET_DIR)/sbin/$$sbin; \
 	done
-	$(INSTALL) -D $(@D)/portmap.man \
-		$(TARGET_DIR)/usr/share/man/man8/portmap.8
-	$(INSTALL) -D $(@D)/pmap_dump.8 \
-		$(TARGET_DIR)/usr/share/man/man8/pmap_dump.8
-	$(INSTALL) -D $(@D)/pmap_set.8 \
-		$(TARGET_DIR)/usr/share/man/man8/pmap_set.8
 endef
 
 define PORTMAP_INSTALL_INIT_SYSV
Signature · 1 line
2.1.0
author
#9 lore raw

PATCH v2 9/74 portmap: improve installation of binaries

In reply to Thomas Petazzoni

This commit explicits the permissions with which executables are installed, and also makes sure that the build is aborted is one of the binary cannot be installed, instead of silently ignoring the error.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/portmap/portmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/portmap/portmap.mk +1 -1
index d5d43bf..65ee551 100644
@@ -22,7 +22,7 @@ endef
 
 define PORTMAP_INSTALL_TARGET_CMDS
 	for sbin in $(PORTMAP_SBINS); do \
-		$(INSTALL) -D $(@D)/$$sbin $(TARGET_DIR)/sbin/$$sbin; \
+		$(INSTALL) -D -m 0755 $(@D)/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#10 lore raw

PATCH v2 10/74 stunnel: use the <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Since the existing STUNNEL_INSTALL_CONF_SCRIPT hook no longer installs the init script, we rename it to STUNNEL_INSTALL_CONF.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/stunnel/stunnel.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
package/stunnel/stunnel.mk +6 -3
index dc56261..ac2963e 100644
@@ -18,14 +18,17 @@ else
 STUNNEL_CONF_OPTS += --disable-systemd
 endif
 
-define STUNNEL_INSTALL_CONF_SCRIPT
-	$(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel
+define STUNNEL_INSTALL_CONF
 	[ -f $(TARGET_DIR)/etc/stunnel/stunnel.conf ] || \
 		$(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \
 			$(TARGET_DIR)/etc/stunnel/stunnel.conf
 	rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample
 endef
 
-STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF_SCRIPT
+STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF
+
+define STUNNEL_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel
+endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#11 lore raw

PATCH v2 11/74 gdk-pixbuf: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/gdk-pixbuf/gdk-pixbuf.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/gdk-pixbuf/gdk-pixbuf.mk +1 -3
index 61e7ae9..0977d92 100644
@@ -45,13 +45,11 @@ GDK_PIXBUF_DEPENDENCIES += \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv) \
 	host-pkgconf libglib2
 
-define GDK_PIXBUF_POST_INSTALL_TWEAKS
+define GDK_PIXBUF_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/gdk-pixbuf/S26gdk-pixbuf \
 		$(TARGET_DIR)/etc/init.d/S26gdk-pixbuf
 endef
 
-GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_POST_INSTALL_TWEAKS
-
 $(eval $(autotools-package))
 
 HOST_GDK_PIXBUF_CONF_OPTS = \
Signature · 1 line
2.1.0
author
#12 lore raw

PATCH v2 12/74 proftpd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also use a complete destination path for the $(INSTALL) command.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/proftpd/proftpd.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/proftpd/proftpd.mk +4 -1
index ce735bd..65dd84e 100644
@@ -52,7 +52,10 @@ define PROFTPD_INSTALL_TARGET_CMDS
 		$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
 		$(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \
 	fi
-	$(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d
+endef
+
+define PROFTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d/S50proftpd
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#13 lore raw

PATCH v2 13/74 samba: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also makes the installation init script unconditional.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/samba/samba.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
package/samba/samba.mk +6 -6
index ec8e6ec..92bbe4e 100644
@@ -176,17 +176,17 @@ ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION
 endif
 
-define SAMBA_INSTALL_INITSCRIPTS_CONFIG
-	# install start/stop script
-	@if [ ! -f $(TARGET_DIR)/etc/init.d/S91smb ]; then \
-		$(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb; \
-	fi
+define SAMBA_INSTALL_CONFIG
 	# install config
 	@if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ]; then \
 		$(INSTALL) -m 0644 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \
 	fi
 endef
 
-SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_INITSCRIPTS_CONFIG
+SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_CONFIG
+
+define SAMBA_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb
+endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#14 lore raw

PATCH v2 14/74 input-event-daemon: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also makes the installation init script unconditional.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/input-event-daemon/input-event-daemon.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/input-event-daemon/input-event-daemon.mk +5 -3
index 534fe90..0bafdc4 100644
@@ -21,9 +21,11 @@ define INPUT_EVENT_DAEMON_INSTALL_TARGET_CMDS
 	[ -f $(TARGET_DIR)/etc/input-event-daemon.conf ] || \
 		$(INSTALL) -m 644 -D $(@D)/docs/sample.conf \
 			$(TARGET_DIR)/etc/input-event-daemon.conf
-	[ -f $(TARGET_DIR)/etc/init.d/S99input-event-daemon ] || \
-		$(INSTALL) -m 0755 -D package/input-event-daemon/S99input-event-daemon \
-			$(TARGET_DIR)/etc/init.d/S99input-event-daemon
+endef
+
+define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/input-event-daemon/S99input-event-daemon \
+		$(TARGET_DIR)/etc/init.d/S99input-event-daemon
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#15 lore raw

PATCH v2 15/74 ifplugd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/ifplugd/ifplugd.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/ifplugd/ifplugd.mk +5 -2
index 398cff4..3d0736a 100644
@@ -29,12 +29,15 @@ define IFPLUGD_INSTALL_FIXUP
 		$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
 			$(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \
 	fi
+endef
+
+IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP
+
+define IFPLUGD_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.init \
 		$(TARGET_DIR)/etc/init.d/S45ifplugd
 	# don't use bash for init script
 	$(SED) 's^/bin/bash^/bin/sh^g' $(TARGET_DIR)/etc/init.d/S45ifplugd
 endef
 
-IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#16 lore raw

PATCH v2 16/74 nfs-utils: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also move back the NFS_UTILS_INSTALL_FIXUP hook registration right after the hook definition.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/nfs-utils/nfs-utils.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
package/nfs-utils/nfs-utils.mk +6 -3
index 522e790..aef051c 100644
@@ -35,17 +35,20 @@ NFS_UTILS_CONF_OPTS += --disable-tirpc
 endif
 
 define NFS_UTILS_INSTALL_FIXUP
+	rm -f $(NFS_UTILS_TARGETS_)
+endef
+
+NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
+
+define NFS_UTILS_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 package/nfs-utils/S60nfs \
 		$(TARGET_DIR)/etc/init.d/S60nfs
-	rm -f $(NFS_UTILS_TARGETS_)
 endef
 
 define NFS_UTILS_REMOVE_NFSIOSTAT
 	rm -f $(TARGET_DIR)/usr/sbin/nfsiostat
 endef
 
-NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
-
 # nfsiostat is interpreted python, so remove it unless it's in the target
 NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
Signature · 1 line
2.1.0
author
#17 lore raw

PATCH v2 17/74 netatalk: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also makes the installation init script unconditional.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/netatalk/netatalk.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
package/netatalk/netatalk.mk +3 -6
index 5ea55c2..6c1b640 100644
@@ -50,12 +50,9 @@ else
 	NETATALK_CONF_OPTS += --disable-cups
 endif
 
-define NETATALK_INSTALL_EXTRA_FILES
-	[ -f $(TARGET_DIR)/etc/init.d/S50netatalk ] || \
-		$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
-			$(TARGET_DIR)/etc/init.d/S50netatalk
+define NETATALK_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
+		$(TARGET_DIR)/etc/init.d/S50netatalk
 endef
 
-NETATALK_POST_INSTALL_TARGET_HOOKS += NETATALK_INSTALL_EXTRA_FILES
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
#18 lore raw

PATCH v2 17/74 netatalk: use <pkg>_INSTALL_INIT_SYSV mechanism

Hi Thomas,

Quoted 1 line · Thomas Petazzoni

Also makes the installation init script unconditional.

Maybe "... makes the init script installation unconditional".

baruch

Quoted 25 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/netatalk/netatalk.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
package/netatalk/netatalk.mk +3 -6
index 5ea55c2..6c1b640 100644
@@ -50,12 +50,9 @@ else
 	NETATALK_CONF_OPTS += --disable-cups
 endif
 
-define NETATALK_INSTALL_EXTRA_FILES
-	[ -f $(TARGET_DIR)/etc/init.d/S50netatalk ] || \
-		$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
-			$(TARGET_DIR)/etc/init.d/S50netatalk
+define NETATALK_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
+		$(TARGET_DIR)/etc/init.d/S50netatalk
 endef
 
-NETATALK_POST_INSTALL_TARGET_HOOKS += NETATALK_INSTALL_EXTRA_FILES
-
 $(eval $(autotools-package))
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#19 lore raw

PATCH v2 18/74 mongoose: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/mongoose/mongoose.mk | 3 +++
 1 file changed, 3 insertions(+)
package/mongoose/mongoose.mk +3 -0
index 35e4b43..7a5d356 100644
@@ -29,6 +29,9 @@ endef
 define MONGOOSE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(@D)/examples/web_server/web_server \
 		$(TARGET_DIR)/usr/sbin/mongoose
+endef
+
+define MONGOOSE_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 755 package/mongoose/S85mongoose \
 		$(TARGET_DIR)/etc/init.d/S85mongoose
 endef
Signature · 1 line
2.1.0
author
#20 lore raw

PATCH v2 19/74 gpsd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also makes the installation init script unconditional.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/gpsd/gpsd.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
package/gpsd/gpsd.mk +5 -4
index 7dc27e8..5092b38 100644
@@ -206,10 +206,11 @@ define GPSD_INSTALL_TARGET_CMDS
 		$(SCONS) \
 		$(GPSD_SCONS_OPTS) \
 		install)
-	if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
-		$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
-		$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
-	fi
+endef
+
+define GPSD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd
+	$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd
 endef
 
 define GPSD_INSTALL_STAGING_CMDS
Signature · 1 line
2.1.0
#21 lore raw

PATCH v2 19/74 gpsd: use <pkg>_INSTALL_INIT_SYSV mechanism

Hi Thomas,

Quoted 1 line · Thomas Petazzoni

Also makes the installation init script unconditional.

Same here.

baruch

Quoted 25 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/gpsd/gpsd.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
package/gpsd/gpsd.mk +5 -4
index 7dc27e8..5092b38 100644
@@ -206,10 +206,11 @@ define GPSD_INSTALL_TARGET_CMDS
 		$(SCONS) \
 		$(GPSD_SCONS_OPTS) \
 		install)
-	if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
-		$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
-		$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
-	fi
+endef
+
+define GPSD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd
+	$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd
 endef
 
 define GPSD_INSTALL_STAGING_CMDS
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#22 lore raw

PATCH v2 20/74 olsr: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/olsr/olsr.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/olsr/olsr.mk +4 -1
index 1051d18..539386d 100644
@@ -31,9 +31,12 @@ define OLSR_INSTALL_TARGET_CMDS
 			LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) \
 			prefix="/usr" install ; \
 	done
-	$(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr
 	test -r $(TARGET_DIR)/etc/olsrd.conf || \
 		$(INSTALL) -D -m 0644 $(@D)/files/olsrd.conf.default.lq $(TARGET_DIR)/etc/olsrd.conf
 endef
 
+define OLSR_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/olsr/S50olsr $(TARGET_DIR)/etc/init.d/S50olsr
+endef
+
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#23 lore raw

PATCH v2 21/74 pango: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/pango/pango.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/pango/pango.mk +1 -3
index 6e340f4..63cfae3 100644
@@ -61,11 +61,9 @@ ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy)
 	PANGO_CONF_OPTS += --with-xft
 endif
 
-define PANGO_INSTALL_INITSCRIPT
+define PANGO_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/pango/S25pango \
 		$(TARGET_DIR)/etc/init.d/S25pango
 endef
 
-PANGO_POST_INSTALL_TARGET_HOOKS += PANGO_INSTALL_INITSCRIPT
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#24 lore raw

PATCH v2 22/74 xapp_xdm: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/x11r7/xapp_xdm/xapp_xdm.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/x11r7/xapp_xdm/xapp_xdm.mk +1 -3
index 428f473..955dc1c 100644
@@ -14,11 +14,9 @@ XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libX
 XAPP_XDM_CONF_OPTS = --with-utmp-file=/var/adm/utmpx \
 		    --with-wtmp-file=/var/adm/wtmpx
 
-define XAPP_XDM_INSTALL_STARTUP_SCRIPT
+define XAPP_XDM_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \
 		$(TARGET_DIR)/etc/init.d/S99xdm
 endef
 
-XAPP_XDM_POST_INSTALL_TARGET_HOOKS += XAPP_XDM_INSTALL_STARTUP_SCRIPT
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#25 lore raw

PATCH v2 23/74 tftpd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Also make sure we use a full path for the destination of the $(INSTALL) command.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/tftpd/tftpd.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/tftpd/tftpd.mk +4 -1
index 816a25e..2f746d0 100644
@@ -21,7 +21,10 @@ endif
 define TFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp
 	$(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd
-	$(INSTALL) -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/
+endef
+
+define TFTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -D package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/S80tftpd-hpa
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#26 lore raw

PATCH v2 24/74 openvpn: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/openvpn/openvpn.mk | 3 +++
 1 file changed, 3 insertions(+)
package/openvpn/openvpn.mk +3 -0
index e0dba35..68f7d97 100644
@@ -50,6 +50,9 @@ endif
 define OPENVPN_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \
 		$(TARGET_DIR)/usr/sbin/openvpn
+endef
+
+define OPENVPN_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/openvpn/S60openvpn \
 		$(TARGET_DIR)/etc/init.d/S60openvpn
 endef
Signature · 1 line
2.1.0
author
#27 lore raw

PATCH v2 25/74 tinyhttpd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/tinyhttpd/tinyhttpd.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/tinyhttpd/tinyhttpd.mk +4 -1
index ec47fd9..0934b71 100644
@@ -16,9 +16,12 @@ endef
 
 define TINYHTTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd
+	mkdir -p $(TARGET_DIR)/var/www
+endef
+
+define TINYHTTPD_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \
 		$(TARGET_DIR)/etc/init.d/S85tinyhttpd
-	mkdir -p $(TARGET_DIR)/var/www
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#28 lore raw

PATCH v2 26/74 at: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/at/at.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/at/at.mk +1 -3
index 851a05b..1504e32 100644
@@ -21,10 +21,8 @@ AT_CONF_OPTS = \
 	--with-daemon_groupname=root \
 	SENDMAIL=/usr/sbin/sendmail
 
-define AT_INSTALL_INITSCRIPT
+define AT_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D package/at/S99at $(TARGET_DIR)/etc/init.d/S99at
 endef
 
-AT_POST_INSTALL_TARGET_HOOKS += AT_INSTALL_INITSCRIPT
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#29 lore raw

PATCH v2 27/74 mpd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/mpd/mpd.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/mpd/mpd.mk +5 -2
index 1369847..b44285b 100644
@@ -232,10 +232,13 @@ define MPD_INSTALL_EXTRA_FILES
 		$(INSTALL) -D package/mpd/mpd.conf \
 			$(TARGET_DIR)/etc/mpd.conf; \
 	fi
-	$(INSTALL) -m 0755 -D package/mpd/S95mpd \
-		$(TARGET_DIR)/etc/init.d/S95mpd
 endef
 
 MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
 
+define MPD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/mpd/S95mpd \
+		$(TARGET_DIR)/etc/init.d/S95mpd
+endef
+
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#30 lore raw

PATCH v2 28/74 snowball-init: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/snowball-init/snowball-init.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/snowball-init/snowball-init.mk +1 -1
index d71f347..40acdd6 100644
@@ -9,7 +9,7 @@ SNOWBALL_INIT_SITE = https://github.com/igloocommunity/snowball-init
 SNOWBALL_INIT_LICENSE = BSD-4c
 SNOWBALL_INIT_LICENSE_FILES = debian/copyright
 
-define SNOWBALL_INIT_INSTALL_TARGET_CMDS
+define SNOWBALL_INIT_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 $(@D)/snowball $(TARGET_DIR)/etc/init.d/S50snowball
 endef
Signature · 1 line
2.1.0
author
#31 lore raw

PATCH v2 29/74 wipe: don't install man pages

In reply to Thomas Petazzoni

We don't support installing documentation on the target, so there's no point in having explicit code to do so.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/wipe/wipe.mk | 1 -
 1 file changed, 1 deletion(-)
package/wipe/wipe.mk +0 -1
index 4deabab..ee4682c 100644
@@ -13,7 +13,6 @@ WIPE_LICENSE_FILES = LICENSE
 
 define WIPE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/wipe $(TARGET_DIR)/usr/bin/wipe
-	$(INSTALL) -D $(@D)/wipe.1 $(TARGET_DIR)/usr/share/man/man1/wipe.1
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#32 lore raw

PATCH v2 30/74 ndisc6: remove man page related code

In reply to Thomas Petazzoni

The target-finalize target takes care of removing $(TARGET_DIR)/usr/share/man, so there's no point in having package specific code doing this.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/ndisc6/ndisc6.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
package/ndisc6/ndisc6.mk +1 -6
index b0e4caf..7235ebb 100644
@@ -27,14 +27,9 @@ NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RDNSSD) += rdnssd
 NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RLTRACEROUTE6) += rltraceroute6 tracert6
 NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_TCPTRACEROUTE6) += tcptraceroute6
 
-NDISC6_MAN1_ = $(addsuffix .1,$(NDISC6_BIN_))
-NDISC6_MAN8_ = $(addsuffix .8,$(NDISC6_SBIN_))
-
 define NDISC6_REMOVE_UNNEEDED
 	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/,$(NDISC6_BIN_)) \
-		$(addprefix $(TARGET_DIR)/usr/sbin/,$(NDISC6_SBIN_)) \
-		$(addprefix $(TARGET_DIR)/usr/share/man/man1/,$(NDISC6_MAN1_)) \
-		$(addprefix $(TARGET_DIR)/usr/share/man/man8/,$(NDISC6_MAN8_))
+		$(addprefix $(TARGET_DIR)/usr/sbin/,$(NDISC6_SBIN_))
 	$(if $(BR2_PACKAGE_NDISC6_RDNSSD),,\
 		rm -rf $(TARGET_DIR)/etc/rdnssd $(TARGET_DIR)/var/run/rdnssd)
 endef
Signature · 1 line
2.1.0
author
#33 lore raw

PATCH v2 31/74 tree: don't install man page

In reply to Thomas Petazzoni

We don't support installing documentation on the target, so there's no point in having explicit code to do so.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/tree/tree.mk | 2 --
 1 file changed, 2 deletions(-)
package/tree/tree.mk +0 -2
index 922deb8..83ea472 100644
@@ -16,8 +16,6 @@ endef
 
 define TREE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/tree $(TARGET_DIR)/usr/bin/tree
-	$(INSTALL) -D -m 0644 $(@D)/doc/tree.1 \
-		$(TARGET_DIR)/usr/share/man/man1/tree.1
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#34 lore raw

PATCH v2 32/74 iostat: don't install man page

In reply to Thomas Petazzoni

We don't support installing documentation on the target, so there's no point in having explicit code to do so.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/iostat/iostat.mk | 2 --
 1 file changed, 2 deletions(-)
package/iostat/iostat.mk +0 -2
index 8610f8f..2080e56 100644
@@ -17,8 +17,6 @@ endef
 
 define IOSTAT_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(IOSTAT_DIR)/iostat $(TARGET_DIR)/usr/bin/iostat
-	$(INSTALL) -D $(IOSTAT_DIR)/iostat.8 \
-		$(TARGET_DIR)/usr/share/man/man8/iostat.8
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#35 lore raw

PATCH v2 33/74 iostat: remove legacy code

In reply to Thomas Petazzoni

Some custom iostat-source target was mistakenly left in place when the iostat package was migrated to gentargets in commit ee77963588b09babfd71befb0b5eb9fd1e776bbc, back 4 years ago. This commit removes this unnecessary custom target.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/iostat/iostat.mk | 2 --
 1 file changed, 2 deletions(-)
package/iostat/iostat.mk +0 -2
index 2080e56..dd2a579 100644
@@ -9,8 +9,6 @@ IOSTAT_SITE = http://www.linuxinsight.com/files
 IOSTAT_LICENSE = GPL
 IOSTAT_LICENSE_FILES = LICENSE
 
-iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE)
-
 define IOSTAT_BUILD_CMDS
 	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
 endef
Signature · 1 line
2.1.0
author
#36 lore raw

PATCH v2 34/74 pptp-linux: don't install man page

In reply to Thomas Petazzoni

We don't support installing documentation on the target, so there's no point in having explicit code to do so.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/pptp-linux/pptp-linux.mk | 1 -
 1 file changed, 1 deletion(-)
package/pptp-linux/pptp-linux.mk +0 -1
index dc624eb..d7edf6c 100644
@@ -21,7 +21,6 @@ endef
 
 define PPTP_LINUX_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/pptp $(TARGET_DIR)/usr/sbin/pptp
-	$(INSTALL) -m 0644 -D $(@D)/pptp.8 $(TARGET_DIR)/usr/share/man/man8/pptp.8
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.0
author
#37 lore raw

PATCH v2 35/74 gnupg: don't both removing a man page

In reply to Thomas Petazzoni

The target-finalize target in the main Makefile removes $(TARGET_DIR)/usr/share/man entirely, so there's no point in having some package specific logic to remove man pages.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/gnupg/gnupg.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
package/gnupg/gnupg.mk +1 -2
index e7c403a..c0bf88c 100644
@@ -39,8 +39,7 @@ endif
 
 ifneq ($(BR2_PACKAGE_GNUPG_GPGV),y)
 define GNUPG_REMOVE_GPGV
-	rm -f $(TARGET_DIR)/usr/bin/gpgv \
-		$(TARGET_DIR)/usr/share/man/man1/gpgv.1
+	rm -f $(TARGET_DIR)/usr/bin/gpgv
 endef
 GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGV
 endif
Signature · 1 line
2.1.0
author
#38 lore raw

PATCH v2 36/74 rp-pppoe: don't install man pages

In reply to Thomas Petazzoni

We don't support installing documentation on the target, so there's no point in having explicit code to do so.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/rp-pppoe/rp-pppoe.mk | 3 ---
 1 file changed, 3 deletions(-)
package/rp-pppoe/rp-pppoe.mk +0 -3
index b17086b..6827628 100644
@@ -21,9 +21,6 @@ define RP_PPPOE_INSTALL_TARGET_CMDS
 	for ff in $(RP_PPPOE_TARGET_FILES); do \
 		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff; \
 	done
-	for ff in $(RP_PPPOE_TARGET_FILES); do \
-		$(INSTALL) -m 644 -D $(RP_PPPOE_DIR)/man/$$ff.8 $(TARGET_DIR)/usr/share/man/man8/$$ff.8; \
-	done
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#39 lore raw

PATCH v2 37/74 rp-pppoe: bail out of installation fails

In reply to Thomas Petazzoni

Add an "|| exit 1" in the installation loop, otherwise if one of the file fails to install, the build doesn't abort.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/rp-pppoe/rp-pppoe.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/rp-pppoe/rp-pppoe.mk +1 -1
index 6827628..4e17f2d 100644
@@ -19,7 +19,7 @@ RP_PPPOE_CONF_ENV = \
 
 define RP_PPPOE_INSTALL_TARGET_CMDS
 	for ff in $(RP_PPPOE_TARGET_FILES); do \
-		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff; \
+		$(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#40 lore raw

PATCH v2 38/74 alsa-utils: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/alsa-utils/alsa-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/alsa-utils/alsa-utils.mk +1 -1
index 17895c3..a599af8 100644
@@ -46,7 +46,7 @@ ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-tes
 define ALSA_UTILS_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/var/lib/alsa
 	for i in $(ALSA_UTILS_TARGETS_y); do \
-		$(INSTALL) -D -m 755 $(STAGING_DIR)/$$i $(TARGET_DIR)/$$i; \
+		$(INSTALL) -D -m 755 $(STAGING_DIR)/$$i $(TARGET_DIR)/$$i || exit 1; \
 	done
 	if [ -x "$(TARGET_DIR)/usr/bin/speaker-test" ]; then \
 		mkdir -p $(TARGET_DIR)/usr/share/alsa/speaker-test; \
Signature · 1 line
2.1.0
author
#41 lore raw

PATCH v2 39/74 coreutils: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/coreutils/coreutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/coreutils/coreutils.mk +1 -1
index 391d2cd..fa2db04 100644
@@ -101,7 +101,7 @@ endif
 define COREUTILS_POST_INSTALL
 	# some things go in root rather than usr
 	for f in $(COREUTILS_BIN_PROGS); do \
-		mv $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
+		mv $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f || exit 1; \
 	done
 	# link for archaic shells
 	ln -fs test $(TARGET_DIR)/usr/bin/[
Signature · 1 line
2.1.0
author
#42 lore raw

PATCH v2 40/74 ebtables: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/ebtables/ebtables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/ebtables/ebtables.mk +1 -1
index 578c3ae..23c4628 100644
@@ -28,7 +28,7 @@ define EBTABLES_INSTALL_TARGET_CMDS
 		$(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \
 		do \
 		$(INSTALL) -m 0755 -D $${so} \
-			$(TARGET_DIR)/lib/ebtables/`basename $${so}`; \
+			$(TARGET_DIR)/lib/ebtables/`basename $${so}` || exit 1; \
 	done
 	$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
 		$(TARGET_DIR)/sbin/ebtables
Signature · 1 line
2.1.0
author
#43 lore raw

PATCH v2 41/74 flot: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/flot/flot.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/flot/flot.mk +1 -1
index 79bdf1f..58e3ff1 100644
@@ -27,7 +27,7 @@ FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
 
 define FLOT_INSTALL_TARGET_CMDS
 	for i in $(FLOT_FILES); do \
-		$(INSTALL) -m 0644 -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js; \
+		$(INSTALL) -m 0644 -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#44 lore raw

PATCH v2 42/74 googlefontdirectory: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/googlefontdirectory/googlefontdirectory.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/googlefontdirectory/googlefontdirectory.mk +1 -1
index 076e654..0e60892 100644
@@ -16,7 +16,7 @@ define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS
 	for i in $(GOOGLEFONTDIRECTORY_FONTS); \
 	do \
 		$(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/$$i && \
-		$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$$i $(@D)/$$i/*.ttf; \
+		$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$$i $(@D)/$$i/*.ttf || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#45 lore raw

PATCH v2 43/74 gptfdisk: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/gptfdisk/gptfdisk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gptfdisk/gptfdisk.mk +1 -1
index 9828d4c..4c6af56 100644
@@ -33,7 +33,7 @@ endef
 
 define GPTFDISK_INSTALL_TARGET_CMDS
 	for i in $(GPTFDISK_TARGETS_y); do \
-		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i; \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#46 lore raw

PATCH v2 44/74 irda-utils: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/irda-utils/irda-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/irda-utils/irda-utils.mk +1 -1
index e4958e5..2c35dff 100644
@@ -32,7 +32,7 @@ IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y)
 
 define IRDA_UTILS_INSTALL_TARGET_CMDS
 	for i in $(IRDA_UTILS_SBINS-y); do \
-		$(INSTALL) -m 0755 -D $(@D)/$$i/$$i $(TARGET_DIR)/usr/sbin/$$i; \
+		$(INSTALL) -m 0755 -D $(@D)/$$i/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#47 lore raw

PATCH v2 45/74 jimtcl: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/jimtcl/jimtcl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/jimtcl/jimtcl.mk +1 -1
index 27f43f0..add61d6 100644
@@ -51,7 +51,7 @@ endef
 
 define JIMTCL_INSTALL_STAGING_CMDS
 	for i in $(JIMTCL_HEADERS_TO_INSTALL); do \
-		cp -a $(@D)/$$i $(STAGING_DIR)/usr/include/ ; \
+		cp -a $(@D)/$$i $(STAGING_DIR)/usr/include/ || exit 1 ; \
 	done; \
 	$(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) $(STAGING_DIR)/usr/lib/libjim.$(JIMTCL_LIB);
 	ln -s libjim.$(JIMTCL_LIB) $(STAGING_DIR)/usr/lib/libjim.so
Signature · 1 line
2.1.0
author
#48 lore raw

PATCH v2 46/74 live555: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/live555/live555.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/live555/live555.mk +1 -1
index b923388..7dbded3 100644
@@ -54,7 +54,7 @@ endef
 
 define LIVE555_INSTALL_TARGET_CMDS
 	for i in $(LIVE555_FILES_TO_INSTALL-y); do \
-		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i`; \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i` || exit 1 \
 	done
 endef
Signature · 1 line
2.1.0
author
#49 lore raw

PATCH v2 47/74 lockfile-progs: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/lockfile-progs/lockfile-progs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lockfile-progs/lockfile-progs.mk +1 -1
index e2e0a44..deb9f90 100644
@@ -21,7 +21,7 @@ endef
 
 define LOCKFILE_PROGS_INSTALL_TARGET_CMDS
 	for i in $(LOCKFILE_BINS); do \
-		$(INSTALL) -D -m 755 $(@D)/bin/$$i $(TARGET_DIR)/usr/bin/$$i; \
+		$(INSTALL) -D -m 755 $(@D)/bin/$$i $(TARGET_DIR)/usr/bin/$$i || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#50 lore raw

PATCH v2 48/74 qt5base: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/qt5/qt5base/qt5base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +1 -1
index 57ea1c8..788b2d7 100644
@@ -211,7 +211,7 @@ endef
 
 define QT5BASE_INSTALL_TARGET_LIBS
 	for lib in $(QT5BASE_INSTALL_LIBS_y); do \
-		cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \
+		cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib || exit 1 ; \
 	done
 endef
Signature · 1 line
2.1.0
author
#51 lore raw

PATCH v2 49/74 qtuio: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/qtuio/qtuio.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/qtuio/qtuio.mk +3 -3
index 9925f84..9af0136 100644
@@ -19,7 +19,7 @@ QTUIO_EXAMPLES = dials fingerpaint knobs pinchzoom
 ifeq ($(BR2_QTUIO_EXAMPLES),y)
 define QTUIO_CONFIGURE_EXAMPLES
 	for example in $(QTUIO_EXAMPLES) ; do \
-		(cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) ; \
+		(cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) || exit 1; \
 	done
 endef
 endif

@@ -32,7 +32,7 @@ endef
 ifeq ($(BR2_QTUIO_EXAMPLES),y)
 define QTUIO_BUILD_EXAMPLES
 	for example in $(QTUIO_EXAMPLES) ; do \
-		($(MAKE) -C $(@D)/examples/$${example}) ; \
+		($(MAKE) -C $(@D)/examples/$${example}) || exit 1; \
 	done
 endef
 endif

@@ -46,7 +46,7 @@ endef
 ifeq ($(BR2_QTUIO_EXAMPLES),y)
 define QTUIO_INSTALL_EXAMPLES
 	for example in $(QTUIO_EXAMPLES) ; do \
-		($(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example}) ; \
+		($(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example} || exit 1) ; \
 	done
 endef
 endif
Signature · 1 line
2.1.0
author
#52 lore raw

PATCH v2 50/74 sound-theme-borealis: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/sound-theme-borealis/sound-theme-borealis.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/sound-theme-borealis/sound-theme-borealis.mk +1 -1
index a2f29a9..9242837 100644
@@ -11,7 +11,7 @@ SOUND_THEME_BOREALIS_SOURCE = \
 
 define SOUND_THEME_BOREALIS_INSTALL_TARGET_CMDS
 	for f in $(@D)/*.ogg ; do \
-		$(INSTALL) -D -m 0644 $$f $(TARGET_DIR)/usr/share/sounds/borealis/stereo/`basename $$f` ; \
+		$(INSTALL) -D -m 0644 $$f $(TARGET_DIR)/usr/share/sounds/borealis/stereo/`basename $$f` || exit 1; \
 	done
 endef
Signature · 1 line
2.1.0
author
#53 lore raw

PATCH v2 51/74 xenomai: add error handling to for loop

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/xenomai/xenomai.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/xenomai/xenomai.mk +1 -1
index 740a40b..ccbae35 100644
@@ -99,7 +99,7 @@ XENOMAI_DEPENDENCIES += udev
 define XENOMAI_INSTALL_UDEV_RULES
 	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
 		for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \
-			cp $$f $(TARGET_DIR)/etc/udev/rules.d/ ; \
+			cp $$f $(TARGET_DIR)/etc/udev/rules.d/ || exit 1 ; \
 		done ; \
 	fi;
 endef
Signature · 1 line
2.1.0
author
#54 lore raw

PATCH v2 52/74 aiccu: install init script and config file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/aiccu/aiccu.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/aiccu/aiccu.mk +2 -4
index 4413f86..faa861c 100644
@@ -28,14 +28,12 @@ endef
 define AICCU_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
 		$(TARGET_DIR)/usr/sbin/aiccu
-	[ -f $(TARGET_DIR)/etc/aiccu.conf ] || \
-		$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
+	$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
 		$(TARGET_DIR)/etc/aiccu.conf
 endef
 
 define AICCU_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S50aiccu ] || \
-		$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
+	$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
 		$(TARGET_DIR)/etc/init.d/S50aiccu
 endef
Signature · 1 line
2.1.0
author
#55 lore raw

PATCH v2 53/74 busybox: install init script and config file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/busybox/busybox.mk | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)
package/busybox/busybox.mk +12 -18
index eb2f3f1..ae60ac1 100644
@@ -57,14 +57,12 @@ endef
 # 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
+	$(INSTALL) -D -m 0755 package/busybox/S10mdev \
+		$(TARGET_DIR)/etc/init.d/S10mdev
 endef
 define BUSYBOX_INSTALL_MDEV_CONF
-	[ -f $(TARGET_DIR)/etc/mdev.conf ] || \
-		$(INSTALL) -D -m 0644 package/busybox/mdev.conf \
-			$(TARGET_DIR)/etc/mdev.conf
+	$(INSTALL) -D -m 0644 package/busybox/mdev.conf \
+		$(TARGET_DIR)/etc/mdev.conf
 endef
 define BUSYBOX_SET_MDEV
 	$(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG))

@@ -165,9 +163,8 @@ endif
 
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
 	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
-		[ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \
-			$(INSTALL) -m 0755 -D package/busybox/S01logging \
-				$(TARGET_DIR)/etc/init.d/S01logging; \
+		$(INSTALL) -m 0755 -D package/busybox/S01logging \
+			$(TARGET_DIR)/etc/init.d/S01logging; \
 	else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
 endef
 

@@ -176,11 +173,10 @@ define BUSYBOX_SET_WATCHDOG
 	$(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG))
 endef
 define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
-	[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \
-		$(INSTALL) -D -m 0755 package/busybox/S15watchdog \
-			$(TARGET_DIR)/etc/init.d/S15watchdog && \
-		$(SED) s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \
-			$(TARGET_DIR)/etc/init.d/S15watchdog
+	$(INSTALL) -D -m 0755 package/busybox/S15watchdog \
+		$(TARGET_DIR)/etc/init.d/S15watchdog && \
+	$(SED) s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \
+		$(TARGET_DIR)/etc/init.d/S15watchdog
 endef
 endif
 

@@ -214,10 +210,8 @@ endef
 
 define BUSYBOX_INSTALL_TARGET_CMDS
 	$(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install
-	if [ ! -f $(TARGET_DIR)/usr/share/udhcpc/default.script ]; then \
-		$(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
-			$(TARGET_DIR)/usr/share/udhcpc/default.script; \
-	fi
+	$(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
+		$(TARGET_DIR)/usr/share/udhcpc/default.script
 	$(BUSYBOX_INSTALL_MDEV_CONF)
 endef
Signature · 1 line
2.1.0
author
#56 lore raw

PATCH v2 54/74 busybox: install init script unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/dmraid/dmraid.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/dmraid/dmraid.mk +2 -3
index 024b9b5..a6ed57f 100644
@@ -18,9 +18,8 @@ DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
 DMRAID_DEPENDENCIES = lvm2
 
 define DMRAID_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S20dmraid ] || \
-		$(INSTALL) -D -m 0755 package/dmraid/S20dmraid \
-			$(TARGET_DIR)/etc/init.d/S20dmraid
+	$(INSTALL) -D -m 0755 package/dmraid/S20dmraid \
+		$(TARGET_DIR)/etc/init.d/S20dmraid
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
#57 lore raw

PATCH v2 54/74 busybox: install init script unconditionally

Thomas,

package/dmraid/dmraid.mk

Quoted 14 lines · Thomas Petazzoni

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 <[email protected]>
---
 package/dmraid/dmraid.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/dmraid/dmraid.mk +0 -0
index 024b9b5..a6ed57f 100644

Subject says "busybox", but should be "dmraid"?

Danomi -

author
#58 lore raw

PATCH v2 55/74 iucode-tool: install init script unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/iucode-tool/iucode-tool.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/iucode-tool/iucode-tool.mk +2 -3
index 3124c73..081b086 100644
@@ -15,9 +15,8 @@ IUCODE_TOOL_LICENSE = GPLv2+
 IUCODE_TOOL_LICENSE_FILES = COPYING
 
 define IUCODE_TOOL_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S00iucode-tool ] || \
-		$(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \
-			$(TARGET_DIR)/etc/init.d/S00iucode-tool
+	$(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \
+		$(TARGET_DIR)/etc/init.d/S00iucode-tool
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#59 lore raw

PATCH v2 56/74 lighttpd: install init script and config file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/lighttpd/lighttpd.mk | 46 +++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)
package/lighttpd/lighttpd.mk +16 -30
index ef98298..804bdd4 100644
@@ -62,44 +62,30 @@ endif
 define LIGHTTPD_INSTALL_CONFIG
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www
-
-	[ -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] || \
-		$(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \
-			$(TARGET_DIR)/etc/lighttpd/lighttpd.conf
-
-	[ -f $(TARGET_DIR)/etc/lighttpd/modules.conf ] || \
-		$(INSTALL) -D -m 755 $(@D)/doc/config/modules.conf \
-			$(TARGET_DIR)/etc/lighttpd/modules.conf
-
-	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf ] || \
-		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/access_log.conf \
-			$(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf
-
-	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf ] || \
-		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/debug.conf \
-			$(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf
-
-	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf ] || \
-		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/dirlisting.conf \
-			$(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf
-
-	[ -f $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf ] || \
-		$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/mime.conf \
-			$(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf
+	$(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \
+		$(TARGET_DIR)/etc/lighttpd/lighttpd.conf
+	$(INSTALL) -D -m 755 $(@D)/doc/config/modules.conf \
+		$(TARGET_DIR)/etc/lighttpd/modules.conf
+	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/access_log.conf \
+		$(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf
+	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/debug.conf \
+		$(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf
+	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/dirlisting.conf \
+		$(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf
+	$(INSTALL) -D -m 755 $(@D)/doc/config/conf.d/mime.conf \
+		$(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf
 endef
 
 LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG
 
 define LIGHTTPD_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S50lighttpd ] || \
-		$(INSTALL) -D -m 755 package/lighttpd/S50lighttpd \
-			$(TARGET_DIR)/etc/init.d/S50lighttpd
+	$(INSTALL) -D -m 755 package/lighttpd/S50lighttpd \
+		$(TARGET_DIR)/etc/init.d/S50lighttpd
 endef
 
 define LIGHTTPD_INSTALL_INIT_SYSTEMD
-	[ -f $(TARGET_DIR)/etc/systemd/system/lighttpd.service ] || \
-		$(INSTALL) -D -m 644 package/lighttpd/lighttpd.service \
-			$(TARGET_DIR)/etc/systemd/system/lighttpd.service
+	$(INSTALL) -D -m 644 package/lighttpd/lighttpd.service \
+		$(TARGET_DIR)/etc/systemd/system/lighttpd.service
 
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
Signature · 1 line
2.1.0
author
#60 lore raw

PATCH v2 57/74 rpcbind: install init script unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/rpcbind/rpcbind.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/rpcbind/rpcbind.mk +2 -3
index b7c2261..55de3fc 100644
@@ -17,9 +17,8 @@ RPCBIND_DEPENDENCIES += libtirpc
 RPCBIND_CONF_OPTS += --with-rpcuser=root
 
 define RPCBIND_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S30rpcbind ] || \
-		$(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \
-			$(TARGET_DIR)/etc/init.d/S30rpcbind
+	$(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \
+		$(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#61 lore raw

PATCH v2 58/74 rsyslog: install init script and config file unconditionally

In reply to Thomas Petazzoni

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.

Also, we take this opportunity to rename RSYSLOG_INSTALL_CONF_SCRIPT to RSYSLOG_INSTALL_CONF because it is no longer installing an init script.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/rsyslog/rsyslog.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
package/rsyslog/rsyslog.mk +6 -8
index d7dc930..6b72bb5 100644
@@ -39,18 +39,16 @@ else
 endif
 
 define RSYSLOG_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \
-		$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
-			$(TARGET_DIR)/etc/init.d/S01rsyslog
+	$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
+		$(TARGET_DIR)/etc/init.d/S01rsyslog
 endef
 
-define RSYSLOG_INSTALL_CONF_SCRIPT
-	[ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \
-		$(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \
-			$(TARGET_DIR)/etc/rsyslog.conf
+define RSYSLOG_INSTALL_CONF
+	$(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \
+		$(TARGET_DIR)/etc/rsyslog.conf
 	mkdir -p $(TARGET_DIR)/etc/rsyslog.d
 endef
 
-RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF_SCRIPT
+RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.0
author
#62 lore raw

PATCH v2 59/74 transmission: install init script unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/transmission/transmission.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/transmission/transmission.mk +2 -3
index 27ad9d9..b8a5c42 100644
@@ -37,9 +37,8 @@ ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
 	TRANSMISSION_CONF_OPTS += --enable-daemon
 
 define TRANSMISSION_INSTALL_INIT_SYSV
-	[ -f $(TARGET_DIR)/etc/init.d/S92transmission ] || \
-		$(INSTALL) -m 0755 -D package/transmission/S92transmission \
-			$(TARGET_DIR)/etc/init.d/S92transmission
+	$(INSTALL) -m 0755 -D package/transmission/S92transmission \
+		$(TARGET_DIR)/etc/init.d/S92transmission
 endef
 
 else
Signature · 1 line
2.1.0
author
#63 lore raw

PATCH v2 60/74 stunnel: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/stunnel/stunnel.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/stunnel/stunnel.mk +2 -3
index ac2963e..3d0596d 100644
@@ -19,9 +19,8 @@ STUNNEL_CONF_OPTS += --disable-systemd
 endif
 
 define STUNNEL_INSTALL_CONF
-	[ -f $(TARGET_DIR)/etc/stunnel/stunnel.conf ] || \
-		$(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \
-			$(TARGET_DIR)/etc/stunnel/stunnel.conf
+	$(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \
+		$(TARGET_DIR)/etc/stunnel/stunnel.conf
 	rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample
 endef
Signature · 1 line
2.1.0
author
#64 lore raw

PATCH v2 61/74 input-event-daemon: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/input-event-daemon/input-event-daemon.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/input-event-daemon/input-event-daemon.mk +2 -3
index 0bafdc4..67b8cc4 100644
@@ -18,9 +18,8 @@ endef
 define INPUT_EVENT_DAEMON_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -D $(@D)/input-event-daemon \
 		$(TARGET_DIR)/usr/bin/input-event-daemon
-	[ -f $(TARGET_DIR)/etc/input-event-daemon.conf ] || \
-		$(INSTALL) -m 644 -D $(@D)/docs/sample.conf \
-			$(TARGET_DIR)/etc/input-event-daemon.conf
+	$(INSTALL) -m 644 -D $(@D)/docs/sample.conf \
+		$(TARGET_DIR)/etc/input-event-daemon.conf
 endef
 
 define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSV
Signature · 1 line
2.1.0
author
#65 lore raw

PATCH v2 62/74 fluxbox: install session file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/fluxbox/fluxbox.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/fluxbox/fluxbox.mk +2 -2
index 21901d6..a0f9367 100644
@@ -24,8 +24,8 @@ FLUXBOX_CONF_OPTS += --disable-imlib2
 endif
 
 define FLUXBOX_INSTALL_XSESSION_FILE
-	[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
-		package/fluxbox/xsession $(TARGET_DIR)/root/.xsession
+	$(INSTALL) -m 0755 -D package/fluxbox/xsession \
+		$(TARGET_DIR)/root/.xsession
 endef
 
 FLUXBOX_POST_INSTALL_TARGET_HOOKS += FLUXBOX_INSTALL_XSESSION_FILE
Signature · 1 line
2.1.0
author
#66 lore raw

PATCH v2 63/74 proftpd: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/proftpd/proftpd.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/proftpd/proftpd.mk +2 -4
index 65dd84e..ce31276 100644
@@ -48,10 +48,8 @@ PROFTPD_MAKE = $(MAKE1)
 
 define PROFTPD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
-	@if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \
-		$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
-		$(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \
-	fi
+	$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
+	$(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \
 endef
 
 define PROFTPD_INSTALL_INIT_SYSV
Signature · 1 line
2.1.0
author
#67 lore raw

PATCH v2 64/74 samba: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/samba/samba.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
package/samba/samba.mk +1 -4
index 92bbe4e..0e4db95 100644
@@ -177,10 +177,7 @@ SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION
 endif
 
 define SAMBA_INSTALL_CONFIG
-	# install config
-	@if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ]; then \
-		$(INSTALL) -m 0644 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \
-	fi
+	$(INSTALL) -m 0644 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf
 endef
 
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_CONFIG
Signature · 1 line
2.1.0
author
#68 lore raw

PATCH v2 65/74 logrotate: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/logrotate/logrotate.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/logrotate/logrotate.mk +1 -3
index 2e49feb..dc26d85 100644
@@ -17,9 +17,7 @@ endef
 
 define LOGROTATE_INSTALL_TARGET_CMDS
 	$(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
-	if [ ! -f $(TARGET_DIR)/etc/logrotate.conf ]; then \
-		$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf; \
-	fi
+	$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
 endef
Signature · 1 line
2.1.0
author
#69 lore raw

PATCH v2 66/74 nss-mdns: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/nss-mdns/nss-mdns.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/nss-mdns/nss-mdns.mk +1 -3
index 9ec9c1a..9a6c5a1 100644
@@ -10,9 +10,7 @@ NSS_MDNS_LICENSE = LGPLv2.1+
 NSS_MDNS_LICENSE_FILES = LICENSE
 
 define NSS_MDNS_INSTALL_CONFIG
-	if [ ! -f "$(TARGET_DIR)/etc/nsswitch.conf" ]; then \
-		$(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf ; \
-	fi
+	$(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf
 	sed -r -i -e 's/^(hosts:[[:space:]]+).*/\1files mdns4_minimal [NOTFOUND=return] dns mdns4/' \
 		$(TARGET_DIR)/etc/nsswitch.conf
 endef
Signature · 1 line
2.1.0
author
#70 lore raw

PATCH v2 67/74 ifplugd: install configuration files unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/ifplugd/ifplugd.mk | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
package/ifplugd/ifplugd.mk +4 -8
index 3d0736a..b24c79d 100644
@@ -21,14 +21,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 
 define IFPLUGD_INSTALL_FIXUP
-	if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \
-		$(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
-		$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
-	fi
-	if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.action ]; then \
-		$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
-			$(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \
-	fi
+	$(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
+	$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
+	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
+		$(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \
 endef
 
 IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP
Signature · 1 line
2.1.0
author
#71 lore raw

PATCH v2 68/74 sysklogd: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/sysklogd/sysklogd.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/sysklogd/sysklogd.mk +2 -4
index 2b60b45..1e8652d 100644
@@ -21,10 +21,8 @@ endef
 define SYSKLOGD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/sbin/syslogd
 	$(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/sbin/klogd
-	if [ ! -f $(TARGET_DIR)/etc/syslog.conf ]; then \
-		$(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \
-			$(TARGET_DIR)/etc/syslog.conf; \
-	fi
+	$(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \
+		$(TARGET_DIR)/etc/syslog.conf; \
 endef
 
 define SYSKLOGD_INSTALL_INIT_SYSV
Signature · 1 line
2.1.0
author
#72 lore raw

PATCH v2 69/74 screen: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/screen/screen.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/screen/screen.mk +1 -3
index 461bce2..827e776 100644
@@ -15,9 +15,7 @@ SCREEN_MAKE = $(MAKE1)
 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
 define SCREEN_INSTALL_SCREENRC
-	if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
-		$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc; \
-	fi
+	$(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc
 endef
 
 SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC
Signature · 1 line
2.1.0
author
#73 lore raw

PATCH v2 70/74 usbmount: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/usbmount/usbmount.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/usbmount/usbmount.mk +1 -3
index cc25e4b..76c027f 100644
@@ -20,9 +20,7 @@ define USBMOUNT_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
 
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
-	@if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
-	        $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
-	fi
+        $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf
 
 	mkdir -p $(addprefix $(TARGET_DIR)/media/usb,0 1 2 3 4 5 6 7)
 endef
Signature · 1 line
2.1.0
author
#74 lore raw

PATCH v2 71/74 php: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/php/php.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/php/php.mk +2 -4
index 9456f1c..caaf548 100644
@@ -238,10 +238,8 @@ PHP_POST_INSTALL_TARGET_HOOKS += PHP_EXTENSIONS_FIXUP
 define PHP_INSTALL_FIXUP
 	rm -rf $(TARGET_DIR)/usr/lib/php
 	rm -f $(TARGET_DIR)/usr/bin/phpize
-	if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \
-		$(INSTALL) -m 0755  $(PHP_DIR)/php.ini-production \
-			$(TARGET_DIR)/etc/php.ini; \
-	fi
+	$(INSTALL) -m 0755  $(PHP_DIR)/php.ini-production \
+		$(TARGET_DIR)/etc/php.ini
 endef
 
 PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP
Signature · 1 line
2.1.0
author
#75 lore raw

PATCH v2 72/74 inadyn: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/inadyn/inadyn.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/inadyn/inadyn.mk +2 -4
index 73d95db..b002f94 100644
@@ -20,10 +20,8 @@ INADYN_CONF_OPTS += --disable-ssl
 endif
 
 define INADYN_INSTALL_SAMPLE_CONFIG
-	@if [ ! -f $(TARGET_DIR)/etc/inadyn.conf ]; then \
-		$(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
-			$(TARGET_DIR)/etc/inadyn.conf; \
-	fi
+	$(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
+		$(TARGET_DIR)/etc/inadyn.conf
 endef
 INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG
Signature · 1 line
2.1.0
author
#76 lore raw

PATCH v2 73/74 mpd: install configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 package/mpd/mpd.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
package/mpd/mpd.mk +1 -4
index b44285b..5176dc4 100644
@@ -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
Signature · 1 line
2.1.0
author
#77 lore raw

PATCH v2 74/74 toolchain: install nssswitch.conf configuration file unconditionally

In reply to Thomas Petazzoni

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 <[email protected]>
---
 toolchain/toolchain.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
toolchain/toolchain.mk +2 -4
index 3f9900b..0fb115b 100644
@@ -3,12 +3,10 @@
 # TARGET_FINALIZE_HOOKS, to be applied just after all packages
 # have been built.
 
-# Install default nsswitch.conf file if the skeleton doesn't provide it
+# Install default nsswitch.conf file
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 define GLIBC_COPY_NSSWITCH_FILE
-	$(Q)if [ ! -f "$(TARGET_DIR)/etc/nsswitch.conf" ]; then \
-		$(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf ; \
-	fi
+	$(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf
 endef
 TARGET_FINALIZE_HOOKS += GLIBC_COPY_NSSWITCH_FILE
 endif
Signature · 1 line
2.1.0