aboutsummaryrefslogtreecommitdiff
path: root/release/packages
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2018-06-27 19:10:32 +0000
committerBrad Davis <brd@FreeBSD.org>2018-06-27 19:10:32 +0000
commit7c3f17c5d595ba8adca2faf81ed3ef1d8d45869b (patch)
treecaf34883dae110501424307bc489b193c69b5fca /release/packages
parent8e4ce6157f63a2cbaaa6709d5e91ea6ebdacb7b8 (diff)
downloadsrc-7c3f17c5d595ba8adca2faf81ed3ef1d8d45869b.tar.gz
src-7c3f17c5d595ba8adca2faf81ed3ef1d8d45869b.zip
Chase the pwd_mkdb endian changes.
Approved by: bapt (mentor)
Notes
Notes: svn path=/head/; revision=335719
Diffstat (limited to 'release/packages')
-rwxr-xr-xrelease/packages/generate-ucl.sh2
-rw-r--r--release/packages/runtime.ucl2
2 files changed, 1 insertions, 3 deletions
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 5d7e7f6fb116..b9798b226185 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 975c50f87048..d1a7cc008e18 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