From 99a956a88b6502fe42f03a5779cd442f6b9a2873 Mon Sep 17 00:00:00 2001
From: brd <brd@FreeBSD.org>
Date: Wed, 27 Jun 2018 19:10:32 +0000
Subject: [PATCH] Chase the pwd_mkdb endian changes.

Approved by:	bapt (mentor)
---
 Makefile.inc1                    | 4 ----
 release/packages/generate-ucl.sh | 2 --
 release/packages/runtime.ucl     | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 613e2d969c2..1fc9027ee0f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1804,14 +1804,12 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \
 	cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
-	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
 	sed -e "s/%VERSION%/${PKG_VERSION}/" \
 		-e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \
 		-e "s/%KERNELDIR%/kernel/" \
 		-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
@@ -1840,14 +1838,12 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${_kernel} ; \
 	cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
-	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
 	sed -e "s/%VERSION%/${PKG_VERSION}/" \
 		-e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \
 		-e "s/%KERNELDIR%/kernel.${_kernel}/" \
 		-e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
-		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 5d7e7f6fb11..b9798b22618 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -132,13 +132,11 @@ main() {
 
 	cp "${uclsource}" "${uclfile}"
 	cap_arg="$(make -C ${srctree}/etc -VCAP_MKDB_ENDIAN)"
-	pwd_arg="$(make -C ${srctree}/etc -VPWD_MKDB_ENDIAN)"
 	sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
 		-e "s/%PKGNAME%/${origname}/" \
 		-e "s/%COMMENT%/${comment}/" \
 		-e "s/%DESC%/${desc}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
-		-e "s/%PWD_MKDB_ENDIAN%/${pwd_arg}/g" \
 		-e "s/%PKGDEPS%/${pkgdeps}/" \
 		${uclfile}
 	return 0
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index 975c50f8704..d1a7cc008e1 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -19,7 +19,7 @@ EOD
 scripts: {
 	post-install = <<EOD
 	cap_mkdb %CAP_MKDB_ENDIAN% ${PKG_ROOTDIR}/etc/login.conf
-	pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
+	pwd_mkdb -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
 	services_mkdb %CAP_MKDB_ENDIAN% -q -o ${PKG_ROOTDIR}/var/db/services.db ${PKG_ROOTDIR}/etc/services
 	chmod 1777 ${PKG_ROOTDIR}/tmp
 EOD
-- 
2.45.0