From owner-freebsd-bugs Mon Jul 31 13:40: 6 2000 Delivered-To: freebsd-bugs@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id DAC0C37B6A4 for ; Mon, 31 Jul 2000 13:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA84914; Mon, 31 Jul 2000 13:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from numeri.campus.luth.se (numeri.campus.luth.se [130.240.197.103]) by hub.freebsd.org (Postfix) with ESMTP id 6BC6037B5F7 for ; Mon, 31 Jul 2000 13:31:18 -0700 (PDT) (envelope-from k@numeri.campus.luth.se) Received: (from k@localhost) by numeri.campus.luth.se (8.9.3/8.9.3) id WAA04460; Mon, 31 Jul 2000 22:31:38 +0200 (CEST) (envelope-from k) Message-Id: <200007312031.WAA04460@numeri.campus.luth.se> Date: Mon, 31 Jul 2000 22:31:38 +0200 (CEST) From: Johan Karlsson Reply-To: k@numeri.campus.luth.se To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: misc/20327: [PATCH] src/sys/conf/Makefile.${MACHINE} should use ${KMODDIR} instead of /modules when backing up modules. Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20327 >Category: misc >Synopsis: [PATCH] src/sys/conf/Makefile.${MACHINE} should use ${KMODDIR} instead of /modules when backing up modules. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 31 13:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Johan Karlsson >Release: FreeBSD 4.1-STABLE i386 >Organization: >Environment: src/sys/conf/Makefile.alpha: $FreeBSD: src/sys/conf/Makefile.alpha,v 1.67 2000/07/27 03:50:25 green Exp $ src/sys/conf/Makefile.i386: $FreeBSD: src/sys/conf/Makefile.i386,v 1.197 2000/07/27 03:50:25 green Exp $ src/sys/conf/Makefile.pc98: $FreeBSD: src/sys/conf/Makefile.pc98,v 1.97 2000/07/27 03:50:25 green Exp $ >Description: When backing-up the module directory while installing modules the target should use ${KMODDIR} to determin where modules are/should be installed. >How-To-Repeat: >Fix: Index: sys/conf/Makefile.alpha =================================================================== RCS file: /host/queeg.ludd/FreeBSD-mirror/ncvs/src/sys/conf/Makefile.alpha,v retrieving revision 1.67 diff -u -r1.67 Makefile.alpha --- sys/conf/Makefile.alpha 2000/07/27 03:50:25 1.67 +++ sys/conf/Makefile.alpha 2000/07/31 19:58:57 @@ -303,12 +303,12 @@ 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 ; \ + if [ -d ${DESTDIR}${KMODDIR} -a -n "`ls ${DESTDIR}${KMODDIR}`" ]; then \ + mkdir -p ${DESTDIR}${KMODDIR}.old ; \ + cp -p ${DESTDIR}${KMODDIR}/* ${DESTDIR}${KMODDIR}.old ; \ fi; .endif - -mkdir ${DESTDIR}/modules + -mkdir ${DESTDIR}${KMODDIR} cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install modules-reinstall modules-reinstall.debug: Index: sys/conf/Makefile.i386 =================================================================== RCS file: /host/queeg.ludd/FreeBSD-mirror/ncvs/src/sys/conf/Makefile.i386,v retrieving revision 1.197 diff -u -r1.197 Makefile.i386 --- sys/conf/Makefile.i386 2000/07/27 03:50:25 1.197 +++ sys/conf/Makefile.i386 2000/07/31 19:58:05 @@ -262,12 +262,12 @@ 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; \ + if [ -d ${DESTDIR}${KMODDIR} -a -n "`ls ${DESTDIR}${KMODDIR}`" ]; then \ + mkdir -p ${DESTDIR}${KMODDIR}.old; \ + cp -p ${DESTDIR}${KMODDIR}/* ${DESTDIR}${KMODDIR}.old; \ fi; .endif - -mkdir ${DESTDIR}/modules + -mkdir ${DESTDIR}${KMODDIR} cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install modules-reinstall modules-reinstall.debug: Index: sys/conf/Makefile.pc98 =================================================================== RCS file: /host/queeg.ludd/FreeBSD-mirror/ncvs/src/sys/conf/Makefile.pc98,v retrieving revision 1.97 diff -u -r1.97 Makefile.pc98 --- sys/conf/Makefile.pc98 2000/07/27 03:50:25 1.97 +++ sys/conf/Makefile.pc98 2000/07/31 20:00:57 @@ -265,12 +265,12 @@ 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; \ + if [ -d ${DESTDIR}${KMODDIR} -a -n "`ls ${DESTDIR}${KMODDIR}`" ]; then \ + mkdir -p ${DESTDIR}${KMODDIR}.old; \ + cp -p ${DESTDIR}${KMODDIR}/* ${DESTDIR}${KMODDIR}.old; \ fi; .endif - -mkdir ${DESTDIR}/modules + -mkdir ${DESTDIR}${KMODDIR} cd $S/modules && env MAKEOBJDIRPREFIX=${.OBJDIR}/modules ${MAKE} install modules-reinstall modules-reinstall.debug: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message