Make sure the first ${CHROOTDIR} installworld is done for the correct
arch. This makes "make release TARGET_ARCH=foo" really work. (I only tested with "make rerelease" before to save some time and did not notice the problem.)
This commit is contained in:
parent
7758617eb4
commit
61c2d47ae5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=96586
@ -61,6 +61,7 @@ TARGET?= ${MACHINE}
|
||||
TARGET?= ${TARGET_ARCH}
|
||||
.endif
|
||||
CROSSMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
|
||||
NATIVEMAKE= ${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE}
|
||||
|
||||
# If you are using a local CVS repository with components stored in
|
||||
# non-standard modules, override these on the make commandline or
|
||||
@ -264,9 +265,9 @@ rerelease release:
|
||||
.endif
|
||||
mkdir -p ${CHROOTDIR}
|
||||
@echo ">>> make release started on `LC_ALL=C TZ=GMT date`"
|
||||
cd ${.CURDIR}/.. && ${MAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
|
||||
cd ${.CURDIR}/.. && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
|
||||
-DNOPROFILE installworld DESTDIR=${CHROOTDIR}
|
||||
cd ${.CURDIR}/../etc && ${MAKE} distribution DESTDIR=${CHROOTDIR}
|
||||
cd ${.CURDIR}/../etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
|
||||
if [ -f /etc/resolv.conf ]; then \
|
||||
cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user