From owner-cvs-all Fri Oct 19 5:23:22 2001 Delivered-To: cvs-all@freebsd.org Received: from straylight.ringlet.net (straylight.ringlet.net [217.75.134.254]) by hub.freebsd.org (Postfix) with SMTP id E242437B407 for ; Fri, 19 Oct 2001 05:23:11 -0700 (PDT) Received: (qmail 6963 invoked by uid 1000); 19 Oct 2001 12:23:05 -0000 Date: Fri, 19 Oct 2001 15:23:05 +0300 From: Peter Pentchev To: Warner Losh Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/modules Makefile src/sys/conf Makefile.alpha Makefile.i386 Makefile.pc98 Message-ID: <20011019152305.A1416@straylight.oblivion.bg> Mail-Followup-To: Warner Losh , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200110181939.f9IJdtJ67133@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200110181939.f9IJdtJ67133@freefall.freebsd.org>; from imp@FreeBSD.org on Thu, Oct 18, 2001 at 12:39:55PM -0700 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Oct 18, 2001 at 12:39:55PM -0700, Warner Losh wrote: > imp 2001/10/18 12:39:52 PDT > > Modified files: (Branch: RELENG_4) > sys/modules Makefile > sys/conf Makefile.alpha Makefile.i386 > Makefile.pc98 > Log: > MFC: MODULES_OVERRIDE support, plus the MKMODULESENV, which adds the > abiltiy to compile modules -g as well. The i386 and pc98 ports work, > both with and without MODULES_OVERRIDE. > > Not tested on: Alpha This broke modules' installation. -stable does not have KODIR yet, so the modules are installed in / instead of /modules/ How about the attached patch, backing out the KMODDIR=${KODIR} part? G'luck, Peter -- This sentence was in the past tense. Index: src/sys/conf/Makefile.alpha =================================================================== RCS file: /home/ncvs/src/sys/conf/Makefile.alpha,v retrieving revision 1.47.2.7 diff -u -r1.47.2.7 Makefile.alpha --- src/sys/conf/Makefile.alpha 2001/10/18 19:39:52 1.47.2.7 +++ src/sys/conf/Makefile.alpha 2001/10/19 12:20:36 @@ -281,7 +281,7 @@ reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules .if defined(MODULES_OVERRIDE) MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" .endif Index: src/sys/conf/Makefile.i386 =================================================================== RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v retrieving revision 1.179.2.7 diff -u -r1.179.2.7 Makefile.i386 --- src/sys/conf/Makefile.i386 2001/10/18 19:39:52 1.179.2.7 +++ src/sys/conf/Makefile.i386 2001/10/19 12:20:38 @@ -237,7 +237,7 @@ reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules .if defined(MODULES_OVERRIDE) MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" .endif Index: src/sys/conf/Makefile.pc98 =================================================================== RCS file: /home/ncvs/src/sys/conf/Makefile.pc98,v retrieving revision 1.82.2.8 diff -u -r1.82.2.8 Makefile.pc98 --- src/sys/conf/Makefile.pc98 2001/10/18 19:39:52 1.82.2.8 +++ src/sys/conf/Makefile.pc98 2001/10/19 12:20:39 @@ -240,7 +240,7 @@ reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules .if defined(MODULES_OVERRIDE) MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}" .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message