Author: gjb
Date: Tue Aug 15 15:13:33 2017
New Revision: 322545
URL: https://svnweb.freebsd.org/changeset/base/322545
Log:
Revert r322327, r322352, r322358:
Disconnect the dependency on the kernel package from the runtime
package. There are a number of problems here:
1) The runtime package installed into a chroot or a jail would
include the kernel package, changing the behavior of how jails
work now [1];
2) As result of (1), it is possible a binary may incorrectly
resolve kernel symbols [2]; in addition, it is possible there
will be unexpected fallout with 32-bit jails on a 64-bit host
kernel [2].
Noticed by: brd [1]
Discussed with: kib [2]
MFC after: 3 days
MFC note: record-only to wipe from the merge tracker
Sponsored by: The FreeBSD Foundation
Modified:
head/Makefile.inc1
head/release/packages/kernel.ucl
head/release/packages/runtime.ucl
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Aug 15 15:08:19 2017 (r322544)
+++ head/Makefile.inc1 Tue Aug 15 15:13:33 2017 (r322545)
@@ -1634,7 +1634,6 @@ create-world-package-${pkgname}: .PHONY
/^version/ { print $$2; next } \
' ${WSTAGEDIR}/${pkgname}.ucl
@if [ "${pkgname}" == "runtime" ]; then \
- sed -i '' -e "s/%KERNCONF%/${INSTALLKERNEL:tl}/"
${WSTAGEDIR}/${pkgname}.ucl ; \
sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/"
${WSTAGEDIR}/${pkgname}.ucl ; \
fi
${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
Modified: head/release/packages/kernel.ucl
==============================================================================
--- head/release/packages/kernel.ucl Tue Aug 15 15:08:19 2017
(r322544)
+++ head/release/packages/kernel.ucl Tue Aug 15 15:13:33 2017
(r322545)
@@ -16,43 +16,6 @@ desc = <<EOD
%DESC%
EOD
scripts: {
- pre-install = <<EOD
- case ${ASSUME_ALWAYS_YES} in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee])
- exit 0
- ;;
- *)
- continue
- ;;
- esac
- if [ -z "${TERM}" ]; then
- exit 0
- fi
- echo "****************************************************************"
- echo "It is recommended to install the FreeBSD-%PKGNAME% package"
- echo "with:"
- echo
- echo " pkg install FreeBSD-%PKGNAME%"
- echo
- echo "and rebooting the system into the new kernel before upgrading"
- echo "with:"
- echo
- echo " pkg upgrade"
- echo
- echo "****************************************************************"
- echo
- echo "Do you want to continue anyway? (N/y)"
- read ANSWER
- case ${ANSWER} in
- [Yy])
- exit 0
- ;;
- *)
- kill ${PPID} ${PID}
- ;;
- esac
-EOD
-
post-install = <<EOD
/usr/sbin/kldxref ${PKG_ROOTDIR}/boot/kernel
EOD
Modified: head/release/packages/runtime.ucl
==============================================================================
--- head/release/packages/runtime.ucl Tue Aug 15 15:08:19 2017
(r322544)
+++ head/release/packages/runtime.ucl Tue Aug 15 15:13:33 2017
(r322545)
@@ -27,10 +27,6 @@ deps: {
"FreeBSD-clibs": {
origin: "base"
version: "%VERSION%"
- },
- "FreeBSD-kernel-%KERNCONF%": {
- origin: "base"
- version: "%VERSION%"
}
}
directories {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
