Problems building jails under RELENG_5_3 (5.3-RELEASE-p5)

[George Hartzell]

George Hartzell writes:
 > [...]
 > Google and the freebsd-questions archives show several other people
 > reporting the problem, but I havn't seen anyone post a solution.

Pardon my following up to my own post, but in the interest of having a
solution in the archives, here's a shar file of two diffs that'll make
it work as documented in the jail man page.

The problem seems to be some changes to /usr/src/Makefile and
/usr/src/Makefile.inc1 that were quickly fixed on the RELENG_5 branch
but never included back into the RELENG_5_3 branch.

I grabbed those two files from the FreeBSD CVS repository via the web
interface, just after the fix for this problem.  I moved them into
/usr/src and they seem to work fine.  The functional Makefile is
version 1.306.2.1 and Makefile.inc1 is version 1.438.2.5.

I'm including a shar file containing the diffs between my
5.3-RELEASE-p5 system and those files, hopefully it'll be useful to
other folks.

g.

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	Makefile.diff
#	Makefile.inc1.diff
#
echo x - Makefile.diff
sed 's/^X//' >Makefile.diff << 'END-of-Makefile.diff'
X2c2
X< # $FreeBSD: src/Makefile,v 1.306 2004/08/09 11:38:41 harti Exp $
X---
X> # $FreeBSD: /repoman/r/ncvs/src/Makefile,v 1.306.2.1 2004/11/08 19:38:31 ru Exp $
X87a88,94
X> _MAKEOBJDIRPREFIX!= /usr/bin/env -i \
X> 		PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \
X> 		-f /dev/null -V MAKEOBJDIRPREFIX dummy
X> .if !empty(_MAKEOBJDIRPREFIX)
X> .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
X> 	(in /etc/make.conf) or command-line variable.
X> .endif
X147,148d153
X< .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
X< .if make(world)
X150c155,156
X< .endif
X---
X> 
X> .if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
X245c251
X< # with reasonable chance of success, regardless of how old your
X---
X> # with a reasonable chance of success, regardless of how old your
X248,249c254,255
X< i386_mach=	pc98
X< universe:
X---
X> universe: universe_prologue
X> universe_prologue:
X253,254c259,264
X< .for arch in i386 sparc64 alpha ia64 amd64
X< .for mach in ${arch} ${${arch}_mach}
X---
X> .for target in i386 i386:pc98 sparc64 alpha ia64 amd64
X> .for arch in ${target:C/:.*$//}
X> .for mach in ${target:C/^.*://}
X> universe: universe_${mach}
X> .ORDER: universe_prologue universe_${mach} universe_epilogue
X> universe_${mach}:
X265c275
X< 	cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernels TARGET_ARCH=${arch} TARGET=${mach}
X---
X> 	cd ${.CURDIR} && ${MAKE} buildkernels TARGET_ARCH=${arch} TARGET=${mach}
X268a279,281
X> .endfor
X> universe: universe_epilogue
X> universe_epilogue:
X277,278d289
X< .endif
X< 
X285a297
X> .endif
END-of-Makefile.diff
echo x - Makefile.inc1.diff
sed 's/^X//' >Makefile.inc1.diff << 'END-of-Makefile.inc1.diff'
X2c2
X< # $FreeBSD: src/Makefile.inc1,v 1.438.2.4.2.1 2004/10/24 09:24:25 scottl Exp $
X---
X> # $FreeBSD: /repoman/r/ncvs/src/Makefile.inc1,v 1.438.2.5 2004/11/08 19:38:31 ru Exp $
X93,99d92
X< _MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \
X< 		-f /dev/null -V MAKEOBJDIRPREFIX dummy
X< .if !empty(_MAKEOBJDIRPREFIX)
X< .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
X< 	(in /etc/make.conf) or command-line variable.
X< .endif
X< 
X183,184c176
X< BMAKEENV=	DESTDIR= \
X< 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
X---
X> BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
X189a182
X> 		DESTDIR= \
X196a190
X> 		DESTDIR= \
X204d197
X< 		DESTDIR=${WORLDTMP} \
X208c201
X< WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1
X---
X> WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
X669c662
X< 	cd ${.CURDIR}; ${CVS} -R -q update -rRELENG_5_3 -P -d
X---
X> 	cd ${.CURDIR}; ${CVS} -R -q update -rRELENG_5 -P -d
END-of-Makefile.inc1.diff
exit