git: 1cd151e7bdff - stable/14 - METALOG: Order keyword entries

The branch stable/14 has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=1cd151e7bdff43a5fcf560aeb8ec66b1793de4ce

commit 1cd151e7bdff43a5fcf560aeb8ec66b1793de4ce
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-01-26 20:19:44 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-02-03 02:30:22 +0000

    METALOG: Order keyword entries
    
    To facilitate comparison with mtree -C generated output, keep the
    keywords ordered.
    
    No functional change intended.
    
    Reviewed by:    imp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D54872
    
    (cherry picked from commit fe962e33d86f888b496b17251c8bedebf92be8ee)
---
 lib/libc/gen/Makefile.inc       | 6 +++---
 sys/conf/kmod.mk                | 2 +-
 sys/modules/Makefile            | 2 +-
 usr.sbin/services_mkdb/Makefile | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 6423091f48be..220453266d44 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -587,8 +587,8 @@ install-passwd: .PHONY
 	${PWD_MKDB_CMD} -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT) && defined(METALOG)
 	( \
-		echo ".${DISTBASE}/etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
-		echo ".${DISTBASE}/etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
-		echo ".${DISTBASE}/etc/passwd type=file mode=0644 uname=root gname=wheel"; \
+		echo ".${DISTBASE}/etc/pwd.db type=file uname=root gname=wheel mode=0644"; \
+		echo ".${DISTBASE}/etc/spwd.db type=file uname=root gname=wheel mode=0600"; \
+		echo ".${DISTBASE}/etc/passwd type=file uname=root gname=wheel mode=0644"; \
 	) | cat -l >> ${METALOG}
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 68b37e7efbff..84b7ccbb3ffa 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -383,7 +383,7 @@ afterinstall: _kldxref
 _kldxref: .PHONY
 	${KLDXREF_CMD} ${DESTDIR}${KMODDIR}
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file uname=root gname=wheel mode=0644" | \
 	    cat -l >> ${METALOG}
 .endif
 .endif
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index cca51592c7ca..dfcb31f74106 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -917,7 +917,7 @@ SUBDIR:= ${SUBDIR:N${reject}}
 afterinstall: .PHONY
 	${KLDXREF_CMD} ${DESTDIR}${KMODDIR}
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}${KMODDIR}/linker.hints type=file uname=root gname=wheel mode=0644" | \
 	    cat -l >> ${METALOG}
 .endif
 .endif
diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile
index 8d8e0f1c0626..6e61ff7b2a04 100644
--- a/usr.sbin/services_mkdb/Makefile
+++ b/usr.sbin/services_mkdb/Makefile
@@ -16,7 +16,7 @@ afterinstallconfig:
 	${SERVICES_MKDB_CMD} ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
 		${DESTDIR}/etc/services
 .if defined(NO_ROOT) && defined(METALOG)
-	echo ".${DISTBASE}/var/db/services.db type=file mode=0644 uname=root gname=wheel" | \
+	echo ".${DISTBASE}/var/db/services.db type=file uname=root gname=wheel mode=0644" | \
 		cat -l >> ${METALOG}
 .endif
 .endif