[Buildroot] [PATCH 01/40] package/arptables: preserve /usr/sbin symlink

[Buildroot] [PATCH 01/40] package/arptables: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/arptables/arptables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
index 320a33bb3c..ec65201c86 100644
--- a/package/arptables/arptables.mk
+++ b/package/arptables/arptables.mk
@@ -15,7 +15,7 @@ define ARPTABLES_BUILD_CMDS
 endef
 
 define ARPTABLES_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 -D $(@D)/arptables-legacy \
+	$(INSTALL) -m 755 $(@D)/arptables-legacy \
 		$(TARGET_DIR)/usr/sbin/arptables-legacy
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 02/40] package/babeld: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/babeld/babeld.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/babeld/babeld.mk b/package/babeld/babeld.mk
index e9d20111f9..7845178ded 100644
--- a/package/babeld/babeld.mk
+++ b/package/babeld/babeld.mk
@@ -14,7 +14,7 @@ define BABELD_BUILD_CMDS
 endef
 
 define BABELD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 755 $(@D)/babeld $(TARGET_DIR)/usr/sbin/babeld
+	$(INSTALL) -m 755 $(@D)/babeld $(TARGET_DIR)/usr/sbin/babeld
 endef
 
 define BABELD_INSTALL_INIT_SYSV
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 03/40] package/bonnie: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/bonnie/bonnie.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
index e5c8640d39..6f48f38cdc 100644
--- a/package/bonnie/bonnie.mk
+++ b/package/bonnie/bonnie.mk
@@ -11,8 +11,8 @@ BONNIE_LICENSE = GPL-2.0
 BONNIE_LICENSE_FILES = copyright.txt
 
 define BONNIE_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 755 $(@D)/bonnie++ $(TARGET_DIR)/usr/sbin/bonnie++
-	$(INSTALL) -D -m 755 $(@D)/zcav $(TARGET_DIR)/usr/sbin/zcav
+	$(INSTALL) -m 755 $(@D)/bonnie++ $(TARGET_DIR)/usr/sbin/bonnie++
+	$(INSTALL) -m 755 $(@D)/zcav $(TARGET_DIR)/usr/sbin/zcav
 endef
 
 $(eval $(autotools-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 04/40] package/darkhttpd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/darkhttpd/darkhttpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk
index ca8495f5c4..0010f58c28 100644
--- a/package/darkhttpd/darkhttpd.mk
+++ b/package/darkhttpd/darkhttpd.mk
@@ -15,7 +15,7 @@ define DARKHTTPD_BUILD_CMDS
 endef
 
 define DARKHTTPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/darkhttpd \
+	$(INSTALL) -m 0755 $(@D)/darkhttpd \
 		$(TARGET_DIR)/usr/sbin/darkhttpd
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 05/40] package/dcron: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/dcron/dcron.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dcron/dcron.mk b/package/dcron/dcron.mk
index f0c3efbf8f..7e70e69c14 100644
--- a/package/dcron/dcron.mk
+++ b/package/dcron/dcron.mk
@@ -14,7 +14,7 @@ define DCRON_BUILD_CMDS
 endef
 
 define DCRON_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m0700 $(@D)/crond $(TARGET_DIR)/usr/sbin/crond
+	$(INSTALL) -m0700 $(@D)/crond $(TARGET_DIR)/usr/sbin/crond
 	$(INSTALL) -D -m4755 $(@D)/crontab $(TARGET_DIR)/usr/bin/crontab
 	$(INSTALL) -D -m0644 $(@D)/extra/root.crontab $(TARGET_DIR)/etc/cron.d/system
 	# Busybox provides run-parts, so there is no need to use nor install provided run-cron
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 06/40] package/ebtables: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/ebtables/ebtables.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 09a9f4ba7d..42edfde557 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -13,7 +13,7 @@ EBTABLES_SELINUX_MODULES = iptables
 
 ifeq ($(BR2_PACKAGE_EBTABLES_UTILS_SAVE),y)
 define EBTABLES_INSTALL_TARGET_UTILS_SAVE
-	$(INSTALL) -m 0755 -D $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save
+	$(INSTALL) -m 0755 $(@D)/ebtables-save.sh $(TARGET_DIR)/usr/sbin/ebtables-legacy-save
 endef
 EBTABLES_POST_INSTALL_TARGET_HOOKS += EBTABLES_INSTALL_TARGET_UTILS_SAVE
 else
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 07/40] package/fbset: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/fbset/fbset.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 526cba40d3..7010560248 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -15,7 +15,7 @@ define FBSET_BUILD_CMDS
 endef
 
 define FBSET_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 755 $(@D)/fbset $(TARGET_DIR)/usr/sbin/fbset
+	$(INSTALL) -m 755 $(@D)/fbset $(TARGET_DIR)/usr/sbin/fbset
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 08/40] package/fmc: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/fmc/fmc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk
index d88fa9614d..b0fd0df38f 100644
--- a/package/fmc/fmc.mk
+++ b/package/fmc/fmc.mk
@@ -32,7 +32,7 @@ define FMC_BUILD_CMDS
 endef
 
 define FMC_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/source/fmc $(TARGET_DIR)/usr/sbin/fmc
+	$(INSTALL) -m 0755 $(@D)/source/fmc $(TARGET_DIR)/usr/sbin/fmc
 	cp -dpfr $(@D)/etc/fmc $(TARGET_DIR)/etc/
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 09/40] package/freescale-imx/imx-m4fwloader: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
index 320d5dc617..da7f4af221 100644
--- a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
+++ b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
@@ -15,7 +15,7 @@ define IMX_M4FWLOADER_BUILD_CMDS
 endef
 
 define IMX_M4FWLOADER_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 755 $(@D)/imx-m4fwloader \
+	$(INSTALL) -m 755 $(@D)/imx-m4fwloader \
 		$(TARGET_DIR)/usr/sbin/imx-m4fwloader
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 10/40] package/gptfdisk: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/gptfdisk/gptfdisk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index b35899bf9b..cdb7bfb7ca 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -41,7 +41,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 || exit 1; \
+		$(INSTALL) -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \
 	done
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 11/40] package/hans: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/hans/hans.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hans/hans.mk b/package/hans/hans.mk
index 6d2b1dabe5..07ae336329 100644
--- a/package/hans/hans.mk
+++ b/package/hans/hans.mk
@@ -14,7 +14,7 @@ define HANS_BUILD_CMDS
 endef
 
 define HANS_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 -D $(@D)/hans $(TARGET_DIR)/usr/sbin/hans
+	$(INSTALL) -m 755 $(@D)/hans $(TARGET_DIR)/usr/sbin/hans
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 12/40] package/hostapd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/hostapd/hostapd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index d83b574fad..76cec9b31d 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -149,7 +149,7 @@ define HOSTAPD_BUILD_CMDS
 endef
 
 define HOSTAPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
+	$(INSTALL) -m 0755 $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
 		$(TARGET_DIR)/usr/sbin/hostapd
 	$(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \
 		$(TARGET_DIR)/usr/bin/hostapd_cli
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 13/40] package/irda-utils: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/irda-utils/irda-utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index 18a3e58604..031a024486 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -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 || exit 1; \
+		$(INSTALL) -m 0755 $(@D)/$$i/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \
 	done
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 14/40] package/libpri: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/libpri/libpri.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libpri/libpri.mk b/package/libpri/libpri.mk
index 48a1019210..4b359008ba 100644
--- a/package/libpri/libpri.mk
+++ b/package/libpri/libpri.mk
@@ -46,7 +46,7 @@ endef
 
 define LIBPRI_INSTALL_TARGET_CMDS
 	$(foreach u,$(LIBPRI_UTILS),\
-		$(INSTALL) -D -m 0755 $(@D)/$(u) $(TARGET_DIR)/usr/sbin/$(u)$(sep))
+		$(INSTALL) -m 0755 $(@D)/$(u) $(TARGET_DIR)/usr/sbin/$(u)$(sep))
 	$(call LIBPRI_INSTALL_SO,$(TARGET_DIR))
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 15/40] package/libss7: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/libss7/libss7.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk
index faa147c78e..6baed4cf28 100644
--- a/package/libss7/libss7.mk
+++ b/package/libss7/libss7.mk
@@ -49,7 +49,7 @@ endef
 
 define LIBSS7_INSTALL_TARGET_CMDS
 	$(foreach u,$(LIBSS7_UTILS),\
-		$(INSTALL) -D -m 0755 $(@D)/$(u) $(TARGET_DIR)/usr/sbin/$(u)$(sep))
+		$(INSTALL) -m 0755 $(@D)/$(u) $(TARGET_DIR)/usr/sbin/$(u)$(sep))
 	$(call LIBSS7_INSTALL_SO,$(TARGET_DIR))
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 16/40] package/linux-tools: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/linux-tools/linux-tool-hv.mk.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-tools/linux-tool-hv.mk.in b/package/linux-tools/linux-tool-hv.mk.in
index e638fecfc6..0310d90c88 100644
--- a/package/linux-tools/linux-tool-hv.mk.in
+++ b/package/linux-tools/linux-tool-hv.mk.in
@@ -40,7 +40,7 @@ endif
 
 define HV_INSTALL_TARGET_CMDS
 	$(foreach prog,$(HV_PROGS_y), \
-		$(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/hv/$(prog) \
+		$(INSTALL) -m 0755 $(LINUX_DIR)/tools/hv/$(prog) \
 			$(TARGET_DIR)/usr/sbin/$(HV_$(prog))
 	)
 	$(HV_KVP_HELPER)
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 17/40] package/mtd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/mtd/mtd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 2a625fccce..032c486c66 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -157,7 +157,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FSCKUBIFS)	+= fsck.ubifs
 
 define MTD_INSTALL_TARGET_CMDS
 	$(foreach f,$(MTD_TARGETS_y), \
-		$(INSTALL) -D -m 0755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(notdir $(f))
+		$(INSTALL) -m 0755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(notdir $(f))
 	)
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 18/40] package/nethogs: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/nethogs/nethogs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk
index 74387d7397..5a8d825565 100644
--- a/package/nethogs/nethogs.mk
+++ b/package/nethogs/nethogs.mk
@@ -15,7 +15,7 @@ define NETHOGS_BUILD_CMDS
 endef
 
 define NETHOGS_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin/nethogs
+	$(INSTALL) -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin/nethogs
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 19/40] package/noip: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/noip/noip.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/noip/noip.mk b/package/noip/noip.mk
index 8b57d82469..3918849ca2 100644
--- a/package/noip/noip.mk
+++ b/package/noip/noip.mk
@@ -20,7 +20,7 @@ define NOIP_BUILD_CMDS
 endef
 
 define NOIP_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/noip2 $(TARGET_DIR)/usr/sbin/noip2
+	$(INSTALL) -m 0755 $(@D)/noip2 $(TARGET_DIR)/usr/sbin/noip2
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 20/40] package/odhcp6c: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/odhcp6c/odhcp6c.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/odhcp6c/odhcp6c.mk b/package/odhcp6c/odhcp6c.mk
index 92688b7237..7c5cddfbb0 100644
--- a/package/odhcp6c/odhcp6c.mk
+++ b/package/odhcp6c/odhcp6c.mk
@@ -12,7 +12,7 @@ ODHCP6C_LICENSE_FILES = COPYING
 ODHCP6C_DEPENDENCIES = libubox
 
 define ODHCP6C_INSTALL_SCRIPT
-	$(INSTALL) -m 0755 -D $(@D)/odhcp6c-example-script.sh \
+	$(INSTALL) -m 0755 $(@D)/odhcp6c-example-script.sh \
 		$(TARGET_DIR)/usr/sbin/odhcp6c-update
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 21/40] package/openssh: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/openssh/openssh.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 8f46d886dc..ae3ebdb320 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -117,7 +117,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSH_SERVER),y)
 define OPENSSH_INSTALL_SERVER_PROGRAMS
-	$(INSTALL) -D -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd
+	$(INSTALL) -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd
 	$(INSTALL) -D -m 0755 $(@D)/sshd-session $(TARGET_DIR)/usr/libexec/sshd-session
 	$(INSTALL) -D -m 0755 $(@D)/sftp-server $(TARGET_DIR)/usr/libexec/sftp-server
 	$(INSTALL) -D -m 0755 $(@D)/sshd-auth $(TARGET_DIR)/usr/libexec/sshd-auth
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 22/40] package/p910nd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/p910nd/p910nd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/p910nd/p910nd.mk b/package/p910nd/p910nd.mk
index fea8aafd50..d16fc68fa2 100644
--- a/package/p910nd/p910nd.mk
+++ b/package/p910nd/p910nd.mk
@@ -14,7 +14,7 @@ define P910ND_BUILD_CMDS
 endef
 
 define P910ND_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/p910nd $(TARGET_DIR)/usr/sbin/p910nd
+	$(INSTALL) -m 0755 $(@D)/p910nd $(TARGET_DIR)/usr/sbin/p910nd
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 23/40] package/parprouted: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/parprouted/parprouted.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/parprouted/parprouted.mk b/package/parprouted/parprouted.mk
index a0425d92cd..7e2343fab0 100644
--- a/package/parprouted/parprouted.mk
+++ b/package/parprouted/parprouted.mk
@@ -14,7 +14,7 @@ define PARPROUTED_BUILD_CMDS
 endef
 
 define PARPROUTED_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/parprouted $(TARGET_DIR)/usr/sbin/parprouted
+	$(INSTALL) -m 0755 $(@D)/parprouted $(TARGET_DIR)/usr/sbin/parprouted
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 24/40] package/pptp-linux: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/pptp-linux/pptp-linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index b6c740e710..b03a8dd41f 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -19,7 +19,7 @@ define PPTP_LINUX_BUILD_CMDS
 endef
 
 define PPTP_LINUX_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/pptp $(TARGET_DIR)/usr/sbin/pptp
+	$(INSTALL) -m 0755 $(@D)/pptp $(TARGET_DIR)/usr/sbin/pptp
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 25/40] package/proftpd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/proftpd/proftpd.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index ba026f5dd1..8643cf3979 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -126,16 +126,16 @@ PROFTPD_MAKE = $(MAKE1)
 ifeq ($(BR2_PACKAGE_PERL),y)
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_QUOTATAB),y)
 define PROFTPD_INSTALL_FTPQUOTA
-	$(INSTALL) -D -m 0755 $(@D)/contrib/ftpquota $(TARGET_DIR)/usr/sbin/ftpquota
+	$(INSTALL) -m 0755 $(@D)/contrib/ftpquota $(TARGET_DIR)/usr/sbin/ftpquota
 endef
 endif
 define PROFTPD_INSTALL_FTPASSWD
-	$(INSTALL) -D -m 0755 $(@D)/contrib/ftpasswd $(TARGET_DIR)/usr/sbin/ftpasswd
+	$(INSTALL) -m 0755 $(@D)/contrib/ftpasswd $(TARGET_DIR)/usr/sbin/ftpasswd
 endef
 endif
 
 define PROFTPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
+	$(INSTALL) -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
 	$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf
 	$(SED) 's/^\(Group\s\+\)nogroup/\1nobody/' $(TARGET_DIR)/etc/proftpd.conf
 	$(PROFTPD_INSTALL_FTPQUOTA)
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 26/40] package/ptpd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/ptpd/ptpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ptpd/ptpd.mk b/package/ptpd/ptpd.mk
index 49587231e0..3ce994569a 100644
--- a/package/ptpd/ptpd.mk
+++ b/package/ptpd/ptpd.mk
@@ -14,7 +14,7 @@ define PTPD_BUILD_CMDS
 endef
 
 define PTPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 -D $(@D)/src/ptpd $(TARGET_DIR)/usr/sbin/ptpd
+	$(INSTALL) -m 755 $(@D)/src/ptpd $(TARGET_DIR)/usr/sbin/ptpd
 endef
 
 define PTPD_INSTALL_INIT_SYSV
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 27/40] package/restorecond: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/restorecond/restorecond.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk
index e8f432c88d..eff88b3f0a 100644
--- a/package/restorecond/restorecond.mk
+++ b/package/restorecond/restorecond.mk
@@ -41,7 +41,7 @@ endef
 define RESTORECOND_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0644 -D $(@D)/restorecond.conf $(TARGET_DIR)/etc/selinux/restorecond.conf
 	$(INSTALL) -m 0644 -D $(@D)/restorecond_user.conf $(TARGET_DIR)/etc/selinux/restorecond_user.conf
-	$(INSTALL) -m 0755 -D $(@D)/restorecond $(TARGET_DIR)/usr/sbin/restorecond
+	$(INSTALL) -m 0755 $(@D)/restorecond $(TARGET_DIR)/usr/sbin/restorecond
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 28/40] package/spidev_test: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/spidev_test/spidev_test.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk
index bd138b0142..ba097fc103 100644
--- a/package/spidev_test/spidev_test.mk
+++ b/package/spidev_test/spidev_test.mk
@@ -44,7 +44,7 @@ define SPIDEV_TEST_BUILD_CMDS
 endef
 
 define SPIDEV_TEST_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 755 $(@D)/spidev_test \
+	$(INSTALL) -m 755 $(@D)/spidev_test \
 		$(TARGET_DIR)/usr/sbin/spidev_test
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 29/40] package/sredird: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/sredird/sredird.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sredird/sredird.mk b/package/sredird/sredird.mk
index 723c10acd6..68f276a8ae 100644
--- a/package/sredird/sredird.mk
+++ b/package/sredird/sredird.mk
@@ -14,7 +14,7 @@ define SREDIRD_BUILD_CMDS
 endef
 
 define SREDIRD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/sredird $(TARGET_DIR)/usr/sbin/sredird
+	$(INSTALL) -m 0755 $(@D)/sredird $(TARGET_DIR)/usr/sbin/sredird
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 30/40] package/tftpd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/tftpd/tftpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 73ac7006a4..05ee31790b 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -19,7 +19,7 @@ TFTPD_AUTORECONF_OPTS = --include=$(@D)/autoconf/m4
 
 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)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd
 endef
 
 define TFTPD_INSTALL_INIT_SYSV
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 31/40] package/ti-gfx: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/ti-gfx/ti-gfx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk
index 2728572776..b67162dfa9 100644
--- a/package/ti-gfx/ti-gfx.mk
+++ b/package/ti-gfx/ti-gfx.mk
@@ -165,7 +165,7 @@ define TI_GFX_INSTALL_BINS_CMDS
 			$(TARGET_DIR)/usr/bin/$(bin)
 	)
 	$(if $(BR2_PACKAGE_TI_GFX_DEBUG),
-		$(INSTALL) -D -m 0755 package/ti-gfx/esrev.sh \
+		$(INSTALL) -m 0755 package/ti-gfx/esrev.sh \
 			$(TARGET_DIR)/usr/sbin/esrev
 	)
 endef
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 32/40] package/ti-uim: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/ti-uim/ti-uim.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ti-uim/ti-uim.mk b/package/ti-uim/ti-uim.mk
index 8b1678f6b1..aac82581d8 100644
--- a/package/ti-uim/ti-uim.mk
+++ b/package/ti-uim/ti-uim.mk
@@ -14,7 +14,7 @@ define TI_UIM_BUILD_CMDS
 endef
 
 define TI_UIM_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/uim \
+	$(INSTALL) -m 0755 $(@D)/uim \
 		$(TARGET_DIR)/usr/sbin/uim
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 33/40] package/triggerhappy: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/triggerhappy/triggerhappy.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk
index bb30e7ce1d..20ac812661 100644
--- a/package/triggerhappy/triggerhappy.mk
+++ b/package/triggerhappy/triggerhappy.mk
@@ -29,8 +29,8 @@ endif
 
 define TRIGGERHAPPY_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/etc/triggerhappy/triggers.d
-	$(INSTALL) -D -m 0755 $(@D)/thd $(TARGET_DIR)/usr/sbin/thd
-	$(INSTALL) -D -m 0755 $(@D)/th-cmd $(TARGET_DIR)/usr/sbin/th-cmd
+	$(INSTALL) -m 0755 $(@D)/thd $(TARGET_DIR)/usr/sbin/thd
+	$(INSTALL) -m 0755 $(@D)/th-cmd $(TARGET_DIR)/usr/sbin/th-cmd
 	$(TRIGGERHAPPY_INSTALL_UDEV_RULE)
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 34/40] package/tunctl: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/tunctl/tunctl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/tunctl/tunctl.mk b/package/tunctl/tunctl.mk
index 0d7b88dfa5..28db576fef 100644
--- a/package/tunctl/tunctl.mk
+++ b/package/tunctl/tunctl.mk
@@ -15,7 +15,7 @@ define TUNCTL_BUILD_CMDS
 endef
 
 define TUNCTL_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/tunctl $(TARGET_DIR)/usr/sbin/tunctl
+	$(INSTALL) -m 0755 $(@D)/tunctl $(TARGET_DIR)/usr/sbin/tunctl
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 35/40] package/uboot-tools: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/uboot-tools/uboot-tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index fa0b6aba78..89d2ec38ea 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -92,14 +92,14 @@ endif
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
 define UBOOT_TOOLS_INSTALL_FWPRINTENV
-	$(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
+	$(INSTALL) -m 0755 $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
 	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE),y)
 define UBOOT_TOOLS_INSTALL_DUMPIMAGE
-	$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(TARGET_DIR)/usr/sbin/dumpimage
+	$(INSTALL) -m 0755 $(@D)/tools/dumpimage $(TARGET_DIR)/usr/sbin/dumpimage
 endef
 endif
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 36/40] package/udpcast: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/udpcast/udpcast.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index e087f2dbb2..1393e21fbd 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -16,7 +16,7 @@ UDPCAST_MAKE_OPTS = $(UDPCAST_TARGETS)
 
 define UDPCAST_INSTALL_TARGET_CMDS
 	$(foreach f,$(UDPCAST_TARGETS),\
-		$(INSTALL) -D -m 755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(f)
+		$(INSTALL) -m 755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(f)
 	)
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 37/40] package/umtprd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/umtprd/umtprd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk
index 1a2b387219..bde6a2e0cc 100644
--- a/package/umtprd/umtprd.mk
+++ b/package/umtprd/umtprd.mk
@@ -14,7 +14,7 @@ define UMTPRD_BUILD_CMDS
 endef
 
 define UMTPRD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/umtprd $(TARGET_DIR)/usr/sbin/umtprd
+	$(INSTALL) -m 0755 $(@D)/umtprd $(TARGET_DIR)/usr/sbin/umtprd
 endef
 
 $(eval $(generic-package))
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 38/40] package/unscd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/unscd/unscd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/unscd/unscd.mk b/package/unscd/unscd.mk
index 94b46460f6..00198e56e3 100644
--- a/package/unscd/unscd.mk
+++ b/package/unscd/unscd.mk
@@ -20,7 +20,7 @@ define UNSCD_BUILD_CMDS
 endef
 
 define UNSCD_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 -D $(@D)/nscd $(TARGET_DIR)/usr/sbin/nscd
+	$(INSTALL) -m 755 $(@D)/nscd $(TARGET_DIR)/usr/sbin/nscd
 	$(INSTALL) -m 600 -D package/unscd/nscd.conf $(TARGET_DIR)/etc/nscd.conf
 endef
 
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 39/40] package/vsftpd: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/vsftpd/vsftpd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 14c1b6be13..2f57a2f438 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -67,7 +67,7 @@ endef
 # 500 OOPS: vsftpd: refusing to run with writable root inside chroot()
 # That's why we have to adjust the permissions of /home/ftp
 define VSFTPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd
+	$(INSTALL) -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd
 	test -f $(TARGET_DIR)/etc/vsftpd.conf || \
 		$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
 			$(TARGET_DIR)/etc/vsftpd.conf
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 40/40] package/wpa_supplicant: preserve /usr/sbin symlink

[James Hilliard]

With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
Using install -D for files below $(TARGET_DIR)/usr/sbin can create
the parent directory path and replace that symlink with a real
directory.

With per-package directories, this can later make rsync fail when a
package target directory contains a non-empty usr/sbin directory and
the skeleton provides usr/sbin -> bin.

The skeleton dependency has already created /usr/sbin, either as a
directory or as the merged-bin symlink, so use plain install and let it
follow the existing path.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/wpa_supplicant/wpa_supplicant.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index fe4bc34d55..a0f7922f24 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -245,14 +245,14 @@ endef
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y)
 define WPA_SUPPLICANT_INSTALL_CLI
-	$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_cli \
+	$(INSTALL) -m 0755 $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_cli \
 		$(TARGET_DIR)/usr/sbin/wpa_cli
 endef
 endif
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y)
 define WPA_SUPPLICANT_INSTALL_PASSPHRASE
-	$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_passphrase \
+	$(INSTALL) -m 0755 $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_passphrase \
 		$(TARGET_DIR)/usr/sbin/wpa_passphrase
 endef
 endif
@@ -281,7 +281,7 @@ endef
 endif
 
 define WPA_SUPPLICANT_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \
+	$(INSTALL) -m 0755 $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \
 		$(TARGET_DIR)/usr/sbin/wpa_supplicant
 	$(INSTALL) -m 644 -D package/wpa_supplicant/wpa_supplicant.conf \
 		$(TARGET_DIR)/etc/wpa_supplicant.conf
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 35/40] package/uboot-tools: preserve /usr/sbin symlink

[Ferdinand Bachmann]

[-- Attachment #1.1: Type: text/plain, Size: 2513 bytes --]

Hi James!

-D normally doesn't replace symlinks with directories, but Ubuntu 26.04
ships with Rust uutils instead of GNU coreutils, which has a bug in
`install` that causes this:

https://github.com/uutils/coreutils/issues/12166

This also affects lots of other packages (e.g. lvm2) and patching every
single one of them to not use `install -D` is probably out of the question.

Also, can you look at my patch for issue 173 (
https://gitlab.com/buildroot.org/buildroot/-/work_items/173)? uboot-tools
currently silently builds without FIT_SIGNATURE support even if enabled.
This should be fixed.

Best regards,
Ferdinand Bachmann

On Thu, 7 May 2026 at 00:34, James Hilliard <james.hilliard1@gmail.com>
wrote:

> With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
> Using install -D for files below $(TARGET_DIR)/usr/sbin can create
> the parent directory path and replace that symlink with a real
> directory.
>
> With per-package directories, this can later make rsync fail when a
> package target directory contains a non-empty usr/sbin directory and
> the skeleton provides usr/sbin -> bin.
>
> The skeleton dependency has already created /usr/sbin, either as a
> directory or as the merged-bin symlink, so use plain install and let it
> follow the existing path.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/uboot-tools/uboot-tools.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/
> uboot-tools.mk
> index fa0b6aba78..89d2ec38ea 100644
> --- a/package/uboot-tools/uboot-tools.mk
> +++ b/package/uboot-tools/uboot-tools.mk
> @@ -92,14 +92,14 @@ endif
>
>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
>  define UBOOT_TOOLS_INSTALL_FWPRINTENV
> -       $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv
> $(TARGET_DIR)/usr/sbin/fw_printenv
> +       $(INSTALL) -m 0755 $(@D)/tools/env/fw_printenv
> $(TARGET_DIR)/usr/sbin/fw_printenv
>         ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
>  endef
>  endif
>
>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE),y)
>  define UBOOT_TOOLS_INSTALL_DUMPIMAGE
> -       $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage
> $(TARGET_DIR)/usr/sbin/dumpimage
> +       $(INSTALL) -m 0755 $(@D)/tools/dumpimage
> $(TARGET_DIR)/usr/sbin/dumpimage
>  endef
>  endif
>
> --
> 2.53.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
>

[-- Attachment #1.2: Type: text/html, Size: 3845 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 35/40] package/uboot-tools: preserve /usr/sbin symlink

[Ferdinand Bachmann]

[-- Attachment #1.1: Type: text/plain, Size: 2908 bytes --]

Edit: I think there was a misunderstanding; I thought you were the
maintainer for uboot-tools for a second. Sorry about that.

Added "Manuel Diener" who did the last version bump commit for uboot-tools
to the thread.

On Fri, 8 May 2026 at 11:57, Ferdinand Bachmann <ferdinand.bachmann@go-e.com>
wrote:

> Hi James!
>
> -D normally doesn't replace symlinks with directories, but Ubuntu 26.04
> ships with Rust uutils instead of GNU coreutils, which has a bug in
> `install` that causes this:
>
> https://github.com/uutils/coreutils/issues/12166
>
> This also affects lots of other packages (e.g. lvm2) and patching every
> single one of them to not use `install -D` is probably out of the question.
>
> Also, can you look at my patch for issue 173 (
> https://gitlab.com/buildroot.org/buildroot/-/work_items/173)? uboot-tools
> currently silently builds without FIT_SIGNATURE support even if enabled.
> This should be fixed.
>
> Best regards,
> Ferdinand Bachmann
>
> On Thu, 7 May 2026 at 00:34, James Hilliard <james.hilliard1@gmail.com>
> wrote:
>
>> With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
>> Using install -D for files below $(TARGET_DIR)/usr/sbin can create
>> the parent directory path and replace that symlink with a real
>> directory.
>>
>> With per-package directories, this can later make rsync fail when a
>> package target directory contains a non-empty usr/sbin directory and
>> the skeleton provides usr/sbin -> bin.
>>
>> The skeleton dependency has already created /usr/sbin, either as a
>> directory or as the merged-bin symlink, so use plain install and let it
>> follow the existing path.
>>
>> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>> ---
>>  package/uboot-tools/uboot-tools.mk | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/
>> uboot-tools.mk
>> index fa0b6aba78..89d2ec38ea 100644
>> --- a/package/uboot-tools/uboot-tools.mk
>> +++ b/package/uboot-tools/uboot-tools.mk
>> @@ -92,14 +92,14 @@ endif
>>
>>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
>>  define UBOOT_TOOLS_INSTALL_FWPRINTENV
>> -       $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv
>> $(TARGET_DIR)/usr/sbin/fw_printenv
>> +       $(INSTALL) -m 0755 $(@D)/tools/env/fw_printenv
>> $(TARGET_DIR)/usr/sbin/fw_printenv
>>         ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
>>  endef
>>  endif
>>
>>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE),y)
>>  define UBOOT_TOOLS_INSTALL_DUMPIMAGE
>> -       $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage
>> $(TARGET_DIR)/usr/sbin/dumpimage
>> +       $(INSTALL) -m 0755 $(@D)/tools/dumpimage
>> $(TARGET_DIR)/usr/sbin/dumpimage
>>  endef
>>  endif
>>
>> --
>> 2.53.0
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
>>
>

[-- Attachment #1.2: Type: text/html, Size: 4530 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 35/40] package/uboot-tools: preserve /usr/sbin symlink

[James Hilliard]

On Fri, May 8, 2026 at 3:57 AM Ferdinand Bachmann
<ferdinand.bachmann@go-e.com> wrote:
>
> Hi James!
>
> -D normally doesn't replace symlinks with directories, but Ubuntu 26.04 ships with Rust uutils instead of GNU coreutils, which has a bug in `install` that causes this:

Oh, that makes more sense, I had assumed it was due to merged bin
since the rsync error was basically the same as this:
https://github.com/buildroot/buildroot/commit/28694dcec72b11faca6e9d9371fb0f65c590de8b

I tested with the documented workaround on github and it seems to have
fixed the issue:
update-alternatives --install /usr/bin/install install /usr/bin/gnuinstall 100

>
> https://github.com/uutils/coreutils/issues/12166
>
> This also affects lots of other packages (e.g. lvm2) and patching every single one of them to not use `install -D` is probably out of the question.

Hmm, yeah, that's not ideal, not sure if we should still change the 40
I patched or not.

> Also, can you look at my patch for issue 173 (https://gitlab.com/buildroot.org/buildroot/-/work_items/173)? uboot-tools currently silently builds without FIT_SIGNATURE support even if enabled. This should be fixed.
>
> Best regards,
> Ferdinand Bachmann
>
> On Thu, 7 May 2026 at 00:34, James Hilliard <james.hilliard1@gmail.com> wrote:
>>
>> With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
>> Using install -D for files below $(TARGET_DIR)/usr/sbin can create
>> the parent directory path and replace that symlink with a real
>> directory.
>>
>> With per-package directories, this can later make rsync fail when a
>> package target directory contains a non-empty usr/sbin directory and
>> the skeleton provides usr/sbin -> bin.
>>
>> The skeleton dependency has already created /usr/sbin, either as a
>> directory or as the merged-bin symlink, so use plain install and let it
>> follow the existing path.
>>
>> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
>> ---
>>  package/uboot-tools/uboot-tools.mk | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
>> index fa0b6aba78..89d2ec38ea 100644
>> --- a/package/uboot-tools/uboot-tools.mk
>> +++ b/package/uboot-tools/uboot-tools.mk
>> @@ -92,14 +92,14 @@ endif
>>
>>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y)
>>  define UBOOT_TOOLS_INSTALL_FWPRINTENV
>> -       $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
>> +       $(INSTALL) -m 0755 $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv
>>         ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
>>  endef
>>  endif
>>
>>  ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE),y)
>>  define UBOOT_TOOLS_INSTALL_DUMPIMAGE
>> -       $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(TARGET_DIR)/usr/sbin/dumpimage
>> +       $(INSTALL) -m 0755 $(@D)/tools/dumpimage $(TARGET_DIR)/usr/sbin/dumpimage
>>  endef
>>  endif
>>
>> --
>> 2.53.0
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 01/40] package/arptables: preserve /usr/sbin symlink

[Romain Naour via buildroot]

Hello James, All,

Le 07/05/2026 à 00:33, James Hilliard a écrit :
> With BR2_ROOTFS_MERGED_BIN=y, /usr/sbin is a symlink to bin.
> Using install -D for files below $(TARGET_DIR)/usr/sbin can create
> the parent directory path and replace that symlink with a real
> directory.
> 
> With per-package directories, this can later make rsync fail when a
> package target directory contains a non-empty usr/sbin directory and
> the skeleton provides usr/sbin -> bin.

Maybe this is something we have to fix in the package infrastructure?

> 
> The skeleton dependency has already created /usr/sbin, either as a
> directory or as the merged-bin symlink, so use plain install and let it
> follow the existing path.

This should happen in the autobuilders when BR2_ROOTFS_MERGED_BIN and
BR2_PER_PACKAGE_DIRECTORIES are both set. Can you share a link to the issue?

I can't reproduce here with arptables package with BR2_ROOTFS_MERGED_BIN=y and
BR2_PER_PACKAGE_DIRECTORIES=y.

Best regards,
Romain

> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/arptables/arptables.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
> index 320a33bb3c..ec65201c86 100644
> --- a/package/arptables/arptables.mk
> +++ b/package/arptables/arptables.mk
> @@ -15,7 +15,7 @@ define ARPTABLES_BUILD_CMDS
>  endef
>  
>  define ARPTABLES_INSTALL_TARGET_CMDS
> -	$(INSTALL) -m 755 -D $(@D)/arptables-legacy \
> +	$(INSTALL) -m 755 $(@D)/arptables-legacy \
>  		$(TARGET_DIR)/usr/sbin/arptables-legacy
>  endef
>  

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot