Page MenuHomeFreeBSD
Files F100677598

D43593.diff
No OneTemporary
Actions

D43593.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2191,6 +2191,7 @@
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
-e "s|%PKG_WWW%|${PKG_WWW}|" \
+ -e "s/%RUNSCRIPTS%/"${${flavor} == "":?true:false}"/" \
${SRCDIR}/release/packages/kernel.ucl \
> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
awk -F\" ' \
@@ -2228,6 +2229,7 @@
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
-e "s|%PKG_WWW%|${PKG_WWW}|" \
+ -e "s/%RUNSCRIPTS%/"${${flavor} == "":?true:false}"/" \
${SRCDIR}/release/packages/kernel.ucl \
> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
awk -F\" ' \
diff --git a/release/packages/certctl.ucl b/release/packages/certctl.ucl
--- a/release/packages/certctl.ucl
+++ b/release/packages/certctl.ucl
@@ -1,6 +1,3 @@
-#
-#
-
name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
@@ -19,7 +16,9 @@
# files being added or removed, we should use it instead to gate the
# rehash.
post-install = <<EOD
- [ -x /usr/sbin/certctl ] && env DESTDIR=${PKG_ROOTDIR} \
- /usr/sbin/certctl rehash
+ if %RUNSCRIPTS% ; then
+ [ -x /usr/sbin/certctl ] && env DESTDIR=${PKG_ROOTDIR} \
+ /usr/sbin/certctl rehash
+ fi
EOD
}
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-#
-#
main() {
desc=
@@ -30,6 +28,7 @@
shift $(( ${OPTIND} - 1 ))
+ runscripts="true"
vital="false"
case "${outname}" in
@@ -53,14 +52,17 @@
libcompat-dev|libcompiler_rt-dev|liby-dev)
outname=${outname%%-dev}
_descr="Development Files"
+ runscripts="false"
;;
libcompat-lib32_dev|libcompiler_rt-lib32_dev|liby-lib32_dev)
outname=${outname%%-lib32_dev}
_descr="32-bit Libraries, Development Files"
+ runscripts="false"
;;
libcompat-man|libelftc-man)
outname=${outname%%-man}
_descr="Manual Pages"
+ runscripts="false"
;;
utilities)
uclfile="${uclfile}"
@@ -74,31 +76,37 @@
outname="${outname%%-lib32_dev}"
_descr="32-bit Libraries, Development Files"
pkgdeps="${outname}"
+ runscripts="false"
;;
*-lib32_dbg)
outname="${outname%%-lib32_dbg}"
_descr="32-bit Libraries, Debugging Symbols"
pkgdeps="${outname}"
+ runscripts="false"
;;
*-lib32)
outname="${outname%%-lib32}"
_descr="32-bit Libraries"
pkgdeps="${outname}"
+ runscripts="false"
;;
*-dev)
outname="${outname%%-dev}"
_descr="Development Files"
pkgdeps="${outname}"
+ runscripts="false"
;;
*-dbg)
outname="${outname%%-dbg}"
_descr="Debugging Symbols"
pkgdeps="${outname}"
+ runscripts="false"
;;
*-man)
outname="${outname%%-man}"
_descr="Manual Pages"
pkgdeps="${outname}"
+ runscripts="false"
;;
${origname})
;;
@@ -128,6 +136,7 @@
echo "desc=${desc}"
echo "comment=${comment}"
echo "vital=${vital}"
+ echo "runscripts=${runscripts}"
echo "cp ${uclsource} -> ${uclfile}"
echo "==============================================================="
echo ""
@@ -162,6 +171,7 @@
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s|%PKG_WWW%|${PKG_WWW}|" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
+ -e "s/%RUNSCRIPTS%/${runscripts}/" \
${uclfile}
return 0
}
diff --git a/release/packages/kernel.ucl b/release/packages/kernel.ucl
--- a/release/packages/kernel.ucl
+++ b/release/packages/kernel.ucl
@@ -1,6 +1,3 @@
-#
-#
-
name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
@@ -16,6 +13,8 @@
EOD
scripts: {
post-install = <<EOD
- /usr/sbin/kldxref ${PKG_ROOTDIR}/boot/%KERNELDIR%
+ if %RUNSCRIPTS% ; then
+ /usr/sbin/kldxref ${PKG_ROOTDIR}/boot/%KERNELDIR%
+ fi
EOD
}
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -1,6 +1,3 @@
-#
-#
-
name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
@@ -17,9 +14,14 @@
EOD
scripts: {
post-install = <<EOD
- 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
+ if %RUNSCRIPTS% ; then
+ 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
+ fi
EOD
}
directories: {
diff --git a/release/packages/utilities.ucl b/release/packages/utilities.ucl
--- a/release/packages/utilities.ucl
+++ b/release/packages/utilities.ucl
@@ -1,6 +1,3 @@
-#
-#
-
name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
@@ -17,6 +14,8 @@
EOD
scripts: {
post-install = <<EOD
- cap_mkdb %CAP_MKDB_ENDIAN% ${PKG_ROOTDIR}/etc/login.conf
+ if %RUNSCRIPTS% ; then
+ cap_mkdb %CAP_MKDB_ENDIAN% ${PKG_ROOTDIR}/etc/login.conf
+ fi
EOD
}

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 19, 6:33 AM (21 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14260217
Default Alt Text
D43593.diff (5 KB)

Event Timeline