d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The install.debug and reinstall.debug targets are needed solely

Browse Source 
to build kernel and kernel modules so stop supporting them in
bsd.subdir.mk and reimplement them in kern.post.mk and kmod.mk
as special versions of the install and reinstall targets, and
only define them if DEBUG is also defined (when debug versions
are really built).

Prompted by:	bde
This commit is contained in:
Ruslan Ermilov 2002-04-24 11:26:19 +00:00
parent 561ca6a7f6
commit 2cbc81ffe4
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/mk/bsd.subdir.mk
View File

@ -58,8 +58,7 @@ ${SUBDIR}::
.for __target in all all-man checkdpadd clean cleandepend cleandir depend lint \
obj objlink realinstall regress tags \
install.debug reinstall.debug
obj objlink realinstall regress tags
${__target}: _SUBDIR
.endfor

30
sys/conf/kern.post.mk
View File

@ -17,10 +17,7 @@ clean: kernel-clean
cleandepend: kernel-cleandepend
clobber: kernel-clobber
depend: kernel-depend
# XXX "make install.debug" seems to install kernels twice.
install.debug: kernel-install.debug
install: kernel-install
reinstall.debug: kernel-reinstall.debug
reinstall: kernel-reinstall
tags: kernel-tags
@ -30,6 +27,8 @@ FULLKERNEL= ${KERNEL_KO}
FULLKERNEL= ${KERNEL_KO}.debug
${KERNEL_KO}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
install.debug reinstall.debug:
cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG ${.TARGET:R}
.endif
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@ -125,7 +124,7 @@ kernel-tags:
rm -f tags1
sed -e 's, ../, ,' tags > tags1
kernel-install kernel-install.debug:
kernel-install:
.if exists(${DESTDIR}/boot)
@if [ ! -f ${DESTDIR}/boot/device.hints ] ; then \
echo "You must set up a ${DESTDIR}/boot/device.hints file first." ; \
@ -136,7 +135,7 @@ kernel-install kernel-install.debug:
exit 1 ; \
fi
.endif
@if [ ! -f ${KERNEL_KO}${.TARGET:S/kernel-install//} ] ; then \
@if [ ! -f ${FULLKERNEL} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
@ -157,13 +156,19 @@ kernel-install kernel-install.debug:
fi
.endif
mkdir -p ${DESTDIR}${KODIR}
install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
.if defined(DEBUG) && defined(INSTALL_DEBUG)
install -c -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
.else
install -c -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
.endif
kernel-reinstall kernel-reinstall.debug:
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
install -c -m 555 -o root -g wheel \
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
.if defined(DEBUG) && defined(INSTALL_DEBUG)
install -c -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
.else
install -c -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
.endif
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
@ -172,9 +177,7 @@ cleandepend: modules-cleandepend
cleandir: modules-cleandir
clobber: modules-clobber
depend: modules-depend
install.debug: modules-install.debug
install: modules-install
reinstall.debug: modules-reinstall.debug
reinstall: modules-reinstall
tags: modules-tags
.endif
@ -207,9 +210,6 @@ modules-tags:
modules-install modules-reinstall:
cd $S/modules ; ${MKMODULESENV} ${MAKE} install
modules-install.debug modules-reinstall.debug:
cd $S/modules ; ${MKMODULESENV} ${MAKE} install.debug
modules-tags:
cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags

10
sys/conf/kmod.mk
View File

@ -218,11 +218,16 @@ _INSTALLFLAGS:= ${INSTALLFLAGS}
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
.endfor
.if defined(DEBUG)
install.debug:
${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/
cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install
.endif
realinstall:
.if defined(DEBUG) && defined(INSTALL_DEBUG)
${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/
.else
${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/
.if defined(LINKS) && !empty(LINKS)
@ -250,6 +255,7 @@ realinstall:
.if !defined(NO_XREF)
-kldxref ${DESTDIR}${KMODDIR}
.endif
.endif
install: afterinstall
afterinstall: realinstall