Date: Wed, 9 Sep 2020 13:51:14 +0000 From: Glen Barber <gjb@freebsd.org> To: Ruslan Garipov <ruslanngaripov@gmail.com> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364891 - in head: . release release/scripts Message-ID: <20200909135114.GC61041@FreeBSD.org> In-Reply-To: <174719d0148.27b9.e2363f32305322128423a5fd7014e4c4@gmail.com> References: <202008272119.07RLJGgb043888@repo.freebsd.org> <174719d0148.27b9.e2363f32305322128423a5fd7014e4c4@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--JYM0PCMtI8imgUPy Content-Type: multipart/mixed; boundary="Vqhh7KwsSol0ht3S" Content-Disposition: inline --Vqhh7KwsSol0ht3S Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 09, 2020 at 11:45:49AM +0500, Ruslan Garipov wrote: > On August 28, 2020 2:19:33 AM Glen Barber <gjb@FreeBSD.org> wrote: >=20 > > Author: gjb > > Date: Thu Aug 27 21:19:16 2020 > > New Revision: 364891 > > URL: https://svnweb.freebsd.org/changeset/base/364891 > >=20 > > Log: > > Merge the projects/release-git branch to head. > > This allows building 13.x from Git instead of Subversion. > I'm sorry for the late response (and for the bad first one I made on this > commit recently via Gmail web client). >=20 > My build machine is completely offline. I provide it with fresh snapshots > of the source and ports tree manually -- via tarballs which I'm pulling on > a FreeBSD machine having Internet connection. Therefore, neither > "/scratch", nor the chrooted environment for me don't require Internet > access (I fetch distfiles for offline usage too). >=20 > Can we somehow remove that requirement for the devel/git port? For > example, if one has set all three {SRC,PORTS,DOC}_UPDATE_SKIP variables, > then release/release.sh doesn't require devel/git to exist on the host. >=20 > I really don't need git on my build machine (and don't need it for > building). >=20 Can you verify if the attached patch works for your use case? You will need to set NOGIT=3D1 in your release.conf. Glen --Vqhh7KwsSol0ht3S Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="release_sh.txt" Content-Transfer-Encoding: quoted-printable Index: release/release.conf.sample =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- release/release.conf.sample (revision 365503) +++ release/release.conf.sample (working copy) @@ -12,6 +12,8 @@ ## Set the directory within which the release will be built. CHROOTDIR=3D"/scratch" =20 +## Do not explicitly require the devel/git port to be installed. +#NOGIT=3D1 ## Set the version control system host. GITROOT=3D"https://cgit-beta.freebsd.org/" GITSRC=3D"src.git" Index: release/release.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- release/release.sh (revision 365503) +++ release/release.sh (working copy) @@ -65,7 +65,7 @@ env_setup() { [ ! -z "${VCSCMD}" ] && break 2 done =20 - if [ -z "${VCSCMD}" ]; then + if [ -z "${VCSCMD}" -a ! -z "${NOGIT}" ]; then echo "*** The devel/git port/package is required." exit 1 fi @@ -275,30 +275,32 @@ extra_chroot_setup() { cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} fi =20 - # Install git from ports or packages if the ports tree is - # available and VCSCMD is unset. - _gitcmd=3D"$(which git)" - if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then - # Trick the ports 'run-autotools-fixup' target to do the right - # thing. - _OSVERSION=3D$(chroot ${CHROOTDIR} /usr/bin/uname -U) - REVISION=3D$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) - BRANCH=3D$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) - UNAME_r=3D${REVISION}-${BRANCH} - GITUNSETOPTS=3D"CONTRIB CURL CVS GITWEB GUI HTMLDOCS" - GITUNSETOPTS=3D"${GITUNSETOPTS} ICONV NLS P4 PERL" - GITUNSETOPTS=3D"${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN" - GITUNSETOPTS=3D"${GITUNSETOPTS} PCRE PCRE2" - eval chroot ${CHROOTDIR} env OPTIONS_UNSET=3D\"${GITUNSETOPTS}\" \ - make -C /usr/ports/devel/git FORCE_PKG_REGISTER=3D1 \ - WRKDIRPREFIX=3D/tmp/ports \ - DISTDIR=3D/tmp/distfiles \ - install clean distclean - else - eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=3Dyes \ - pkg install -y devel/git - eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=3Dyes \ - pkg clean -y + if [ ! -z "${NOGIT}" ]; then + # Install git from ports or packages if the ports tree is + # available and VCSCMD is unset. + _gitcmd=3D"$(which git)" + if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then + # Trick the ports 'run-autotools-fixup' target to do the right + # thing. + _OSVERSION=3D$(chroot ${CHROOTDIR} /usr/bin/uname -U) + REVISION=3D$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=3D$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=3D${REVISION}-${BRANCH} + GITUNSETOPTS=3D"CONTRIB CURL CVS GITWEB GUI HTMLDOCS" + GITUNSETOPTS=3D"${GITUNSETOPTS} ICONV NLS P4 PERL" + GITUNSETOPTS=3D"${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN" + GITUNSETOPTS=3D"${GITUNSETOPTS} PCRE PCRE2" + eval chroot ${CHROOTDIR} env OPTIONS_UNSET=3D\"${GITUNSETOPTS}\" \ + make -C /usr/ports/devel/git FORCE_PKG_REGISTER=3D1 \ + WRKDIRPREFIX=3D/tmp/ports \ + DISTDIR=3D/tmp/distfiles \ + install clean distclean + else + eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=3Dyes \ + pkg install -y devel/git + eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=3Dyes \ + pkg clean -y + fi fi if [ -d ${CHROOTDIR}/usr/ports ]; then # Trick the ports 'run-autotools-fixup' target to do the right --Vqhh7KwsSol0ht3S-- --JYM0PCMtI8imgUPy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl9Y3cwACgkQAxRYpUeP 4pMTYA//eHzYD5qVXrj7UQnmqEp90GzpZ2K5tu8K4EtcbbxjjnziKBCf4QxghQsW m3H6OZ8EyAOKGauuSWM03VRGByhog4JqC/3hYfl1ZByyyPv+940sshif02tvlml2 HyUolDTl201gpmLZs4xdio9z72LfXpvyApg7IaorDJEw1PmB5FGgR8xZaRhiff7R PVVjhoREwrdtlQH8wkp1vCamiIreEMUtZ2WjvuyNo8xLoHU1puMMFn3HpLWH+UBr 8aanU2XgapRQ7b87eIELPVQTqOs363gO8yhPmFlaQ9+qIyAV4xKZxXUyG9zyukSn sCmT+nM4IIyyzqMHJi8Pmno3aF4sGgIaBEx3UY5dI27M+Uy/wPtsrawjDrEczLDo 4GMQBy36kySmXWrkwePP1i0B5O18/sDkR6J8XtC8O6bOMKh4xeoZIWANal3kbeZn uoS2wT3eJIXMJuCVxCBhneJ/Vm2Cudq4l8kjCqUi/YiNHXhlKOzRRi3teu3uczPT SpNlYct73B8QgpQLQgyIkMI1iYZgA1R2zRbgMKLMu/aulMSQ7wOX51NFSeBx8KGY tLDV8yLBF9uwu6rRHlTvXMsTZGLPQg2tbQhvis9uND48TtmXQNnCaT+mOfo+qx/g gLE0fR5CSRVk2tj3qqBLcxxpTDXHaV/UPxOlzukjR/qbCZHGIeA= =SjN8 -----END PGP SIGNATURE----- --JYM0PCMtI8imgUPy--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200909135114.GC61041>