svn commit: r335719 - in head: . release/packages

[Brad Davis]

Author: brd
Date: Wed Jun 27 19:10:32 2018
New Revision: 335719
URL: https://svnweb.freebsd.org/changeset/base/335719

Log:
  Chase the pwd_mkdb endian changes.
  
  Approved by:	bapt (mentor)

Modified:
  head/Makefile.inc1
  head/release/packages/generate-ucl.sh
  head/release/packages/runtime.ucl

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Jun 27 18:43:34 2018	(r335718)
+++ head/Makefile.inc1	Wed Jun 27 19:10:32 2018	(r335719)
@@ -1804,14 +1804,12 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul
 	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,^""$,${_
 	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 ; \

Modified: head/release/packages/generate-ucl.sh
==============================================================================
--- head/release/packages/generate-ucl.sh	Wed Jun 27 18:43:34 2018	(r335718)
+++ head/release/packages/generate-ucl.sh	Wed Jun 27 19:10:32 2018	(r335719)
@@ -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

Modified: head/release/packages/runtime.ucl
==============================================================================
--- head/release/packages/runtime.ucl	Wed Jun 27 18:43:34 2018	(r335718)
+++ head/release/packages/runtime.ucl	Wed Jun 27 19:10:32 2018	(r335719)
@@ -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