Misc trivial improvements

PATCH Superseded Thomas Petazzoni 3 participants 58 messages Nov 23, 2014 – Nov 24, 2014

lore

Share & tools

lore

Thomas Petazzoni

author

2014-11-23 20:38 UTC #0 lore raw

cover Misc trivial improvements

Hello,

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.

* Misc other small stuff.

This series is obviously material for the next branch.

Thanks,

Thomas

Thomas Petazzoni (51):
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

 package/alsa-utils/alsa-utils.mk                          |  2 +-
 package/at/at.mk                                          |  4 +---
 package/busybox/busybox.mk                                |  5 ++++-
 package/coreutils/coreutils.mk                            |  2 +-
 package/ebtables/ebtables.mk                              |  2 +-
 package/flot/flot.mk                                      |  2 +-
 package/gdk-pixbuf/gdk-pixbuf.mk                          |  4 +---
 package/gnupg/gnupg.mk                                    |  3 +--
 package/googlefontdirectory/googlefontdirectory.mk        |  2 +-
 package/gpsd/gpsd.mk                                      |  3 +++
 package/gptfdisk/gptfdisk.mk                              |  2 +-
 package/ifplugd/ifplugd.mk                                |  7 +++++--
 package/input-event-daemon/input-event-daemon.mk          |  3 +++
 package/iostat/iostat.mk                                  |  4 ----
 package/irda-utils/irda-utils.mk                          |  2 +-
 package/jimtcl/jimtcl.mk                                  |  2 +-
 package/live555/live555.mk                                |  8 ++++----
 package/lockfile-progs/lockfile-progs.mk                  |  2 +-
 package/mongoose/mongoose.mk                              |  3 +++
 package/mpd/mpd.mk                                        |  7 +++++--
 package/ndisc6/ndisc6.mk                                  |  7 +------
 package/netatalk/netatalk.mk                              |  4 +---
 package/nfs-utils/nfs-utils.mk                            |  9 ++++++---
 package/olsr/olsr.mk                                      |  5 ++++-
 package/openvpn/openvpn.mk                                |  3 +++
 package/pango/pango.mk                                    |  4 +---
 package/portmap/portmap.mk                                | 14 +++++---------
 package/pptp-linux/pptp-linux.mk                          |  1 -
 package/proftpd/proftpd.mk                                |  5 ++++-
 package/qt5/qt5base/qt5base.mk                            |  2 +-
 package/qtuio/qtuio.mk                                    |  6 +++---
 package/radvd/radvd.mk                                    |  6 ++----
 package/rp-pppoe/rp-pppoe.mk                              |  5 +----
 package/samba/samba.mk                                    | 15 +++++++++------
 package/snowball-init/snowball-init.mk                    |  2 +-
 package/sound-theme-borealis/sound-theme-borealis.mk      |  2 +-
 package/stunnel/stunnel.mk                                |  9 ++++++---
 package/tftpd/tftpd.mk                                    |  5 ++++-
 package/thttpd/thttpd.mk                                  |  7 +++++--
 package/tinyhttpd/tinyhttpd.mk                            |  5 ++++-
 package/tree/tree.mk                                      |  2 --
 ...001-utmpx-builddef.patch => 0001-utmpx-builddef.patch} |  0
 ...ce-largefile.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 +-
 48 files changed, 107 insertions(+), 98 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #1 lore raw

PATCH 1/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #2 lore raw

PATCH 2/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #3 lore raw

PATCH 3/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #4 lore raw

PATCH 4/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #5 lore raw

PATCH 5/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #6 lore raw

PATCH 6/51 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 0ceaab1..d5a6a2d 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #7 lore raw

PATCH 7/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #8 lore raw

PATCH 8/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #9 lore raw

PATCH 9/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #10 lore raw

PATCH 10/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #11 lore raw

PATCH 11/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #12 lore raw

PATCH 12/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #13 lore raw

PATCH 13/51 samba: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/samba/samba.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

package/samba/samba.mk +9 -6

index 1957997..13d2cb7 100644
@@ -160,17 +160,20 @@ 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 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
+endef
 
 $(eval $(autotools-package))

Signature · 1 line

2.1.0

Baruch Siach

2014-11-24 04:49 UTC #14 lore raw

PATCH 13/51 samba: use <pkg>_INSTALL_INIT_SYSV mechanism

Hi Thomas,

package/samba/samba.mk ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) · line 177

Quoted 6 lines · Thomas Petazzoni

package/samba/samba.mk +6 -0

+define SAMBA_INSTALL_INIT_SYSV
+	# 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
+endef

Why not install the init script unconditionally like you did in vsftpd?

baruch

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 -

Baruch Siach

2014-11-24 05:27 UTC #15 lore raw

PATCH 13/51 samba: use <pkg>_INSTALL_INIT_SYSV mechanism

Hi Thomas,

Quoted 9 lines · Baruch Siach

package/samba/samba.mk ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) · line 177
Quoted 6 lines · Thomas Petazzoni
package/samba/samba.mk +6 -0
+define SAMBA_INSTALL_INIT_SYSV
+	# 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
+endef
Why not install the init script unconditionally like you did in vsftpd?

The same comment goes for the input-event-daemon, netatalk, and gpsd patches in this series.

baruch

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 -

Thomas Petazzoni

author

2014-11-24 20:45 UTC #16 lore raw

PATCH 13/51 samba: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Baruch Siach

Dear Baruch Siach,

Quoted 11 lines · Baruch Siach

Hi Thomas,
package/samba/samba.mk ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) · line 177
Quoted 6 lines · Thomas Petazzoni
package/samba/samba.mk +6 -0
+define SAMBA_INSTALL_INIT_SYSV
+	# 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
+endef
Why not install the init script unconditionally like you did in vsftpd?

Well, when I saw how many packages were still installing init script (and other files) conditionally, I kind of changed my mind mid-way through the patch series, and therefore for the remaining patches decided to keep things as they were: keep the condition when it was there, and keep the direct installation with no condition when it was done this way.

We certainly need a decision about whether we want those conditions everywhere. Their role is to potentially allow the users to provide a custom version of those scripts (or configuration files) in the filesystem skeleton. I personally believe it's not a good idea, for two reasons:

* People should use a filesystem overlay and/or post-build script instead of a custom skeleton.

* Why would we install our own stuff conditionally, while the build system of all packages install things unconditionally, making it anyway impossible for a target skeleton to customize all files.

Peter, your call?

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Peter Korsgaard

2014-11-24 20:47 UTC #17 lore raw

PATCH 13/51 samba: use <pkg>_INSTALL_INIT_SYSV mechanism

Quoted 29 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Dear Baruch Siach,
Quoted 11 lines · Baruch Siach
Hi Thomas,
package/samba/samba.mk ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) · line 177
Quoted 6 lines · Thomas Petazzoni
package/samba/samba.mk +6 -0
+define SAMBA_INSTALL_INIT_SYSV
+	# 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
+endef
Why not install the init script unconditionally like you did in vsftpd?
Well, when I saw how many packages were still installing init script (and other files) conditionally, I kind of changed my mind mid-way through the patch series, and therefore for the remaining patches decided to keep things as they were: keep the condition when it was there, and keep the direct installation with no condition when it was done this way.
We certainly need a decision about whether we want those conditions everywhere. Their role is to potentially allow the users to provide a custom version of those scripts (or configuration files) in the filesystem skeleton. I personally believe it's not a good idea, for two reasons:

Quoted 8 lines

* People should use a filesystem overlay and/or post-build script instead of a custom skeleton.
* Why would we install our own stuff conditionally, while the build system of all packages install things unconditionally, making it anyway impossible for a target skeleton to customize all files.
Peter, your call?

Yes, I agree - Lets get rid of these legacy checks. Using a custom rootfs overlay / post-build script is a lot more flexible and robust.

Signature · 2 lines

Venlig hilsen,
Peter Korsgaard

Thomas Petazzoni

author

2014-11-23 20:38 UTC #18 lore raw

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

In reply to Thomas Petazzoni

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/input-event-daemon/input-event-daemon.mk | 3 +++
 1 file changed, 3 insertions(+)

package/input-event-daemon/input-event-daemon.mk +3 -0

index 534fe90..bceefc7 100644
@@ -21,6 +21,9 @@ 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
+endef
+
+define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSV
 	[ -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

Signature · 1 line

2.1.0

Thomas Petazzoni

author

2014-11-23 20:38 UTC #19 lore raw

PATCH 15/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #20 lore raw

PATCH 16/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #21 lore raw

PATCH 17/51 netatalk: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/netatalk/netatalk.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

package/netatalk/netatalk.mk +1 -3

index 5ea55c2..a6c2e69 100644
@@ -50,12 +50,10 @@ else
 	NETATALK_CONF_OPTS += --disable-cups
 endif
 
-define NETATALK_INSTALL_EXTRA_FILES
+define NETATALK_INSTALL_INIT_SYSV
 	[ -f $(TARGET_DIR)/etc/init.d/S50netatalk ] || \
 		$(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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #22 lore raw

PATCH 18/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #23 lore raw

PATCH 19/51 gpsd: use <pkg>_INSTALL_INIT_SYSV mechanism

In reply to Thomas Petazzoni

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/gpsd/gpsd.mk | 3 +++
 1 file changed, 3 insertions(+)

package/gpsd/gpsd.mk +3 -0

index 7dc27e8..f0045e0 100644
@@ -206,6 +206,9 @@ define GPSD_INSTALL_TARGET_CMDS
 		$(SCONS) \
 		$(GPSD_SCONS_OPTS) \
 		install)
+endef
+
+define GPSD_INSTALL_INIT_SYSV
 	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; \

Signature · 1 line

2.1.0

Thomas Petazzoni

author

2014-11-23 20:38 UTC #24 lore raw

PATCH 20/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #25 lore raw

PATCH 21/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #26 lore raw

PATCH 22/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #27 lore raw

PATCH 23/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #28 lore raw

PATCH 24/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #29 lore raw

PATCH 25/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #30 lore raw

PATCH 26/51 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

Thomas Petazzoni

author

2014-11-23 20:38 UTC #31 lore raw

PATCH 27/51 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 7061bdb..4ab4e1f 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #32 lore raw

PATCH 28/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #33 lore raw

PATCH 29/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #34 lore raw

PATCH 30/51 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 cd43b01..f431035 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #35 lore raw

PATCH 31/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #36 lore raw

PATCH 32/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #37 lore raw

PATCH 33/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #38 lore raw

PATCH 34/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #39 lore raw

PATCH 35/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #40 lore raw

PATCH 36/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #41 lore raw

PATCH 37/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #42 lore raw

PATCH 38/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #43 lore raw

PATCH 39/51 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 db0d8a9..8901d23 100644
@@ -102,7 +102,7 @@ endif
 define COREUTILS_POST_INSTALL
 	# some things go in root rather than usr
 	for f in $(COREUTILS_BIN_PROGS); do \
-		mv -f $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
+		mv -f $(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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #44 lore raw

PATCH 40/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #45 lore raw

PATCH 41/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #46 lore raw

PATCH 42/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #47 lore raw

PATCH 43/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #48 lore raw

PATCH 44/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #49 lore raw

PATCH 45/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #50 lore raw

PATCH 46/51 live555: add error handling to for loop

In reply to Thomas Petazzoni

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/live555/live555.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

package/live555/live555.mk +4 -4

index e933faa..a15aca8 100644
@@ -49,17 +49,17 @@ LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2
 
 define LIVE555_INSTALL_STAGING_CMDS
 	for i in $(LIVE555_HEADERS_TO_INSTALL); do \
-		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
-		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i` && \
+		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i` || exit 1 \
 	done; \
 	for i in $(LIVE555_LIBS_TO_INSTALL); do \
-		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i` || exit 1 \
 	done
 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

Baruch Siach

2014-11-24 05:25 UTC #51 lore raw

PATCH 46/51 live555: add error handling to for loop

Hi Thomas,

Quoted 13 lines · Thomas Petazzoni

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/live555/live555.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

package/live555/live555.mk +0 -0

index e933faa..a15aca8 100644
@@ -49,17 +49,17 @@ LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2
 
 define LIVE555_INSTALL_STAGING_CMDS
 	for i in $(LIVE555_HEADERS_TO_INSTALL); do \

package/live555/live555.mk LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2 · line 58

Quoted 10 lines

package/live555/live555.mk +3 -3

-		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
-		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i` && \
+		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i` || exit 1 \
 	done; \
 	for i in $(LIVE555_LIBS_TO_INSTALL); do \
-		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i` || exit 1 \
 	done
 endef

Both 'for' loop in LIVE555_INSTALL_STAGING_CMDS were removed in next.

package/live555/live555.mk LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2 · line 64

Quoted 7 lines

package/live555/live555.mk +1 -1

 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

This one is still there in next.

baruch

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 -

Thomas Petazzoni

author

2014-11-24 20:42 UTC #52 lore raw

PATCH 46/51 live555: add error handling to for loop

Dear Baruch Siach,

Quoted 6 lines · Baruch Siach

Quoted 6 lines

define LIVE555_INSTALL_STAGING_CMDS

package/live555/live555.mk +2 -2

 	for i in $(LIVE555_HEADERS_TO_INSTALL); do \
-		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
-		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i` && \
+		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i` || exit 1 \

Quoted 8 lines

package/live555/live555.mk LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2 · line 58
Quoted 6 lines
package/live555/live555.mk +1 -1
 	done; \
 	for i in $(LIVE555_LIBS_TO_INSTALL); do \
-		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i` || exit 1 \
 	done
 endef
Both 'for' loop in LIVE555_INSTALL_STAGING_CMDS were removed in next.

Ah right, for this patch I'll have to rebase on next. Thanks for noticing!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

author

2014-11-23 20:39 UTC #53 lore raw

PATCH 47/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #54 lore raw

PATCH 48/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #55 lore raw

PATCH 49/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #56 lore raw

PATCH 50/51 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

Thomas Petazzoni

author

2014-11-23 20:39 UTC #57 lore raw

PATCH 51/51 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