diff options
| author | des <des@FreeBSD.org> | 2001-10-27 00:52:50 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2001-10-27 00:52:50 +0000 |
| commit | eb0ad6222d1267073df7b5ea3413ec5cd9477ce2 (patch) | |
| tree | ac8244daf2345ee090c52cc39af64f0f02dded8c | |
| parent | 9246a16af858019b295cc1274132b8af3d4d67a3 (diff) | |
| download | FreeBSD-src-eb0ad6222d1267073df7b5ea3413ec5cd9477ce2.zip FreeBSD-src-eb0ad6222d1267073df7b5ea3413ec5cd9477ce2.tar.gz | |
Support the "install.debug" and "reinstall.debug" targets for kernel modules.
Small tweaks to kldxref may be necessary to avoid the surprising (but harm-
less) behaviour of 'kldload foo' loading foo.ko.debug instead of foo.ko if
it is present in the kernel directory.
Approved by: a week of silence on -arch
MFC after: 2 weeks
| -rw-r--r-- | share/mk/bsd.subdir.mk | 3 | ||||
| -rw-r--r-- | sys/conf/Makefile.alpha | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.i386 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.ia64 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.pc98 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.sparc64 | 6 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 4 |
8 files changed, 24 insertions, 19 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index a26e5ef..b08065e 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -88,7 +88,8 @@ ${SUBDIR}:: .for __target in all all-man checkdpadd clean cleandepend cleandir depend lint \ - maninstall obj objlink regress tags + maninstall obj objlink regress tags \ + install.debug reinstall.debug .if !target(${__target}) ${__target}: _SUBDIRUSE .endif diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 776d958..51d69f6 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -340,11 +340,11 @@ modules-cleandir: modules-tags: cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags -modules-install modules-install.debug: +modules-install modules-reinstall: cd $S/modules ; env ${MKMODULESENV} ${MAKE} install -modules-reinstall modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install +modules-install.debug modules-reinstall.debug: + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 581cf20..d9e1945 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -298,11 +298,11 @@ modules-cleandir: modules-tags: cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags -modules-install modules-install.debug: +modules-install modules-reinstall: cd $S/modules ; env ${MKMODULESENV} ${MAKE} install -modules-reinstall modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install +modules-install.debug modules-reinstall.debug: + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64 index 3d2da53..44fd957 100644 --- a/sys/conf/Makefile.ia64 +++ b/sys/conf/Makefile.ia64 @@ -310,11 +310,11 @@ modules-cleandir: modules-tags: cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags -modules-install modules-install.debug: +modules-install modules-reinstall: cd $S/modules ; env ${MKMODULESENV} ${MAKE} install -modules-reinstall modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install +modules-install.debug modules-reinstall.debug: + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index cb103fb..9990506 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -302,11 +302,11 @@ modules-cleandir: modules-tags: cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags -modules-install modules-install.debug: +modules-install modules-reinstall: cd $S/modules ; env ${MKMODULESENV} ${MAKE} install -modules-reinstall modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install +modules-install.debug modules-reinstall.debug: + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index acd850d..7543189 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -307,11 +307,11 @@ modules-cleandir: modules-tags: cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags -modules-install modules-install.debug: +modules-install modules-reinstall: cd $S/modules ; env ${MKMODULESENV} ${MAKE} install -modules-reinstall modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install +modules-install.debug modules-reinstall.debug: + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64 index 34396d1..a1447b8 100644 --- a/sys/conf/Makefile.sparc64 +++ b/sys/conf/Makefile.sparc64 @@ -312,11 +312,11 @@ modules-cleandir: modules-tags: cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags -modules-install modules-install.debug: +modules-install modules-reinstall: cd $S/modules ; env ${MKMODULESENV} ${MAKE} install -modules-reinstall modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install +modules-install.debug modules-reinstall.debug: + cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index e83f0f0..7f7e653 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -212,6 +212,10 @@ _INSTALLFLAGS:= ${INSTALLFLAGS} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor +install.debug: _SUBDIR + ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/ + realinstall: _SUBDIR ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/ |
