diff options
| author | kevans <kevans@FreeBSD.org> | 2018-03-21 15:43:57 +0000 |
|---|---|---|
| committer | kevans <kevans@FreeBSD.org> | 2018-03-21 15:43:57 +0000 |
| commit | 78494a30497ad2992b01c61c1b116bc605ecb9e9 (patch) | |
| tree | 0682ff0226961c3836acc6280841c0fb3acd17c5 /Makefile.inc1 | |
| parent | 79c0ae6d8558b40bd2c74ad1025f77560afbeaeb (diff) | |
| download | FreeBSD-src-78494a30497ad2992b01c61c1b116bc605ecb9e9.zip FreeBSD-src-78494a30497ad2992b01c61c1b116bc605ecb9e9.tar.gz | |
MFC r330929: pkgbase: Fix post-install script for kernel packages
kernel.ucl uses a hardcoded boot/kernel for kldxref, which is the incorrect
directory when we're installing extra kernels that aren't the "default"
kernel (placed at boot/kernel).
Fix this by instead using a new %KERNELDIR% that we now replace in
Makefile.inc1 with "kernel" for the default kernel and "kernel.${_kernel}"
for these extra kernels so that, e.g. /boot/kernel.SHIVA, will get properly
kldxref'd upon update and avoid outdated linker.hints.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c4fd04c..54bb91a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1495,6 +1495,7 @@ _debug=-debug 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" \ @@ -1527,6 +1528,7 @@ _debug=-debug 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" \ |
