|
Lines 45-50
Link Here
|
| 45 |
DOCBRANCH="doc/head" |
45 |
DOCBRANCH="doc/head" |
| 46 |
PORTBRANCH="ports/head" |
46 |
PORTBRANCH="ports/head" |
| 47 |
|
47 |
|
|
|
48 |
# Sometimes one needs to checkout src with --force svn option. |
| 49 |
# If custom kernel configs copied to src tree before checkout, e.g. |
| 50 |
SRC_FORCE_CHECKOUT= |
| 51 |
|
| 48 |
# The default src/, doc/, and ports/ revisions. |
52 |
# The default src/, doc/, and ports/ revisions. |
| 49 |
SRCREVISION="-rHEAD" |
53 |
SRCREVISION="-rHEAD" |
| 50 |
DOCREVISION="-rHEAD" |
54 |
DOCREVISION="-rHEAD" |
|
Lines 109-114
Link Here
|
| 109 |
done |
113 |
done |
| 110 |
shift $(($OPTIND - 1)) |
114 |
shift $(($OPTIND - 1)) |
| 111 |
|
115 |
|
|
|
116 |
# If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree |
| 117 |
# is required to build the documentation set. |
| 118 |
if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then |
| 119 |
echo "*** NOTICE: Setting NODOC=1 since ports tree is required" |
| 120 |
echo " and NOPORTS is set." |
| 121 |
NODOC=yes |
| 122 |
fi |
| 123 |
|
| 124 |
# If NOPORTS and/or NODOC are unset, they must not pass to make as variables. |
| 125 |
# The release makefile verifies definedness of NOPORTS/NODOC variables |
| 126 |
# instead of their values. |
| 127 |
DOCPORTS= |
| 128 |
if [ "x${NOPORTS}" != "x" ]; then |
| 129 |
DOCPORTS="NOPORTS=yes " |
| 130 |
fi |
| 131 |
if [ "x${NODOC}" != "x" ]; then |
| 132 |
DOCPORTS="${DOCPORTS}NODOC=yes" |
| 133 |
fi |
| 134 |
|
| 112 |
# The aggregated build-time flags based upon variables defined within |
135 |
# The aggregated build-time flags based upon variables defined within |
| 113 |
# this file, unless overridden by release.conf. In most cases, these |
136 |
# this file, unless overridden by release.conf. In most cases, these |
| 114 |
# will not need to be changed. |
137 |
# will not need to be changed. |
|
Lines 118-133
Link Here
|
| 118 |
CHROOT_IMAKEFLAGS="${CONF_FILES}" |
141 |
CHROOT_IMAKEFLAGS="${CONF_FILES}" |
| 119 |
CHROOT_DMAKEFLAGS="${CONF_FILES}" |
142 |
CHROOT_DMAKEFLAGS="${CONF_FILES}" |
| 120 |
RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}" |
143 |
RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}" |
| 121 |
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=${KERNEL} ${ARCH_FLAGS} ${CONF_FILES}" |
144 |
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" |
| 122 |
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=${KERNEL} ${CONF_FILES} \ |
145 |
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \ |
| 123 |
NODOC=${NODOC} NOPORTS=${NOPORTS}" |
146 |
${DOCPORTS}" |
| 124 |
|
147 |
|
| 125 |
# If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree |
148 |
# Force src checkout if configured |
| 126 |
# is required to build the documentation set. |
149 |
FORCE_SRC_KEY= |
| 127 |
if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then |
150 |
if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then |
| 128 |
echo "*** NOTICE: Setting NODOC=1 since ports tree is required" |
151 |
FORCE_SRC_KEY="--force" |
| 129 |
echo " and NOPORTS is set." |
|
|
| 130 |
NODOC=1 |
| 131 |
fi |
152 |
fi |
| 132 |
|
153 |
|
| 133 |
if [ ! ${CHROOTDIR} ]; then |
154 |
if [ ! ${CHROOTDIR} ]; then |
|
Lines 144-150
Link Here
|
| 144 |
|
165 |
|
| 145 |
mkdir -p ${CHROOTDIR}/usr |
166 |
mkdir -p ${CHROOTDIR}/usr |
| 146 |
|
167 |
|
| 147 |
svn co ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION |
168 |
svn co ${FORCE_SRC_KEY} ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION |
| 148 |
if [ "x${NODOC}" = "x" ]; then |
169 |
if [ "x${NODOC}" = "x" ]; then |
| 149 |
svn co ${SVNROOT}/${DOCBRANCH} ${CHROOTDIR}/usr/doc $DOCREVISION |
170 |
svn co ${SVNROOT}/${DOCBRANCH} ${CHROOTDIR}/usr/doc $DOCREVISION |
| 150 |
fi |
171 |
fi |
|
Lines 164-173
Link Here
|
| 164 |
build_doc_ports() { |
185 |
build_doc_ports() { |
| 165 |
## Trick the ports 'run-autotools-fixup' target to do the right thing. |
186 |
## Trick the ports 'run-autotools-fixup' target to do the right thing. |
| 166 |
_OSVERSION=$(sysctl -n kern.osreldate) |
187 |
_OSVERSION=$(sysctl -n kern.osreldate) |
| 167 |
if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" != "x" ]; then |
188 |
if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then |
| 168 |
PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes BATCH=yes" |
189 |
PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes WITHOUT_SVN=yes WITHOUT_X11=yes WITHOUT_PYTHON=yes BATCH=yes" |
| 169 |
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ |
190 |
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ |
| 170 |
${PBUILD_FLAGS} install |
191 |
${PBUILD_FLAGS} install clean distclean |
|
|
192 |
#w3m needed to build docs |
| 193 |
chroot ${CHROOTDIR} make -C /usr/ports/www/w3m ${PBUILD_FLAGS} install clean distclean |
| 171 |
fi |
194 |
fi |
| 172 |
} |
195 |
} |
| 173 |
|
196 |
|
|
Lines 192-201
Link Here
|
| 192 |
fi |
215 |
fi |
| 193 |
|
216 |
|
| 194 |
chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld |
217 |
chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld |
| 195 |
chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel |
218 |
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel |
| 196 |
chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ |
219 |
eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ |
| 197 |
release RELSTRING=${RELSTRING} |
220 |
release RELSTRING=${RELSTRING} |
| 198 |
chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ |
221 |
eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ |
| 199 |
install DESTDIR=/R RELSTRING=${RELSTRING} |
222 |
install DESTDIR=/R RELSTRING=${RELSTRING} |
| 200 |
|
223 |
|
| 201 |
cd ${CHROOTDIR}/R |
224 |
cd ${CHROOTDIR}/R |