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

From: James Hilliard <james.hilliard1@gmail.com>
To: buildroot@buildroot.org
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>,
	Gary Bisson <bisson.gary@gmail.com>,
	Alexander Clouter <alex+buildroot@digriz.org.uk>,
	Sergio Prado <sergio.prado@e-labworks.com>,
	Sergey Matyukevich <geomatsi@gmail.com>,
	Bernd Kuhls <bernd@kuhls.net>,
	Brandon Maier <brandon.maier@collins.com>,
	"Alvaro G . M" <alvaro.gamez@hazent.com>,
	Paul Cercueil <paul@crapouillou.net>,
	Refik Tuzakli <tuzakli.refik@gmail.com>,
	James Hilliard <james.hilliard1@gmail.com>,
	Doug Kehn <rdkehn@gmail.com>,
	Spenser Gilliland <spenser@gillilanding.com>,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	Marcus Hoffmann <bubu@bubu1.eu>,
	Pascal de Bruijn <p.debruijn@unilogic.nl>
Subject: [Buildroot] [PATCH 21/40] package/openssh: preserve /usr/sbin symlink
Date: Wed,  6 May 2026 16:33:22 -0600	[thread overview]
Message-ID: <20260506223341.1759760-21-james.hilliard1@gmail.com> (raw)
In-Reply-To: <20260506223341.1759760-1-james.hilliard1@gmail.com>

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
