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

The kernel is now known as `kernel.ko' and it and its matching modules

Browse Source 
live in ``/boot/kernel/''.
This commit is contained in:
David E. O'Brien 2000-09-05 22:37:46 +00:00
parent 877aa18bbf
commit 3bdfa9e589
9 changed files with 144 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/mk/bsd.own.mk
View File

@ -65,7 +65,7 @@
#
#
# KMODDIR Base path for loadable kernel modules
# (see kld(4)). [/modules]
# (see kld(4)). [/boot/kernel]
#
# KMODOWN KLD owner. [${BINOWN}]
#
@ -153,7 +153,7 @@ INCGRP?= wheel
INCMODE?= 444
INCDIR?= /usr/include
KMODDIR?= /modules
KMODDIR?= /boot/kernel
KMODOWN?= ${BINOWN}
KMODGRP?= ${BINGRP}
KMODMODE?= ${BINMODE}

2
sys/boot/common/boot.c
View File

@ -38,7 +38,7 @@
static char *getbootfile(int try);
/* List of kernel names to try (may be overwritten by boot.config) XXX should move from here? */
static const char *default_bootfiles = "kernel;kernel.old";
static const char *default_bootfiles = "/boot/modules/kernel.ko";
static int autoboot_tried;

2
sys/boot/common/module.c
View File

@ -49,7 +49,7 @@ struct file_metadata* metadata_next(struct file_metadata *base_mp, int type);
/* load address should be tweaked by first module loaded (kernel) */
static vm_offset_t loadaddr = 0;
static const char *default_searchpath ="/;/boot;/modules";
static const char *default_searchpath ="/boot/modules;/modules;/boot/kernel";
struct preloaded_file *preloaded_files = NULL;

4
sys/boot/forth/loader.conf
View File

@ -14,7 +14,7 @@
exec=".( Loading /boot/defaults/loader.conf ) cr"
kernel="/kernel"
kernel="/boot/kernel/kernel.ko"
kernel_options=""
userconfig_script_load="NO"
@ -46,7 +46,7 @@ bitmap_type="splash_image_data"
#bootfile="kernel,kernel.old" # Set the default boot file set
#console="vidconsole" # Set the current console
#currdev="disk1s1a" # Set the current device
#module_path="/;/boot;/modules" # Set the module search path
#module_path="/boot/modules;/modules;/boot/kernel" # Set the module search path
#prompt="\\${interpret}" # Set the command prompt
#root_disk_unit="0" # Force the root disk unit number
#rootdev="disk1s1a" # Set the root filesystem

62
sys/conf/Makefile.alpha
View File

@ -20,7 +20,9 @@
%VERSREQ= 500003
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel.ko
KERNEL?= kernel
KODIR?= /boot/${KERNEL}
STD8X16FONT?= iso
.if !defined(S)
@ -107,7 +109,7 @@ SYSTEM_DEP+= $S/conf/ldscript.$M
%CLEAN
.PHONY: all modules
all: ${KERNEL}
all: ${KERNEL_KO}
depend: kernel-depend
clean: kernel-clean
@ -117,11 +119,11 @@ install install.debug: kernel-install
reinstall reinstall.debug: kernel-reinstall
.if !defined(DEBUG)
FULLKERNEL= ${KERNEL}
FULLKERNEL= ${KERNEL_KO}
.else
FULLKERNEL= ${KERNEL}.debug
${KERNEL}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL}
FULLKERNEL= ${KERNEL_KO}.debug
${KERNEL_KO}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
.endif
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@ -141,7 +143,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
kernel-clean:
rm -f *.o *.so *.So *.ko *.s eddep errs \
${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
setdef[01].c setdefs.h tags \
vers.c vnode_if.c vnode_if.h \
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@ -267,20 +269,30 @@ kernel-install kernel-install.debug:
echo "You must activate /boot/device.hints in loader.conf." ; \
exit 1 ; \
fi
@if [ ! -f ${KERNEL}${.TARGET:S/kernel-install//} ] ; then \
@if [ ! -f ${KERNEL_KO}${.TARGET:S/kernel-install//} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
.if exists(${DESTDIR}/${KERNEL})
-chflags noschg ${DESTDIR}/${KERNEL}
mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
.if exists(${DESTDIR}/${KODIR})
.if exists(${DESTDIR}/${KODIR}.old)
@-chflags -R noschg ${DESTDIR}/${KODIR}.old
-rm -rf ${DESTDIR}/${KODIR}.old
.endif
mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old
.endif
mkdir -p ${KODIR}
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-install//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR}
kernel-reinstall kernel-reinstall.debug:
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
@ -292,35 +304,33 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj all
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj depend
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} clean
cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandepend
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} tags
cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
.if !defined(NO_MODULES_OLD)
if [ -d ${DESTDIR}/modules -a -n "`ls ${DESTDIR}/modules`" ]; then \
mkdir -p ${DESTDIR}/modules.old ; \
cp -p ${DESTDIR}/modules/* ${DESTDIR}/modules.old ; \
fi;
.endif
mkdir -p ${DESTDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}

61
sys/conf/Makefile.i386
View File

@ -20,7 +20,9 @@
%VERSREQ= 500003
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel.ko
KERNEL?= kernel
KODIR?= /boot/${KERNEL}
STD8X16FONT?= iso
.if !defined(S)
@ -107,7 +109,7 @@ SYSTEM_DEP+= $S/conf/ldscript.$M
.PHONY: all modules
all: ${KERNEL}
all: ${KERNEL_KO}
depend: kernel-depend
clean: kernel-clean
@ -117,11 +119,11 @@ install install.debug: kernel-install
reinstall reinstall.debug: kernel-reinstall
.if !defined(DEBUG)
FULLKERNEL= ${KERNEL}
FULLKERNEL= ${KERNEL_KO}
.else
FULLKERNEL= ${KERNEL}.debug
${KERNEL}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL}
FULLKERNEL= ${KERNEL_KO}.debug
${KERNEL_KO}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
.endif
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@ -141,7 +143,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
kernel-clean:
rm -f *.o *.so *.So *.ko *.s eddep errs \
${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
setdef[01].c setdefs.h tags \
vers.c vnode_if.c vnode_if.h \
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@ -222,20 +224,30 @@ kernel-install kernel-install.debug:
echo "You must activate /boot/device.hints in loader.conf." ; \
exit 1 ; \
fi
@if [ ! -f ${KERNEL}${.TARGET:S/kernel-install//} ] ; then \
@if [ ! -f ${KERNEL_KO}${.TARGET:S/kernel-install//} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
.if exists(${DESTDIR}/${KERNEL})
-chflags noschg ${DESTDIR}/${KERNEL}
mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
.if exists(${DESTDIR}/${KODIR})
.if exists(${DESTDIR}/${KODIR}.old)
@-chflags -R noschg ${DESTDIR}/${KODIR}.old
-rm -rf ${DESTDIR}/${KODIR}.old
.endif
mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old
.endif
mkdir -p ${KODIR}
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-install//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR}
kernel-reinstall kernel-reinstall.debug:
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
@ -248,38 +260,33 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj all
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj depend
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} clean
cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandepend
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandir
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} tags
cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
.if !defined(NO_MODULES_OLD)
if [ -d ${DESTDIR}/modules -a -n "`ls ${DESTDIR}/modules`" ]; then \
mkdir -p ${DESTDIR}/modules.old; \
cp -p ${DESTDIR}/modules/* ${DESTDIR}/modules.old; \
fi;
.endif
mkdir -p ${DESTDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}

59
sys/conf/Makefile.pc98
View File

@ -22,7 +22,9 @@
%VERSREQ= 500003
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel.ko
KERNEL?= kernel
KODIR?= /boot/${KERNEL}
#STD8X16FONT?= iso
.if !defined(S)
@ -109,7 +111,7 @@ SYSTEM_DEP+= $S/conf/ldscript.$M
.PHONY: all modules
all: ${KERNEL}
all: ${KERNEL_KO}
depend: kernel-depend
clean: kernel-clean
@ -119,11 +121,11 @@ install install.debug: kernel-install
reinstall reinstall.debug: kernel-reinstall
.if !defined(DEBUG)
FULLKERNEL= ${KERNEL}
FULLKERNEL= ${KERNEL_KO}
.else
FULLKERNEL= ${KERNEL}.debug
${KERNEL}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL}
FULLKERNEL= ${KERNEL_KO}.debug
${KERNEL_KO}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
.endif
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@ -143,7 +145,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
kernel-clean:
rm -f *.o *.so *.So *.ko *.s eddep errs \
${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
setdef[01].c setdefs.h tags \
vers.c vnode_if.c vnode_if.h \
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@ -225,18 +227,28 @@ kernel-install kernel-install.debug:
echo "You must activate /boot/device.hints in loader.conf." ; \
exit 1 ; \
fi
@if [ ! -f ${KERNEL}${.TARGET:S/kernel-install//} ] ; then \
@if [ ! -f ${KERNEL_KO}${.TARGET:S/kernel-install//} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
.if exists(${DESTDIR}/${KERNEL})
-chflags noschg ${DESTDIR}/${KERNEL}
mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
.if exists(${DESTDIR}/${KODIR})
.if exists(${DESTDIR}/${KODIR}.old)
@-chflags -R noschg ${DESTDIR}/${KODIR}.old
-rm -rf ${DESTDIR}/${KODIR}.old
.endif
mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old
.endif
mkdir -p ${KODIR}
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-install//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR}
kernel-reinstall kernel-reinstall.debug:
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
@ -251,38 +263,33 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj all
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj depend
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} clean
cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandepend
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandir
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} tags
cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
.if !defined(NO_MODULES_OLD)
if [ -d ${DESTDIR}/modules -a -n "`ls ${DESTDIR}/modules`" ]; then \
mkdir -p ${DESTDIR}/modules.old; \
cp -p ${DESTDIR}/modules/* ${DESTDIR}/modules.old; \
fi;
.endif
mkdir -p ${DESTDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}

61
sys/conf/Makefile.powerpc
View File

@ -20,7 +20,9 @@
%VERSREQ= 500003
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel.ko
KERNEL?= kernel
KODIR?= /boot/${KERNEL}
STD8X16FONT?= iso
.if !defined(S)
@ -107,7 +109,7 @@ SYSTEM_DEP+= $S/conf/ldscript.$M
.PHONY: all modules
all: ${KERNEL}
all: ${KERNEL_KO}
depend: kernel-depend
clean: kernel-clean
@ -117,11 +119,11 @@ install install.debug: kernel-install
reinstall reinstall.debug: kernel-reinstall
.if !defined(DEBUG)
FULLKERNEL= ${KERNEL}
FULLKERNEL= ${KERNEL_KO}
.else
FULLKERNEL= ${KERNEL}.debug
${KERNEL}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL}
FULLKERNEL= ${KERNEL_KO}.debug
${KERNEL_KO}: ${FULLKERNEL}
${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
.endif
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@ -141,7 +143,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
kernel-clean:
rm -f *.o *.so *.So *.ko *.s eddep errs \
${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
setdef[01].c setdefs.h tags \
vers.c vnode_if.c vnode_if.h \
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@ -222,20 +224,30 @@ kernel-install kernel-install.debug:
echo "You must activate /boot/device.hints in loader.conf." ; \
exit 1 ; \
fi
@if [ ! -f ${KERNEL}${.TARGET:S/kernel-install//} ] ; then \
@if [ ! -f ${KERNEL_KO}${.TARGET:S/kernel-install//} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
.if exists(${DESTDIR}/${KERNEL})
-chflags noschg ${DESTDIR}/${KERNEL}
mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
.if exists(${DESTDIR}/${KODIR})
.if exists(${DESTDIR}/${KODIR}.old)
@-chflags -R noschg ${DESTDIR}/${KODIR}.old
-rm -rf ${DESTDIR}/${KODIR}.old
.endif
mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old
.endif
mkdir -p ${KODIR}
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-install//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR}
kernel-reinstall kernel-reinstall.debug:
@if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \
chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \
fi
install -c -m 555 -o root -g wheel -fschg \
${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KODIR}
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
all: modules
@ -248,38 +260,33 @@ install install.debug: modules-install
reinstall reinstall.debug: modules-reinstall
.endif
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR}
modules:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj all
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} obj depend
cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} clean
cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandepend
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} cleandir
cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} tags
cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
.if !defined(NO_MODULES_OLD)
if [ -d ${DESTDIR}/modules -a -n "`ls ${DESTDIR}/modules`" ]; then \
mkdir -p ${DESTDIR}/modules.old; \
cp -p ${DESTDIR}/modules/* ${DESTDIR}/modules.old; \
fi;
.endif
mkdir -p ${DESTDIR}/modules
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install
cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}

2
sys/conf/kmod.mk
View File

@ -13,7 +13,7 @@
#
# KMOD The name of the kernel module to build.
#
# KMODDIR Base path for kernel modules (see kld(4)). [/modules]
# KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel]
#
# KMODOWN KLD owner. [${BINOWN}]
#