Misc package improvements

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

---
 package/busybox/busybox.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

package/busybox/busybox.mk +0 -0

index f0fa851..eb2f3f1 100644

package/busybox/busybox.mk +0 -0

 	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
 	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 endef

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

On 2014-11-30 15:17 +0100, Thomas Petazzoni spake thusly:

Quoted 5 lines

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

---
 package/busybox/busybox.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Quoted 5 lines

package/busybox/busybox.mk +0 -0

index f0fa851..eb2f3f1 100644

package/busybox/busybox.mk define BUSYBOX_INSTALL_TARGET_CMDS · line 225

Quoted 9 lines

package/busybox/busybox.mk +4 -1

@@ -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)

The installation of the script is stil conditional:

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 +0 -0

index 0189597..dd60809 100644

package/portmap/portmap.mk +0 -0

 endef
 
 $(eval $(generic-package))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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 +0 -0

index 0189597..dd60809 100644

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 +0 -0

index dc56261..ac2963e 100644

package/stunnel/stunnel.mk +5 -1

 		$(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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

On 2014-11-30 15:17 +0100, Thomas Petazzoni spake thusly:

Quoted 13 lines

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 +0 -0

index dc56261..ac2963e 100644

package/stunnel/stunnel.mk else · line 22

Quoted 7 lines

package/stunnel/stunnel.mk +1 -2

@@ -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 ] || \

What is the stance on removing those conditional installs? I thought we wanted to get rid oif all of them, in favour of using a post-build script or rootfs-overlay.

Can be done in a separate patch, maybe.

Otherwise, loks good:

Acked-by "Yann E. MORIN" <[email protected]>

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 +0 -0

index ce735bd..65dd84e 100644

package/proftpd/proftpd.mk +0 -0

 endef
 
 $(eval $(autotools-package))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

Also makes the installation of the 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 +0 -0

index ec8e6ec..92bbe4e 100644
@@ -176,17 +176,17 @@ ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION
 endif
 

package/samba/samba.mk +0 -0

 $(eval $(autotools-package))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Also makes the installation of the init script unconditional.

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

Also makes the installation of the 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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Also makes the installation of the init script unconditional.

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 +0 -0

index 522e790..aef051c 100644

package/nfs-utils/nfs-utils.mk +0 -3

 		$(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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

Also makes the installation of the 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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Also makes the installation of the init script unconditional.

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

Also makes the installation of the 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 +0 -0

index 7dc27e8..5092b38 100644
@@ -206,10 +206,11 @@ define GPSD_INSTALL_TARGET_CMDS
 		$(SCONS) \
 		$(GPSD_SCONS_OPTS) \

package/gpsd/gpsd.mk +0 -0

 endef
 
 define GPSD_INSTALL_STAGING_CMDS

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

package/gpsd/gpsd.mk define GPSD_INSTALL_TARGET_CMDS · line 213

Quoted 5 lines

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

package/gpsd/gpsd.mk +3 -0

+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

Unrelated to your patch, but since the variable is a plural DEVICES, I would expect to be able to set more than one device. In this case, what is the format of this devices list? Is it comma-separated? If so, the sed expression above would break, no?

(Cc-ing Simon and Gustavo, since they have contributed significantly to that package.)

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Also makes the installation of the init script unconditional.

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 +0 -0

index 816a25e..2f746d0 100644

package/tftpd/tftpd.mk +0 -0

 endef
 
 $(eval $(autotools-package))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

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

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

package/openvpn/openvpn.mk +0 -0

index e0dba35..68f7d97 100644

package/openvpn/openvpn.mk +0 -0

 		$(TARGET_DIR)/etc/init.d/S60openvpn
 endef

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Suddenly, I realise that some packages use 755 while others use 0755.

I don't care which we use (even though I have a slight preference for 0755), but we should have some coherence across all packages.

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 5448251..1eedcbc 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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 +0 -1

-	$(INSTALL) -D $(@D)/wipe.1 $(TARGET_DIR)/usr/share/man/man1/wipe.1
 endef
 
 $(eval $(autotools-package))

Signature · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Quoted 8 lines

package/wipe/wipe.mk +0 -0

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

Maybe this should include -m 0755 as well?

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 +0 -0

index b0e4caf..7235ebb 100644

package/ndisc6/ndisc6.mk +1 -3

-		$(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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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]>

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

---
 package/coreutils/coreutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/coreutils/coreutils.mk +0 -0

index 391d2cd..fa2db04 100644

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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 · 6 lines

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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