Re: svn commit: r364891 - in head: . release release/scripts
On Fri, Sep 11, 2020 at 09:56:31PM +0500, Ruslan Garipov wrote: > On 9/11/2020 5:55 PM, Glen Barber wrote: > > So as far as you are concerned, with the addition of removing the '!', > > it works as you expect? > Yes, it does. > > Should we also "fix" env_setup()? Which also checks NOGIT for zero > length. What if one set NOGIT up outside release.conf as NOGIT=1 (I > don't do that). Does he/she end up with "The devel/git is required"? Yes, you are correct. I made the same mistake twice... I will commit it shortly with both things fixed. Glen signature.asc Description: PGP signature
Re: svn commit: r364891 - in head: . release release/scripts
On 9/11/2020 5:55 PM, Glen Barber wrote:
> On Fri, Sep 11, 2020 at 02:13:41PM +0500, Ruslan Garipov wrote:
>> On September 9, 2020 6:51:18 PM Glen Barber wrote:
>>
>>> On Wed, Sep 09, 2020 at 11:45:49AM +0500, Ruslan Garipov wrote:
On August 28, 2020 2:19:33 AM Glen Barber wrote:
> Author: gjb
> Date: Thu Aug 27 21:19:16 2020
> New Revision: 364891
> URL: https://svnweb.freebsd.org/changeset/base/364891
>
> 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).
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).
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.
I really don't need git on my build machine (and don't need it for
building).
>>>
>>> Can you verify if the attached patch works for your use case? You will
>>> need to set NOGIT=1 in your release.conf.
>> Partially. It doesn't require devel/git to create the initial build
>> environment, but it does before beginning cross-build in the
>> extra_chroot_setup().
>>
>> You check there does the NOGIT have zero length. If NOGIT isn't empty, then
>> release.sh will ($(which git) returns nothing for me) try to install
>> devel/git port or package again. And NOGIT isn't empty because in this
>> function my release.conf was already sourced. So I had removed "not"
>> (``!'') on line #278, ignoring NOGIT checking, and cross-build started.
>>
>
> Doh! Yeah, that was a mistake - sorry about that.
>
> So as far as you are concerned, with the addition of removing the '!',
> it works as you expect?
Yes, it does.
Should we also "fix" env_setup()? Which also checks NOGIT for zero
length. What if one set NOGIT up outside release.conf as NOGIT=1 (I
don't do that). Does he/she end up with "The devel/git is required"?
>
>> It failed eventually on modifications made by r365398, but that's another
>> story.
>>
>> Thanks again, Glen!
>>
>
> Thank you for testing (and finding a silly bug)!
>
> Glen
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r364891 - in head: . release release/scripts
On Fri, Sep 11, 2020 at 02:13:41PM +0500, Ruslan Garipov wrote:
> On September 9, 2020 6:51:18 PM Glen Barber wrote:
>
> > On Wed, Sep 09, 2020 at 11:45:49AM +0500, Ruslan Garipov wrote:
> > > On August 28, 2020 2:19:33 AM Glen Barber wrote:
> > >
> > > > Author: gjb
> > > > Date: Thu Aug 27 21:19:16 2020
> > > > New Revision: 364891
> > > > URL: https://svnweb.freebsd.org/changeset/base/364891
> > > >
> > > > 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).
> > >
> > > 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).
> > >
> > > 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.
> > >
> > > I really don't need git on my build machine (and don't need it for
> > > building).
> > >
> >
> > Can you verify if the attached patch works for your use case? You will
> > need to set NOGIT=1 in your release.conf.
> Partially. It doesn't require devel/git to create the initial build
> environment, but it does before beginning cross-build in the
> extra_chroot_setup().
>
> You check there does the NOGIT have zero length. If NOGIT isn't empty, then
> release.sh will ($(which git) returns nothing for me) try to install
> devel/git port or package again. And NOGIT isn't empty because in this
> function my release.conf was already sourced. So I had removed "not"
> (``!'') on line #278, ignoring NOGIT checking, and cross-build started.
>
Doh! Yeah, that was a mistake - sorry about that.
So as far as you are concerned, with the addition of removing the '!',
it works as you expect?
> It failed eventually on modifications made by r365398, but that's another
> story.
>
> Thanks again, Glen!
>
Thank you for testing (and finding a silly bug)!
Glen
signature.asc
Description: PGP signature
Re: svn commit: r364891 - in head: . release release/scripts
On September 9, 2020 6:51:18 PM Glen Barber wrote:
On Wed, Sep 09, 2020 at 11:45:49AM +0500, Ruslan Garipov wrote:
On August 28, 2020 2:19:33 AM Glen Barber wrote:
> Author: gjb
> Date: Thu Aug 27 21:19:16 2020
> New Revision: 364891
> URL: https://svnweb.freebsd.org/changeset/base/364891
>
> 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).
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).
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.
I really don't need git on my build machine (and don't need it for
building).
Can you verify if the attached patch works for your use case? You will
need to set NOGIT=1 in your release.conf.
Partially. It doesn't require devel/git to create the initial build
environment, but it does before beginning cross-build in the
extra_chroot_setup().
You check there does the NOGIT have zero length. If NOGIT isn't empty,
then release.sh will ($(which git) returns nothing for me) try to install
devel/git port or package again. And NOGIT isn't empty because in this
function my release.conf was already sourced. So I had removed "not"
(``!'') on line #278, ignoring NOGIT checking, and cross-build started.
It failed eventually on modifications made by r365398, but that's another
story.
Thanks again, Glen!
Glen
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r364891 - in head: . release release/scripts
On Wed, Sep 09, 2020 at 11:45:49AM +0500, Ruslan Garipov wrote:
> On August 28, 2020 2:19:33 AM Glen Barber wrote:
>
> > Author: gjb
> > Date: Thu Aug 27 21:19:16 2020
> > New Revision: 364891
> > URL: https://svnweb.freebsd.org/changeset/base/364891
> >
> > 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).
>
> 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).
>
> 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.
>
> I really don't need git on my build machine (and don't need it for
> building).
>
Can you verify if the attached patch works for your use case? You will
need to set NOGIT=1 in your release.conf.
Glen
Index: release/release.conf.sample
===
--- 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="/scratch"
+## Do not explicitly require the devel/git port to be installed.
+#NOGIT=1
## Set the version control system host.
GITROOT="https://cgit-beta.freebsd.org/;
GITSRC="src.git"
Index: release/release.sh
===
--- release/release.sh (revision 365503)
+++ release/release.sh (working copy)
@@ -65,7 +65,7 @@ env_setup() {
[ ! -z "${VCSCMD}" ] && break 2
done
- 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
- # Install git from ports or packages if the ports tree is
- # available and VCSCMD is unset.
- _gitcmd="$(which git)"
- if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then
- # Trick the ports 'run-autotools-fixup' target to do the right
- # thing.
- _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
- REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V
REVISION)
- BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
- UNAME_r=${REVISION}-${BRANCH}
- GITUNSETOPTS="CONTRIB CURL CVS GITWEB GUI HTMLDOCS"
- GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
- GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
- GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
- eval chroot ${CHROOTDIR} env OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
- make -C /usr/ports/devel/git FORCE_PKG_REGISTER=1 \
- WRKDIRPREFIX=/tmp/ports \
- DISTDIR=/tmp/distfiles \
- install clean distclean
- else
- eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
- pkg install -y devel/git
- eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
- pkg clean -y
+ if [ ! -z "${NOGIT}" ]; then
+ # Install git from ports or packages if the ports tree is
+ # available and VCSCMD is unset.
+ _gitcmd="$(which git)"
+ if [ -d ${CHROOTDIR}/usr/ports -a -z "${_gitcmd}" ]; then
+ # Trick the ports 'run-autotools-fixup' target to do
the right
+ # thing.
+ _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release
-V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release
-V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
+ GITUNSETOPTS="CONTRIB CURL CVS GITWEB GUI HTMLDOCS"
+ GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
+ GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
+ GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
+ eval chroot ${CHROOTDIR} env
OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
+ make -C /usr/ports/devel/git
FORCE_PKG_REGISTER=1 \
+ WRKDIRPREFIX=/tmp/ports \
+
Re: svn commit: r364891 - in head: . release release/scripts
On August 28, 2020 2:19:33 AM Glen Barber wrote:
Author: gjb
Date: Thu Aug 27 21:19:16 2020
New Revision: 364891
URL: https://svnweb.freebsd.org/changeset/base/364891
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).
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).
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.
I really don't need git on my build machine (and don't need it for
building).
Thanks.
No MFC to stable branches is planned at this time. [1]
Discussed with: git working group [1]
Sponsored by: Rubicon Communications, LLC (netgate.com)
Added:
head/release/Makefile.inc1
- copied unchanged from r364890, projects/release-git/release/Makefile.inc1
Deleted:
head/release/scripts/relnotes-search.sh
Modified:
head/Makefile.inc1
head/release/Makefile
head/release/Makefile.azure
head/release/Makefile.ec2
head/release/Makefile.gce
head/release/Makefile.mirrors
head/release/Makefile.vagrant
head/release/release.conf.sample
head/release/release.sh
Directory Properties:
head/ (props changed)
head/cddl/ (props changed)
head/cddl/contrib/opensolaris/ (props changed)
head/contrib/bc/ (props changed)
head/contrib/byacc/ (props changed)
head/contrib/elftoolchain/ (props changed)
head/contrib/ipfilter/ (props changed)
head/contrib/llvm-project/ (props changed)
head/contrib/llvm-project/clang/ (props changed)
head/contrib/llvm-project/compiler-rt/ (props changed)
head/contrib/llvm-project/libcxx/ (props changed)
head/contrib/llvm-project/libunwind/ (props changed)
head/contrib/llvm-project/lld/ (props changed)
head/contrib/llvm-project/lldb/ (props changed)
head/contrib/llvm-project/llvm/ (props changed)
head/contrib/llvm-project/openmp/ (props changed)
head/contrib/lua/ (props changed)
head/contrib/mtree/ (props changed)
head/contrib/netbsd-tests/ (props changed)
head/contrib/openbsm/ (props changed)
head/contrib/sendmail/ (props changed)
head/contrib/sqlite3/ (props changed)
head/contrib/unbound/ (props changed)
head/crypto/openssh/ (props changed)
head/crypto/openssl/ (props changed)
head/sys/cddl/contrib/opensolaris/ (props changed)
head/sys/contrib/dev/acpica/ (props changed)
head/sys/contrib/ipfilter/ (props changed)
head/sys/gnu/dts/arm/ (props changed)
head/sys/gnu/dts/arm64/ (props changed)
head/sys/gnu/dts/include/ (props changed)
head/sys/gnu/dts/riscv/ (props changed)
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Aug 27 21:09:17 2020(r364890)
+++ head/Makefile.inc1 Thu Aug 27 21:19:16 2020(r364891)
@@ -510,6 +510,15 @@ VCS_REVISION= $$(echo r${_VCS_REVISION})
.export VCS_REVISION
.endif
+.if !defined(GIT_CMD) || empty(GIT_CMD)
+. for _P in /usr/bin /usr/local/bin
+. if exists(${_P}/git)
+GIT_CMD= ${_P}/git
+. endif
+. endfor
+.export GIT_CMD
+.endif
+
.if !defined(OSRELDATE)
.if exists(/usr/include/osreldate.h)
OSRELDATE!=awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
Modified: head/release/Makefile
==
--- head/release/Makefile Thu Aug 27 21:09:17 2020(r364890)
+++ head/release/Makefile Thu Aug 27 21:19:16 2020(r364891)
@@ -90,15 +90,6 @@ EXTRA_PACKAGES+= src.txz
.endif
.if !defined(NODOC)
EXTRA_PACKAGES+= reldoc
-. if !defined(SVN) || empty(SVN)
-. for S in svn svnlite
-. for D in /usr/local/bin /usr/bin
-.if(exists(${D}/${S}))
-SVN?= ${D}/${S}
-.endif
-. endfor
-. endfor
-. endif
.endif
RELEASE_TARGETS= ftp
@@ -173,7 +164,6 @@ ports.txz:
reldoc:
cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
env MAN4DIR=${WORLDDIR}/share/man/man4 \
- SVN=${SVN} \
_BRANCH=${BRANCH} \
${MAKE} all install clean "FORMATS=html txt" \
INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
@@ -336,4 +326,5 @@ release-install:
cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512
cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
+.include "${.CURDIR}/Makefile.inc1"
.include "${.CURDIR}/Makefile.vm"
Modified:
Re: svn commit: r364891 - in head: . release release/scripts
I'm sorry for the late response.
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).
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.
I really don't need git on my build machine (and don't need it for
building).
Thanks.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r364891 - in head: . release release/scripts
On Thu, Aug 27, 2020 at 11:37:26PM +0200, Gordon Bergling wrote: > On Thu, Aug 27, 2020 at 09:19:16PM +, Glen Barber wrote: > > Author: gjb > > Date: Thu Aug 27 21:19:16 2020 > > New Revision: 364891 > > URL: https://svnweb.freebsd.org/changeset/base/364891 > > > > Log: > > Merge the projects/release-git branch to head. > > This allows building 13.x from Git instead of Subversion. > > > > No MFC to stable branches is planned at this time. [1] > > > > Discussed with: git working group [1] > > Sponsored by: Rubicon Communications, LLC (netgate.com) > > Thanks for accomplishing this! > Thank you. > Is there any difference on building -CURRENT using the github.com > mirror compared to FreeBSD's own git sources? > The only difference is the project branches are not in the FreeBSD git repository (as far as I know, that is the only thing). Otherwise, head builds just fine(tm) using either. Oh, and the github mirror still uses the 'master' branch, whereas the FreeBSD repo uses 'main'. I think that's the only noticeable thing. Glen signature.asc Description: PGP signature
Re: svn commit: r364891 - in head: . release release/scripts
On Thu, Aug 27, 2020 at 09:19:16PM +, Glen Barber wrote: > Author: gjb > Date: Thu Aug 27 21:19:16 2020 > New Revision: 364891 > URL: https://svnweb.freebsd.org/changeset/base/364891 > > Log: > Merge the projects/release-git branch to head. > This allows building 13.x from Git instead of Subversion. > > No MFC to stable branches is planned at this time. [1] > > Discussed with: git working group [1] > Sponsored by: Rubicon Communications, LLC (netgate.com) Thanks for accomplishing this! Is there any difference on building -CURRENT using the github.com mirror compared to FreeBSD's own git sources? --Gordon signature.asc Description: PGP signature
svn commit: r364891 - in head: . release release/scripts
Author: gjb
Date: Thu Aug 27 21:19:16 2020
New Revision: 364891
URL: https://svnweb.freebsd.org/changeset/base/364891
Log:
Merge the projects/release-git branch to head.
This allows building 13.x from Git instead of Subversion.
No MFC to stable branches is planned at this time. [1]
Discussed with: git working group [1]
Sponsored by: Rubicon Communications, LLC (netgate.com)
Added:
head/release/Makefile.inc1
- copied unchanged from r364890, projects/release-git/release/Makefile.inc1
Deleted:
head/release/scripts/relnotes-search.sh
Modified:
head/Makefile.inc1
head/release/Makefile
head/release/Makefile.azure
head/release/Makefile.ec2
head/release/Makefile.gce
head/release/Makefile.mirrors
head/release/Makefile.vagrant
head/release/release.conf.sample
head/release/release.sh
Directory Properties:
head/ (props changed)
head/cddl/ (props changed)
head/cddl/contrib/opensolaris/ (props changed)
head/contrib/bc/ (props changed)
head/contrib/byacc/ (props changed)
head/contrib/elftoolchain/ (props changed)
head/contrib/ipfilter/ (props changed)
head/contrib/llvm-project/ (props changed)
head/contrib/llvm-project/clang/ (props changed)
head/contrib/llvm-project/compiler-rt/ (props changed)
head/contrib/llvm-project/libcxx/ (props changed)
head/contrib/llvm-project/libunwind/ (props changed)
head/contrib/llvm-project/lld/ (props changed)
head/contrib/llvm-project/lldb/ (props changed)
head/contrib/llvm-project/llvm/ (props changed)
head/contrib/llvm-project/openmp/ (props changed)
head/contrib/lua/ (props changed)
head/contrib/mtree/ (props changed)
head/contrib/netbsd-tests/ (props changed)
head/contrib/openbsm/ (props changed)
head/contrib/sendmail/ (props changed)
head/contrib/sqlite3/ (props changed)
head/contrib/unbound/ (props changed)
head/crypto/openssh/ (props changed)
head/crypto/openssl/ (props changed)
head/sys/cddl/contrib/opensolaris/ (props changed)
head/sys/contrib/dev/acpica/ (props changed)
head/sys/contrib/ipfilter/ (props changed)
head/sys/gnu/dts/arm/ (props changed)
head/sys/gnu/dts/arm64/ (props changed)
head/sys/gnu/dts/include/ (props changed)
head/sys/gnu/dts/riscv/ (props changed)
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Aug 27 21:09:17 2020(r364890)
+++ head/Makefile.inc1 Thu Aug 27 21:19:16 2020(r364891)
@@ -510,6 +510,15 @@ VCS_REVISION= $$(echo r${_VCS_REVISION})
.export VCS_REVISION
.endif
+.if !defined(GIT_CMD) || empty(GIT_CMD)
+. for _P in /usr/bin /usr/local/bin
+. if exists(${_P}/git)
+GIT_CMD= ${_P}/git
+. endif
+. endfor
+.export GIT_CMD
+.endif
+
.if !defined(OSRELDATE)
.if exists(/usr/include/osreldate.h)
OSRELDATE!=awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
Modified: head/release/Makefile
==
--- head/release/Makefile Thu Aug 27 21:09:17 2020(r364890)
+++ head/release/Makefile Thu Aug 27 21:19:16 2020(r364891)
@@ -90,15 +90,6 @@ EXTRA_PACKAGES+= src.txz
.endif
.if !defined(NODOC)
EXTRA_PACKAGES+= reldoc
-. if !defined(SVN) || empty(SVN)
-. for S in svn svnlite
-. for D in /usr/local/bin /usr/bin
-.if(exists(${D}/${S}))
-SVN?= ${D}/${S}
-.endif
-. endfor
-. endfor
-. endif
.endif
RELEASE_TARGETS= ftp
@@ -173,7 +164,6 @@ ports.txz:
reldoc:
cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
env MAN4DIR=${WORLDDIR}/share/man/man4 \
- SVN=${SVN} \
_BRANCH=${BRANCH} \
${MAKE} all install clean "FORMATS=html txt" \
INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
@@ -336,4 +326,5 @@ release-install:
cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512
cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
+.include "${.CURDIR}/Makefile.inc1"
.include "${.CURDIR}/Makefile.vm"
Modified: head/release/Makefile.azure
==
--- head/release/Makefile.azure Thu Aug 27 21:09:17 2020(r364890)
+++ head/release/Makefile.azure Thu Aug 27 21:19:16 2020(r364891)
@@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF
.endif
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
-SNAPSHOT_DATE!=date +-%Y-%m-%d
+SNAPSHOT_DATE!=date +-${BUILDDATE}
.endif
AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd
Modified: head/release/Makefile.ec2
==
--- head/release/Makefile.ec2 Thu Aug 27 21:09:17 2020(r364890)
+++ head/release/Makefile.ec2 Thu Aug 27
