Date: Fri, 17 Nov 2000 22:55:32 +0900 From: Makoto MATSUSHITA <matusita@jp.freebsd.org> To: current@FreeBSD.ORG Subject: Re: RQ review: [was: Re: "make modules" kicks the first module directory twice] Message-ID: <20001117225532X.matusita@jp.FreeBSD.org> In-Reply-To: <20001114121517.B78808@dragon.nuxi.com> References: <3A10B967.C3301113@cup.hp.com> <3A10B967.C3301113@cup.hp.com> <20001114121517.B78808@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
obrien> [its easier to read patches when they aren't quoted in their entirety ;-)]
Attached below is a patch which I've made before. If nothing is going
wrong, please commit this change.... current.jp.FreeBSD.org which
employs 'make -j' option have missed -current release since the
beginning of this month.
-- -
Makoto `MAR' MATSUSHITA
Index: Makefile
===================================================================
RCS file: /lab/FreeBSD/FreeBSD.cvs/src/release/Makefile,v
retrieving revision 1.585
diff -c -r1.585 Makefile
*** Makefile 2000/11/12 11:04:11 1.585
--- Makefile 2000/11/13 05:37:12
***************
*** 831,837 ****
@rm -f ${RD}/kernels/*.ko
@cd ${.CURDIR}/../sys/${MACHINE}/conf && config ${KERNEL}
@cd ${.CURDIR}/../sys/compile/${KERNEL} && \
! make kernel-depend && \
make ${KERNEL_FLAGS} modules && \
make modules-reinstall DESTDIR=${RD}/kernels && \
--- 831,837 ----
@rm -f ${RD}/kernels/*.ko
@cd ${.CURDIR}/../sys/${MACHINE}/conf && config ${KERNEL}
@cd ${.CURDIR}/../sys/compile/${KERNEL} && \
! make modules-depend && \
make ${KERNEL_FLAGS} modules && \
make modules-reinstall DESTDIR=${RD}/kernels && \
Index: Makefile.alpha
===================================================================
RCS file: /lab/FreeBSD/FreeBSD.cvs/src/sys/conf/Makefile.alpha,v
retrieving revision 1.79
diff -c -r1.79 Makefile.alpha
*** Makefile.alpha 2000/10/29 09:47:50 1.79
--- Makefile.alpha 2000/11/14 01:55:17
***************
*** 252,258 ****
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks && rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
--- 252,258 ----
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks; rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
***************
*** 309,338 ****
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
--- 309,342 ----
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @if [ ! -d ${.OBJDIR}/modules ]; then \
! echo You must run make depend before building modules; \
! exit 1; \
! fi
! cd $S/modules; env ${MKMODULESENV} ${MAKE} all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules; env ${MKMODULESENV} ${MAKE} obj; \
! env ${MKMODULESENV} ${MAKE} depend
modules-clean:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
Index: Makefile.i386
===================================================================
RCS file: /lab/FreeBSD/FreeBSD.cvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.212
diff -c -r1.212 Makefile.i386
*** Makefile.i386 2000/10/29 09:47:50 1.212
--- Makefile.i386 2000/11/14 01:55:15
***************
*** 212,218 ****
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks && rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
--- 212,218 ----
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks; rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
***************
*** 270,299 ****
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
--- 270,303 ----
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @if [ ! -d ${.OBJDIR}/modules ]; then \
! echo You must run make depend before building modules; \
! exit 1; \
! fi
! cd $S/modules; env ${MKMODULESENV} ${MAKE} all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules; env ${MKMODULESENV} ${MAKE} obj; \
! env ${MKMODULESENV} ${MAKE} depend
modules-clean:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
Index: Makefile.ia64
===================================================================
RCS file: /lab/FreeBSD/FreeBSD.cvs/src/sys/conf/Makefile.ia64,v
retrieving revision 1.4
diff -c -r1.4 Makefile.ia64
*** Makefile.ia64 2000/10/29 09:47:50 1.4
--- Makefile.ia64 2000/11/14 01:55:27
***************
*** 217,223 ****
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks && rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
--- 217,223 ----
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks; rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
***************
*** 274,303 ****
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
--- 274,307 ----
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @if [ ! -d ${.OBJDIR}/modules ]; then \
! echo You must run make depend before building modules; \
! exit 1; \
! fi
! cd $S/modules; env ${MKMODULESENV} ${MAKE} all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules; env ${MKMODULESENV} ${MAKE} obj; \
! env ${MKMODULESENV} ${MAKE} depend
modules-clean:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
Index: Makefile.pc98
===================================================================
RCS file: /lab/FreeBSD/FreeBSD.cvs/src/sys/conf/Makefile.pc98,v
retrieving revision 1.110
diff -c -r1.110 Makefile.pc98
*** Makefile.pc98 2000/11/05 14:31:17 1.110
--- Makefile.pc98 2000/11/14 01:55:50
***************
*** 215,221 ****
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks && rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
--- 215,221 ----
echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
sort -u | comm -23 - dontlink | \
sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
! sh makelinks; rm -f dontlink
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
***************
*** 273,302 ****
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
modules-clean:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules && env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
--- 273,306 ----
MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
modules:
! @if [ ! -d ${.OBJDIR}/modules ]; then \
! echo You must run make depend before building modules; \
! exit 1; \
! fi
! cd $S/modules; env ${MKMODULESENV} ${MAKE} all
modules-depend:
@mkdir -p ${.OBJDIR}/modules
! cd $S/modules; env ${MKMODULESENV} ${MAKE} obj; \
! env ${MKMODULESENV} ${MAKE} depend
modules-clean:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} clean
modules-cleandepend:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandepend
modules-cleandir:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} cleandir
modules-tags:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} tags
modules-install modules-install.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
modules-reinstall modules-reinstall.debug:
! cd $S/modules; env ${MKMODULESENV} ${MAKE} install
config.o:
${NORMAL_C}
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001117225532X.matusita>