mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-17 10:26:15 +00:00
Blah rev 1.208 got bits of the proposed "I want the file /kernel to be
the kernel" patch. This commit is only the "Do not prepend `DESTDIR' to `KMODDIR' as sys/conf/kmod.mk already does that for us" change.
This commit is contained in:
parent
e48c56aeb6
commit
32002b3434
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=66601
@ -23,7 +23,6 @@
|
||||
KERNEL_KO?= kernel
|
||||
KERNEL?= kernel
|
||||
KODIR?= /boot/${KERNEL}
|
||||
KCOREDIR?= ${KODIR}
|
||||
STD8X16FONT?= iso
|
||||
|
||||
.if !defined(S)
|
||||
@ -239,18 +238,18 @@ kernel-install kernel-install.debug:
|
||||
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
|
||||
.endif
|
||||
mkdir -p ${DESTDIR}${KODIR}
|
||||
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
|
||||
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
|
||||
fi
|
||||
install -c -m 555 -o root -g wheel -fschg \
|
||||
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
|
||||
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
|
||||
|
||||
kernel-reinstall kernel-reinstall.debug:
|
||||
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
|
||||
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
|
||||
fi
|
||||
install -c -m 555 -o root -g wheel -fschg \
|
||||
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
|
||||
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
|
||||
|
||||
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
|
||||
all: modules
|
||||
|
@ -23,7 +23,6 @@
|
||||
KERNEL_KO?= kernel
|
||||
KERNEL?= kernel
|
||||
KODIR?= /boot/${KERNEL}
|
||||
KCOREDIR?= ${KODIR}
|
||||
STD8X16FONT?= iso
|
||||
|
||||
.if !defined(S)
|
||||
@ -239,18 +238,18 @@ kernel-install kernel-install.debug:
|
||||
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
|
||||
.endif
|
||||
mkdir -p ${DESTDIR}${KODIR}
|
||||
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
|
||||
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
|
||||
fi
|
||||
install -c -m 555 -o root -g wheel -fschg \
|
||||
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
|
||||
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
|
||||
|
||||
kernel-reinstall kernel-reinstall.debug:
|
||||
@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
|
||||
@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
|
||||
chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
|
||||
fi
|
||||
install -c -m 555 -o root -g wheel -fschg \
|
||||
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
|
||||
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
|
||||
|
||||
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
|
||||
all: modules
|
||||
|
Loading…
Reference in New Issue
Block a user