Lines 65-81
env_setup() {
Link Here
|
65 |
[ ! -z "${VCSCMD}" ] && break 2 |
65 |
[ ! -z "${VCSCMD}" ] && break 2 |
66 |
done |
66 |
done |
67 |
|
67 |
|
68 |
# Find the Subversion binary to use. This is a workaround to use |
|
|
69 |
# the source of truth for the ports tree, as the conversion to Git |
70 |
# is targeted to occur slightly after the currently-scheduled 13.0 |
71 |
# release. |
72 |
for _dir in /usr/bin /usr/local/bin; do |
73 |
for _svn in svn svnlite; do |
74 |
[ -x "${_dir}/${_svn}" ] && SVNCMD="${_dir}/${_svn}" |
75 |
[ ! -z "${SVNCMD}" ] && break 2 |
76 |
done |
77 |
done |
78 |
|
79 |
if [ -z "${VCSCMD}" -a -z "${NOGIT}" ]; then |
68 |
if [ -z "${VCSCMD}" -a -z "${NOGIT}" ]; then |
80 |
echo "*** The devel/git port/package is required." |
69 |
echo "*** The devel/git port/package is required." |
81 |
exit 1 |
70 |
exit 1 |
Lines 86-92
env_setup() {
Link Here
|
86 |
# and ports/. |
75 |
# and ports/. |
87 |
GITROOT="https://git.FreeBSD.org/" |
76 |
GITROOT="https://git.FreeBSD.org/" |
88 |
SRCBRANCH="main" |
77 |
SRCBRANCH="main" |
89 |
PORTBRANCH="head" |
78 |
PORTBRANCH="main" |
90 |
GITSRC="src.git" |
79 |
GITSRC="src.git" |
91 |
GITPORTS="ports.git" |
80 |
GITPORTS="ports.git" |
92 |
|
81 |
|
Lines 141-148
env_check() {
Link Here
|
141 |
|
130 |
|
142 |
# Prefix the branches with the GITROOT for the full checkout URL. |
131 |
# Prefix the branches with the GITROOT for the full checkout URL. |
143 |
SRC="${GITROOT}${GITSRC}" |
132 |
SRC="${GITROOT}${GITSRC}" |
144 |
#PORT="${GITROOT}${GITPORTS}" |
133 |
PORT="${GITROOT}${GITPORTS}" |
145 |
PORT="svn://svn.freebsd.org/ports/" |
|
|
146 |
|
134 |
|
147 |
if [ -n "${EMBEDDEDBUILD}" ]; then |
135 |
if [ -n "${EMBEDDEDBUILD}" ]; then |
148 |
WITH_DVD= |
136 |
WITH_DVD= |
Lines 217-238
chroot_setup() {
Link Here
|
217 |
|
205 |
|
218 |
if [ -z "${SRC_UPDATE_SKIP}" ]; then |
206 |
if [ -z "${SRC_UPDATE_SKIP}" ]; then |
219 |
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then |
207 |
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then |
220 |
git -C ${CHROOTDIR}/usr/src pull -q |
208 |
${VCSCMD} -C ${CHROOTDIR}/usr/src pull -q |
221 |
else |
209 |
else |
222 |
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src |
210 |
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src |
223 |
fi |
211 |
fi |
224 |
fi |
212 |
fi |
225 |
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then |
213 |
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then |
226 |
# if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then |
214 |
if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then |
227 |
# git -C ${CHROOTDIR}/usr/ports pull -q |
215 |
${VCSCMD} -C ${CHROOTDIR}/usr/ports pull -q |
228 |
# XXX: Workaround for the overlap in the Git conversion timeframe. |
|
|
229 |
if [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then |
230 |
${SVNCMD} update ${CHROOTDIR}/usr/ports |
231 |
else |
216 |
else |
232 |
#${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports |
217 |
${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports |
233 |
# XXX: Workaround for the overlap in the Git |
|
|
234 |
# conversion timeframe. |
235 |
${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports |
236 |
fi |
218 |
fi |
237 |
fi |
219 |
fi |
238 |
|
220 |
|