aboutsummaryrefslogtreecommitdiff
path: root/release/packages
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-08-15 15:13:33 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-08-15 15:13:33 +0000
commit53d1eddd44d1b7d350a9f6974d0f5a8de148a9fb (patch)
treea1e98e14ab3fad74003e1e8247091b223e575f35 /release/packages
parentdae40fc1b499976f20bfbab7759b1dc6a116020d (diff)
downloadsrc-53d1eddd44d1b7d350a9f6974d0f5a8de148a9fb.tar.gz
src-53d1eddd44d1b7d350a9f6974d0f5a8de148a9fb.zip
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
Notes
Notes: svn path=/head/; revision=322545
Diffstat (limited to 'release/packages')
-rw-r--r--release/packages/kernel.ucl37
-rw-r--r--release/packages/runtime.ucl4
2 files changed, 0 insertions, 41 deletions
diff --git a/release/packages/kernel.ucl b/release/packages/kernel.ucl
index 1df0de07a196..5c169d2365d0 100644
--- a/release/packages/kernel.ucl
+++ b/release/packages/kernel.ucl
@@ -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
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index b819be14f758..8f37ccaa53c4 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -27,10 +27,6 @@ deps: {
"FreeBSD-clibs": {
origin: "base"
version: "%VERSION%"
- },
- "FreeBSD-kernel-%KERNCONF%": {
- origin: "base"
- version: "%VERSION%"
}
}
directories {