svn commit: r368704 - head/release
Author: gjb
Date: Wed Dec 16 18:40:49 2020
New Revision: 368704
URL: https://svnweb.freebsd.org/changeset/base/368704
Log:
Append the branch commit count to _SNAP_SUFFIX for development
snapshot builds.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.inc1
head/release/Makefile.mirrors
Modified: head/release/Makefile.inc1
==
--- head/release/Makefile.inc1 Wed Dec 16 18:01:41 2020(r368703)
+++ head/release/Makefile.inc1 Wed Dec 16 18:40:49 2020(r368704)
@@ -21,11 +21,17 @@ GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbre
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD
2>/dev/null || true
. export GITREV
. endif
+. if !defined(GITCOUNT) || empty(GITCOUNT)
+GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --count HEAD 2>/dev/null ||
true
+. export GITCOUNT
+. endif
.else
GITBRANCH= nullbranch
GITREV=nullhash
+GITCOUNT= nullcount
. export GITBRANCH
. export GITREV
+. export GITCOUNT
.endif
# Set the build date, primarily for snapshot builds.
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Wed Dec 16 18:01:41 2020
(r368703)
+++ head/release/Makefile.mirrors Wed Dec 16 18:40:49 2020
(r368704)
@@ -33,7 +33,7 @@ TLD?= ${FTPDIR}/snapshots
.if !defined(BUILDDATE) || empty(BUILDDATE)
BUILDDATE!=date +%Y%m%d
.endif
-_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}
+_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}-${GITCOUNT}
.else
# release
SNAPSHOT=
___
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"
svn commit: r368493 - head/release
Author: gjb
Date: Wed Dec 9 20:38:26 2020
New Revision: 368493
URL: https://svnweb.freebsd.org/changeset/base/368493
Log:
Fix staging riscv images.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Wed Dec 9 20:13:12 2020
(r368492)
+++ head/release/Makefile.mirrors Wed Dec 9 20:38:26 2020
(r368493)
@@ -21,7 +21,7 @@ STAGE_TARGETS?= iso-images-stage
.endif
.if (defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET)) ||
(defined(EMBEDDEDBUILD) && !empty(EMBEDDEDBUILD))
-. if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != ""
+. if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != "" ||
${TARGET:Mriscv*} != ""
EMBEDDED= 1
. endif
.endif
@@ -41,7 +41,7 @@ TLD?= ${FTPDIR}/releases
.endif
.if defined(EMBEDDED) && !empty(EMBEDDED)
-. if ${TARGET:Marm*} != "" && (${TARGET_ARCH:Marm*} != "" || ${TARGET_ARCH} ==
"aarch64")
+. if ${TARGET:Marm*} != "" && (${TARGET_ARCH:Marm*} != "" || ${TARGET_ARCH} ==
"aarch64") || ${TARGET:Mriscv*} != ""
. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE" || ${BRANCH:MALPHA*} != ""
SNAPSHOT= 1
. endif
___
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"
svn commit: r368476 - head/release/riscv
Author: gjb
Date: Wed Dec 9 02:21:25 2020
New Revision: 368476
URL: https://svnweb.freebsd.org/changeset/base/368476
Log:
Copy arm64 make-memstick.sh and mkisoimages.sh to the riscv
directory to allow properly building *.iso and *.img files.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Added:
head/release/riscv/make-memstick.sh
- copied unchanged from r368474, head/release/arm64/make-memstick.sh
head/release/riscv/mkisoimages.sh
- copied unchanged from r368474, head/release/arm64/mkisoimages.sh
Copied: head/release/riscv/make-memstick.sh (from r368474,
head/release/arm64/make-memstick.sh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/release/riscv/make-memstick.sh Wed Dec 9 02:21:25 2020
(r368476, copy of r368474, head/release/arm64/make-memstick.sh)
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# This script generates a "memstick image" (image that can be copied to a
+# USB memory stick) from a directory tree. Note that the script does not
+# clean up after itself very well for error conditions on purpose so the
+# problem can be diagnosed (full filesystem most likely but ...).
+#
+# Usage: make-memstick.sh
+#
+# $FreeBSD$
+#
+
+set -e
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+export PATH
+
+scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../../tools/boot/install-boot.sh
+
+if [ $# -ne 2 ]; then
+ echo "make-memstick.sh /path/to/directory /path/to/image/file"
+ exit 1
+fi
+
+if [ ! -d ${1} ]; then
+ echo "${1} must be a directory"
+ exit 1
+fi
+
+if [ -e ${2} ]; then
+ echo "won't overwrite ${2}"
+ exit 1
+fi
+
+echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
+echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
+makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
+rm ${1}/etc/fstab
+rm ${1}/etc/rc.conf.local
+
+# Make an ESP in a file.
+espfilename=$(mktemp /tmp/efiboot.XX)
+make_esp_file ${espfilename} ${fat32min} ${1}/boot/loader.efi
+
+mkimg -s gpt \
+-p efi:=${espfilename} \
+-p freebsd-ufs:=${2}.part \
+-o ${2}
+rm ${espfilename}
+rm ${2}.part
+
Copied: head/release/riscv/mkisoimages.sh (from r368474,
head/release/arm64/mkisoimages.sh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/release/riscv/mkisoimages.sh Wed Dec 9 02:21:25 2020
(r368476, copy of r368474, head/release/arm64/mkisoimages.sh)
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# This script is used by release/Makefile to build the (optional) ISO images
+# for a FreeBSD release. It is considered architecture dependent since each
+# platform has a slightly unique way of making bootable CDs. This script is
+# also allowed to generate any number of images since that is more of
+# publishing decision than anything else.
+#
+# Usage:
+#
+# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
+#
+# Where -b is passed if the ISO image should be made "bootable" by
+# whatever standards this architecture supports (may be unsupported),
+# image-label is the ISO image label, image-name is the filename of the
+# resulting ISO image, base-bits-dir contains the image contents and
+# extra-bits-dir, if provided, contains additional files to be merged
+# into base-bits-dir as part of making the image.
+
+set -e
+
+scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../../tools/boot/install-boot.sh
+
+if [ -z $ETDUMP ]; then
+ ETDUMP=etdump
+fi
+
+if [ -z $MAKEFS ]; then
+ MAKEFS=makefs
+fi
+
+if [ -z $MKIMG ]; then
+ MKIMG=mkimg
+fi
+
+if [ "$1" = "-b" ]; then
+ BASEBITSDIR="$4"
+
+ # Make an EFI system partition.
+ espfilename=$(mktemp /tmp/efiboot.XX)
+ # ESP file size in KB.
+ espsize="2048"
+ make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi
+
+ bootable="-o bootimage=efi;${espfilename} -o no-emul-boot -o
platformid=efi"
+
+ shift
+else
+ BASEBITSDIR="$3"
+ bootable=""
+fi
+
+if [ $# -lt 3 ]; then
+ echo "Usage: $0 [-b] image-label image-name base-bits-dir
[extra-bits-dir]"
+ exit 1
+fi
+
+LABEL=`echo "$1" | tr '[:lower:]' '[:upper:]'`; shift
+NAME="$1"; shift
+
+publisher="The FreeBSD Project. https://www.FreeBSD.org/;
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
+$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o
publisher="$publisher" "$NAME" "$@"
+rm -f "$BASEBITSDIR/etc/fstab"
+rm -f ${espfilename}
+
+if [ "$bootable" != "" ]; then
+ # Look for the EFI System Partition image we dropped in the ISO image.
+ for entry in `$ETDUMP --format shell $NAME`; do
+ eval $entry
+ # XXX: etdump(8) returns "default" for the initial entry
+ if [ "$et_platform" = "default"
svn commit: r366738 - in head/release: amd64 arm64
Author: gjb
Date: Thu Oct 15 23:05:13 2020
New Revision: 366738
URL: https://svnweb.freebsd.org/changeset/base/366738
Log:
Bump the ISO EFI partition size from 1024 to 2048, following r366732.
Suggested by: imp
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/amd64/mkisoimages.sh
head/release/arm64/mkisoimages.sh
Modified: head/release/amd64/mkisoimages.sh
==
--- head/release/amd64/mkisoimages.sh Thu Oct 15 20:21:15 2020
(r366737)
+++ head/release/amd64/mkisoimages.sh Thu Oct 15 23:05:13 2020
(r366738)
@@ -48,7 +48,7 @@ if [ "$1" = "-b" ]; then
# Make EFI system partition.
espfilename=$(mktemp /tmp/efiboot.XX)
# ESP file size in KB.
- espsize="1024"
+ espsize="2048"
make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi
bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o
platformid=efi"
Modified: head/release/arm64/mkisoimages.sh
==
--- head/release/arm64/mkisoimages.sh Thu Oct 15 20:21:15 2020
(r366737)
+++ head/release/arm64/mkisoimages.sh Thu Oct 15 23:05:13 2020
(r366738)
@@ -42,7 +42,7 @@ if [ "$1" = "-b" ]; then
# Make an EFI system partition.
espfilename=$(mktemp /tmp/efiboot.XX)
# ESP file size in KB.
- espsize="1024"
+ espsize="2048"
make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi
bootable="-o bootimage=efi;${espfilename} -o no-emul-boot -o
platformid=efi"
___
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"
svn commit: r366732 - in head/release: amd64 arm64
Author: gjb
Date: Thu Oct 15 17:12:58 2020
New Revision: 366732
URL: https://svnweb.freebsd.org/changeset/base/366732
Log:
Increase the amd64 ISO ESP file size from 800KB to 1024KB.
At some poing over the last week, the bootx64.efi file has grown
past the 800KB threshold, resulting in being unable to copy it to
the EFI/BOOT directory.
# stat -f %z efiboot.znWo7m
819200
# stat -f %z stand-test.PIEugN/EFI/BOOT/bootx64.efi
842752
The comment in the script that creates the ISOs suggests that 800KB
is the maximum allowed for the boot code, however I was able to
boot an ISO with a 1024KB boot partition. Additionally, I verified
against an ISO from OtherOS, where the boot EFI partition is 2.4MB.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/amd64/mkisoimages.sh
head/release/arm64/mkisoimages.sh
Modified: head/release/amd64/mkisoimages.sh
==
--- head/release/amd64/mkisoimages.sh Thu Oct 15 17:05:21 2020
(r366731)
+++ head/release/amd64/mkisoimages.sh Thu Oct 15 17:12:58 2020
(r366732)
@@ -46,10 +46,10 @@ if [ "$1" = "-b" ]; then
bootable="-o bootimage=i386;$BASEBITSDIR/boot/cdboot -o no-emul-boot"
# Make EFI system partition.
- # The ISO file is a special case, in that it only has a maximum of
- # 800 KB available for the boot code. So make an 800 KB ESP
espfilename=$(mktemp /tmp/efiboot.XX)
- make_esp_file ${espfilename} 800 ${BASEBITSDIR}/boot/loader.efi
+ # ESP file size in KB.
+ espsize="1024"
+ make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi
bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o
platformid=efi"
shift
Modified: head/release/arm64/mkisoimages.sh
==
--- head/release/arm64/mkisoimages.sh Thu Oct 15 17:05:21 2020
(r366731)
+++ head/release/arm64/mkisoimages.sh Thu Oct 15 17:12:58 2020
(r366732)
@@ -40,10 +40,10 @@ if [ "$1" = "-b" ]; then
BASEBITSDIR="$4"
# Make an EFI system partition.
- # The ISO file is a special case, in that it only has a maximum of
- # 800 KB available for the boot code. So make an 800 KB ESP
espfilename=$(mktemp /tmp/efiboot.XX)
- make_esp_file ${espfilename} 800 ${BASEBITSDIR}/boot/loader.efi
+ # ESP file size in KB.
+ espsize="1024"
+ make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi
bootable="-o bootimage=efi;${espfilename} -o no-emul-boot -o
platformid=efi"
___
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"
svn commit: r365725 - head/release
Author: gjb
Date: Mon Sep 14 15:58:10 2020
New Revision: 365725
URL: https://svnweb.freebsd.org/changeset/base/365725
Log:
Fix setting RELENGDIR when release.sh is called from an external
script.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Mon Sep 14 15:48:30 2020(r365724)
+++ head/release/release.sh Mon Sep 14 15:58:10 2020(r365725)
@@ -57,7 +57,9 @@ usage() {
env_setup() {
# The directory within which the release will be built.
CHROOTDIR="/scratch"
- RELENGDIR="$(dirname $(realpath ${0}))"
+ if [ -z "${RELENGDIR}" ]; then
+ export RELENGDIR="$(dirname $(realpath ${0}))"
+ fi
# The default version control system command to obtain the sources.
for _dir in /usr/bin /usr/local/bin; do
___
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"
svn commit: r365646 - head/sys/conf
Author: gjb
Date: Sat Sep 12 00:06:45 2020
New Revision: 365646
URL: https://svnweb.freebsd.org/changeset/base/365646
Log:
Enclose BRANCH_OVERRIDE in quotes in order to fix an issue with
freebsd-update(8) builds, where BRANCH is suffixed with -p0 for
builds.
Noticed by: gordon
With help from: cperciva
MFC after:3 days
MFC note: before 12.2-BETA2
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shFri Sep 11 23:37:49 2020(r365645)
+++ head/sys/conf/newvers.shSat Sep 12 00:06:45 2020(r365646)
@@ -54,7 +54,7 @@
TYPE="FreeBSD"
REVISION="13.0"
-BRANCH=${BRANCH_OVERRIDE:-CURRENT}
+BRANCH="${BRANCH_OVERRIDE:-CURRENT}"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
___
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"
svn commit: r365639 - head/release
Author: gjb
Date: Fri Sep 11 17:05:09 2020
New Revision: 365639
URL: https://svnweb.freebsd.org/changeset/base/365639
Log:
Fix indentation following r365638. No functional changes.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Fri Sep 11 17:04:09 2020(r365638)
+++ head/release/release.sh Fri Sep 11 17:05:09 2020(r365639)
@@ -276,31 +276,31 @@ extra_chroot_setup() {
fi
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 \
- 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
- 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
+ fi
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
# Trick the ports 'run-autotools-fixup' target to do the right
___
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"
svn commit: r365638 - head/release
Author: gjb
Date: Fri Sep 11 17:04:09 2020
New Revision: 365638
URL: https://svnweb.freebsd.org/changeset/base/365638
Log:
Add a NOGIT option to avoid explicitly requiring devel/git if the
sources are obtained through a different mechanism.
Reported and tested by: Ruslan Garipov
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.conf.sample
head/release/release.sh
Modified: head/release/release.conf.sample
==
--- head/release/release.conf.sampleFri Sep 11 16:13:45 2020
(r365637)
+++ head/release/release.conf.sampleFri Sep 11 17:04:09 2020
(r365638)
@@ -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"
Modified: head/release/release.sh
==
--- head/release/release.sh Fri Sep 11 16:13:45 2020(r365637)
+++ head/release/release.sh Fri Sep 11 17:04:09 2020(r365638)
@@ -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,6 +275,7 @@ extra_chroot_setup() {
cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF}
fi
+ if [ -z "${NOGIT}" ]; then
# Install git from ports or packages if the ports tree is
# available and VCSCMD is unset.
_gitcmd="$(which git)"
@@ -299,6 +300,7 @@ extra_chroot_setup() {
pkg install -y devel/git
eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
pkg clean -y
+ fi
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
# Trick the ports 'run-autotools-fixup' target to do the right
___
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 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 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 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}
svn commit: r364968 - head/release
Author: gjb
Date: Sat Aug 29 21:47:49 2020
New Revision: 364968
URL: https://svnweb.freebsd.org/changeset/base/364968
Log:
Fix ordering of the 'pull' subcommand and the '-q' flag.
Pointyhat to: gjb (myself)
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Aug 29 21:46:34 2020(r364967)
+++ head/release/release.sh Sat Aug 29 21:47:49 2020(r364968)
@@ -221,21 +221,21 @@ chroot_setup() {
if [ -z "${SRC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
- git -C ${CHROOTDIR}/usr/src -q pull
+ git -C ${CHROOTDIR}/usr/src pull -q
else
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
- git -C ${CHROOTDIR}/usr/doc -q pull
+ git -C ${CHROOTDIR}/usr/doc pull -q
else
${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
- git -C ${CHROOTDIR}/usr/ports -q pull
+ git -C ${CHROOTDIR}/usr/ports pull -q
else
${VCSCMD} ${PORT} -b ${PORTBRANCH}
${CHROOTDIR}/usr/ports
fi
___
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"
svn commit: r364967 - head/release
Author: gjb
Date: Sat Aug 29 21:46:34 2020
New Revision: 364967
URL: https://svnweb.freebsd.org/changeset/base/364967
Log:
Restore the '-q' flag to the 'git pull' command.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Aug 29 21:42:59 2020(r364966)
+++ head/release/release.sh Sat Aug 29 21:46:34 2020(r364967)
@@ -221,21 +221,21 @@ chroot_setup() {
if [ -z "${SRC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
- git -C ${CHROOTDIR}/usr/src pull
+ git -C ${CHROOTDIR}/usr/src -q pull
else
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
- git -C ${CHROOTDIR}/usr/doc pull
+ git -C ${CHROOTDIR}/usr/doc -q pull
else
${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
- git -C ${CHROOTDIR}/usr/ports pull
+ git -C ${CHROOTDIR}/usr/ports -q pull
else
${VCSCMD} ${PORT} -b ${PORTBRANCH}
${CHROOTDIR}/usr/ports
fi
___
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"
svn commit: r364966 - head/release
Author: gjb
Date: Sat Aug 29 21:42:59 2020
New Revision: 364966
URL: https://svnweb.freebsd.org/changeset/base/364966
Log:
Remove the VCSUPDATE command, because git is too stupid to have
the '-C ' after the subcommand.
Meanwhile, hard-code 'git -C <...> pull' for now.
Reported by: Michael Butler
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Aug 29 21:05:43 2020(r364965)
+++ head/release/release.sh Sat Aug 29 21:42:59 2020(r364966)
@@ -70,7 +70,6 @@ env_setup() {
exit 1
fi
VCSCMD="/usr/local/bin/git clone -q"
- VCSUPDATE="/usr/local/bin/git pull -q"
# The default git checkout server, and branches for src/, doc/,
# and ports/.
@@ -222,21 +221,21 @@ chroot_setup() {
if [ -z "${SRC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
- ${VCSUPDATE} -C ${CHROOTDIR}/usr/src
+ git -C ${CHROOTDIR}/usr/src pull
else
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
- ${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
+ git -C ${CHROOTDIR}/usr/doc pull
else
${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
- ${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
+ git -C ${CHROOTDIR}/usr/ports pull
else
${VCSCMD} ${PORT} -b ${PORTBRANCH}
${CHROOTDIR}/usr/ports
fi
___
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"
svn commit: r364960 - head/release
Author: gjb
Date: Sat Aug 29 16:04:02 2020
New Revision: 364960
URL: https://svnweb.freebsd.org/changeset/base/364960
Log:
Refine the VCSUPDATE logic further:
- Look for the .git directory instead of top-level directory.
- Use 'git -C' instead of cd(1).
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Aug 29 15:50:27 2020(r364959)
+++ head/release/release.sh Sat Aug 29 16:04:02 2020(r364960)
@@ -221,22 +221,22 @@ chroot_setup() {
mkdir -p ${CHROOTDIR}/usr
if [ -z "${SRC_UPDATE_SKIP}" ]; then
- if [ -d "${CHROOTDIR}/usr/src" ]; then
- cd ${CHROOTDIR}/usr/src && ${VCSUPDATE} && cd -
+ if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
+ ${VCSUPDATE} -C ${CHROOTDIR}/usr/src
else
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
- if [ -d "${CHROOTDIR}/usr/doc" ]; then
- cd ${CHROOTDIR}/usr/doc && ${VCSUPDATE} && cd -
+ if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
+ ${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
else
${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
- if [ -d "${CHROOTDIR}/usr/ports" ]; then
- cd ${CHROOTDIR}/usr/ports && ${VCSUPDATE} && cd -
+ if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
+ ${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
else
${VCSCMD} ${PORT} -b ${PORTBRANCH}
${CHROOTDIR}/usr/ports
fi
___
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"
svn commit: r364959 - head/release
Author: gjb
Date: Sat Aug 29 15:50:27 2020
New Revision: 364959
URL: https://svnweb.freebsd.org/changeset/base/364959
Log:
Add a VCSUPDATE command to run 'git pull' instead of 'git clone'
if the tree already exists.
Reported by: Michael Butler
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Aug 29 15:31:23 2020(r364958)
+++ head/release/release.sh Sat Aug 29 15:50:27 2020(r364959)
@@ -70,6 +70,7 @@ env_setup() {
exit 1
fi
VCSCMD="/usr/local/bin/git clone -q"
+ VCSUPDATE="/usr/local/bin/git pull -q"
# The default git checkout server, and branches for src/, doc/,
# and ports/.
@@ -220,13 +221,25 @@ chroot_setup() {
mkdir -p ${CHROOTDIR}/usr
if [ -z "${SRC_UPDATE_SKIP}" ]; then
- ${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
+ if [ -d "${CHROOTDIR}/usr/src" ]; then
+ cd ${CHROOTDIR}/usr/src && ${VCSUPDATE} && cd -
+ else
+ ${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
+ fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
- ${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
+ if [ -d "${CHROOTDIR}/usr/doc" ]; then
+ cd ${CHROOTDIR}/usr/doc && ${VCSUPDATE} && cd -
+ else
+ ${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
+ fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
- ${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
+ if [ -d "${CHROOTDIR}/usr/ports" ]; then
+ cd ${CHROOTDIR}/usr/ports && ${VCSUPDATE} && cd -
+ else
+ ${VCSCMD} ${PORT} -b ${PORTBRANCH}
${CHROOTDIR}/usr/ports
+ fi
fi
if [ -z "${CHROOTBUILD_SKIP}" ]; then
___
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"
svn commit: r364958 - head/release
Author: gjb
Date: Sat Aug 29 15:31:23 2020
New Revision: 364958
URL: https://svnweb.freebsd.org/changeset/base/364958
Log:
Indentation fixes. No functional changes.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.inc1
Modified: head/release/Makefile.inc1
==
--- head/release/Makefile.inc1 Sat Aug 29 15:30:21 2020(r364957)
+++ head/release/Makefile.inc1 Sat Aug 29 15:31:23 2020(r364958)
@@ -13,19 +13,19 @@ GIT_CMD= ${_P}/git
.if !empty(GIT_CMD) && exists(${GIT_CMD})
# Set the git branch and hash to export where needed.
-.if !defined(GITBRANCH) || empty(GITBRANCH)
+. if !defined(GITBRANCH) || empty(GITBRANCH)
GITBRANCH!=${GIT_CMD} -C ${.CURDIR} rev-parse --abbrev-ref HEAD
2>/dev/null | sed -e 's/\^\///'
-.export GITBRANCH
-.endif
-.if !defined(GITREV) || empty(GITREV)
+. export GITBRANCH
+. endif
+. if !defined(GITREV) || empty(GITREV)
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD
2>/dev/null || true
-.export GITREV
-.endif
+. export GITREV
+. endif
.else
GITBRANCH= nullbranch
GITREV=nullhash
-.export GITBRANCH
-.export GITREV
+. export GITBRANCH
+. export GITREV
.endif
# Set the build date, primarily for snapshot builds.
___
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"
svn commit: r364957 - head/release
Author: gjb
Date: Sat Aug 29 15:30:21 2020
New Revision: 364957
URL: https://svnweb.freebsd.org/changeset/base/364957
Log:
Avoid the build from falling over if devel/git is not installed
on the system. Set a null branch/hash in this case, to avoid
undefined GITREV/GITBRANCH variables from falling over in other
areas.
Reported by: many
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.inc1
Modified: head/release/Makefile.inc1
==
--- head/release/Makefile.inc1 Sat Aug 29 15:13:07 2020(r364956)
+++ head/release/Makefile.inc1 Sat Aug 29 15:30:21 2020(r364957)
@@ -10,10 +10,8 @@ GIT_CMD= ${_P}/git
. endif
. endif
.endfor
-.if !defined(GIT_CMD) && empty(GIT_CMD)
-. error "Git binary not found. Set GIT_CMD appropriately."
-.endif
+.if !empty(GIT_CMD) && exists(${GIT_CMD})
# Set the git branch and hash to export where needed.
.if !defined(GITBRANCH) || empty(GITBRANCH)
GITBRANCH!=${GIT_CMD} -C ${.CURDIR} rev-parse --abbrev-ref HEAD
2>/dev/null | sed -e 's/\^\///'
@@ -21,6 +19,12 @@ GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbre
.endif
.if !defined(GITREV) || empty(GITREV)
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD
2>/dev/null || true
+.export GITREV
+.endif
+.else
+GITBRANCH= nullbranch
+GITREV=nullhash
+.export GITBRANCH
.export GITREV
.endif
___
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"
svn commit: r364956 - head/release
Author: gjb
Date: Sat Aug 29 15:13:07 2020
New Revision: 364956
URL: https://svnweb.freebsd.org/changeset/base/364956
Log:
Install devel/git from packages if NOPORTS is set in the release.sh
configuration file.
Reported by: Michael Butler
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Sat Aug 29 12:54:17 2020(r364955)
+++ head/release/release.sh Sat Aug 29 15:13:07 2020(r364956)
@@ -282,6 +282,11 @@ extra_chroot_setup() {
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
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
# Trick the ports 'run-autotools-fixup' target to do the right
___
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"
svn commit: r364899 - head/release
Author: gjb
Date: Fri Aug 28 02:09:10 2020
New Revision: 364899
URL: https://svnweb.freebsd.org/changeset/base/364899
Log:
Add a new line to force a commit to verify if lwhsu did indeed
fix the jenkins build by adding git to the dependency list.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.inc1
Modified: head/release/Makefile.inc1
==
--- head/release/Makefile.inc1 Fri Aug 28 01:55:35 2020(r364898)
+++ head/release/Makefile.inc1 Fri Aug 28 02:09:10 2020(r364899)
@@ -29,3 +29,4 @@ GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify -
BUILDDATE!=date +%Y%m%d
.export BUILDDATE
.endif
+
___
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 +0000, 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
svn commit: r364891 - in head: . release release/scripts
xists(${_D}/${_S})
-SVNVERSION?= ${_D}/${_S}
-.endif
-. endfor
-. endfor
-. if exists(${SVNVERSION}) && !empty(SVNVERSION)
-SVNREVISION!= ${SVNVERSION} ${WORLDDIR}/Makefile
-. endif
-. endif # !defined(SVNREVISION)
-. if !defined(BUILDDATE) || empty(BUILDDATE)
-. if exists(${.CURDIR}/${.OBJDIR}/dist/base/bin/sh)
-BUILDDATE!=cd ${.CURDIR} && date -j -f '%s' $$(stat -f "%c"
${.OBJDIR}/dist/base/bin/sh) +%Y%m%d
-. else
+.if !defined(BUILDDATE) || empty(BUILDDATE)
BUILDDATE!=date +%Y%m%d
-. endif
-. endif
-_SNAP_SUFFIX:= ${BUILDDATE}-r${SVNREVISION}
+.endif
+_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}
.else
# release
SNAPSHOT=
@@ -187,8 +170,8 @@ iso-images-stage:
mkdir -p ${FTP_DIR}
cp -p ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR}
echo ${BUILDDATE} > ${FTP_DIR}/BUILDDATE
- echo ${SRCBRANCH} > ${FTP_DIR}/SRCBRANCH
- echo r${SVNREVISION} > ${FTP_DIR}/REVISION
+ echo ${GITBRANCH} > ${FTP_DIR}/GITBRANCH
+ echo ${GITREV} > ${FTP_DIR}/REVISION
cd ${TLD}/${TARGET} && \
ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
${REVISION}-${BRANCH}
Modified: head/release/Makefile.vagrant
==
--- head/release/Makefile.vagrant Thu Aug 27 21:09:17 2020
(r364890)
+++ head/release/Makefile.vagrant Thu Aug 27 21:19:16 2020
(r364891)
@@ -29,7 +29,7 @@ ATLAS${VAR}:= ${VAGRANT${VAR}}
.endif
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
-SNAPSHOT_DATE!=date +-%Y%m%d
+SNAPSHOT_DATE!=date +-${BUILDDATE}
.endif
VAGRANT_VERSION!= date +%Y.%m.%d
Modified: head/release/release.conf.sample
==
--- head/release/release.conf.sampleThu Aug 27 21:09:17 2020
(r364890)
+++ head/release/release.conf.sampleThu Aug 27 21:19:16 2020
(r364891)
@@ -12,23 +12,19 @@
## Set the directory within which the release will be built.
CHROOTDIR="/scratch"
-## Set the svn host.
-SVNROOT="svn://svn.FreeBSD.org/"
+## Set the version control system host.
+GITROOT="https://cgit-beta.freebsd.org/;
+GITSRC="src.git"
+GITPORTS="ports.git"
+GITDOC="doc.git"
## Set the src/, ports/, and doc/ branches or tags.
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
+SRCBRANCH="main"
+DOCBRANCH="main"
+PORTBRANCH="main"
-## Run svn co --force for src checkout.
-#SRC_FORCE_CHECKOUT=yes
-
-## Sample configuration for using git instead of svn.
-#VCSCMD="/usr/local/bin/git clone --branch master"
-#SVNROOT=""
-#SRCBRANCH="https://github.com/freebsd/freebsd;
-#DOCBRANCH="https://github.com/freebsd/freebsd-doc;
-#PORTBRANCH="https://github.com/freebsd/freebsd-ports;
+## Sample configuration for using git from ports.
+#GITCMD="/usr/local/bin/git clone -q --branch main"
## Set to override the default target architecture.
#TARGET="amd64"
Modified: head/release/release.sh
==
--- head/release/release.sh Thu Aug 27 21:09:17 2020(r364890)
+++ head/release/release.sh Thu Aug 27 21:19:16 2020(r364891)
@@ -1,6 +1,7 @@
#!/bin/sh
#-
-# Copyright (c) 2013-2018 The FreeBSD Foundation
+# Copyright (c) 2020 Rubicon Communications, LLC (netgate.com)
+# Copyright (c) 2013-2019 The FreeBSD Foundation
# Copyright (c) 2013 Glen Barber
# Copyright (c) 2011 Nathan Whitehorn
# All rights reserved.
@@ -38,7 +39,7 @@
export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
-VERSION=2
+VERSION=3
# Prototypes that can be redefined per-chroot or per-target.
load_chroot_env() { }
@@ -51,7 +52,7 @@ usage() {
}
# env_setup(): Set up the default build environment variables, such as the
-# CHROOTDIR, VCSCMD, SVNROOT, etc. This is called before the release.conf
+# CHROOTDIR, VCSCMD, GITROOT, etc. This is called before the release.conf
# file is sourced, if '-c ' is specified.
env_setup() {
# The directory within which the release will be built.
@@ -60,27 +61,29 @@ env_setup() {
# The default version control system command to obtain the sources.
for _dir in /usr/bin /usr/local/bin; do
- for _svn in svn svnlite; do
- [ -x "${_dir}/${_svn}" ] && VCSCMD="${_dir}/${_svn}"
- [ ! -z "${VCSCMD}" ] && break 2
- done
+ [ -x "${_dir}/git" ] && VCSCMD="/${_di
svn commit: r361591 - head/release/tools
Author: gjb Date: Thu May 28 18:48:30 2020 New Revision: 361591 URL: https://svnweb.freebsd.org/changeset/base/361591 Log: Include the shells/bash port on Vagrant images, which prevents a shell issue during startup. PR: 245051 MFC after:1 minute (if approved by re@) X-MFC-for:11.4-RC2 Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/release/tools/vagrant.conf Modified: head/release/tools/vagrant.conf == --- head/release/tools/vagrant.conf Thu May 28 18:12:05 2020 (r361590) +++ head/release/tools/vagrant.conf Thu May 28 18:48:30 2020 (r361591) @@ -8,7 +8,7 @@ export VMSIZE=8G # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap. -export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="shells/bash firstboot-freebsd-update firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs" ___ 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: r359503 - in head
On Wed, Apr 01, 2020 at 02:11:02PM +0800, Li-Wen Hsu wrote: > On Wed, Apr 1, 2020 at 1:53 PM Glen Barber wrote: > > > > Author: gjb > > Date: Wed Apr 1 05:51:46 UTC 2020 > > New Revision: 359503 > > URL: https://svnweb.freebsd.org/changeset/base/359503 > > > > Log: > > Update head to 14.0-CURRENT in order to prevent having > > a 13.0-RELEASE. > ... > > Index: sys/sys/param.h > > === > > --- sys/sys/param.h (revision 359501) > > +++ sys/sys/param.h (working copy) > > @@ -60,7 +60,7 @@ > > * in the range 5 to 9. > > */ > > #undef __FreeBSD_version > > -#define __FreeBSD_version 1300087 /* Master, propagated to newvers */ > > +#define __FreeBSD_version 1400087 /* Master, propagated to newvers */ > > I think we want 140 here :-) > You are correct. I will fix it after dealing with the influx of complaints about this commit. Glen signature.asc Description: PGP signature
svn commit: r359503 - in head
Author: gjb
Date: Wed Apr 1 05:51:46 UTC 2020
New Revision: 359503
URL: https://svnweb.freebsd.org/changeset/base/359503
Log:
Update head to 14.0-CURRENT in order to prevent having
a 13.0-RELEASE.
Modified:
Makefile.inc1
UPDATING
lib/clang/freebsd_cc_version.h
lib/clang/llvm.build.mk
sys/conf/newvers.sh
sys/sys/param.h
Index: Makefile.inc1
===
--- Makefile.inc1 (revision 359501)
+++ Makefile.inc1 (working copy)
@@ -130,9 +130,9 @@ TARGET_ABI= gnueabi
.endif
.endif
MACHINE_ABI?= unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
TARGET_ABI?= unknown
-TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
+TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
armv6/arm \
@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
.endif
# flua is required to regenerate syscall files. It first appeared during the
-# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable
+# 14.0-CURRENT cycle, thus needs to be built on -older releases and stable
# branches.
.if ${BOOTSTRAPPING} < 1300059
${_bt}-libexec/flua: ${_bt}-lib/liblua
Index: UPDATING
===
--- UPDATING(revision 359501)
+++ UPDATING(working copy)
@@ -11,8 +11,8 @@ handbook:
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
- FreeBSD 13.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
+ FreeBSD 14.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
Index: lib/clang/freebsd_cc_version.h
===
--- lib/clang/freebsd_cc_version.h (revision 359501)
+++ lib/clang/freebsd_cc_version.h (working copy)
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#defineFREEBSD_CC_VERSION 137
+#defineFREEBSD_CC_VERSION 147
Index: lib/clang/llvm.build.mk
===
--- lib/clang/llvm.build.mk (revision 359501)
+++ lib/clang/llvm.build.mk (working copy)
@@ -38,7 +38,7 @@ TARGET_ABI= -gnueabi
TARGET_ABI=
.endif
VENDOR=unknown
-OS_VERSION=freebsd13.0
+OS_VERSION=freebsd14.0
LLVM_TARGET_TRIPLE?=
${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
LLVM_BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
Index: sys/conf/newvers.sh
===
--- sys/conf/newvers.sh (revision 359501)
+++ sys/conf/newvers.sh (working copy)
@@ -53,7 +53,7 @@
#
TYPE="FreeBSD"
-REVISION="13.0"
+REVISION="14.0"
BRANCH=${BRANCH_OVERRIDE:-CURRENT}
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
Index: sys/sys/param.h
===
--- sys/sys/param.h (revision 359501)
+++ sys/sys/param.h (working copy)
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1300087 /* Master, propagated to newvers */
+#define __FreeBSD_version 1400087 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
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"
svn commit: r356792 - head/share/man/man7
Author: gjb Date: Thu Jan 16 15:07:52 2020 New Revision: 356792 URL: https://svnweb.freebsd.org/changeset/base/356792 Log: Update release(7) to note OSRELEASE is only relevant when the 'install' target is invoked. While here, bump the sample output version name, and explicitly add the 'obj' target to avoid polluting the src checkout. Submitted by: Trond Endrestol PR: 243287 (related) MFC after:3 days Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/share/man/man7/release.7 Modified: head/share/man/man7/release.7 == --- head/share/man/man7/release.7 Thu Jan 16 14:15:00 2020 (r356791) +++ head/share/man/man7/release.7 Thu Jan 16 15:07:52 2020 (r356792) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 28, 2018 +.Dd January 16, 2020 .Dt RELEASE 7 .Os .Sh NAME @@ -570,8 +570,10 @@ target invoked by Optional variables: .Bl -tag -width ".Ev TARGET_ARCH" .It Ev OSRELEASE -Optional base name for generated media images -.Pq e.g., FreeBSD-9.0-RC2-amd64 . +Optional base name for generated media images when invoking the +.Cm install +target +.Pq e.g., FreeBSD-12.1-RELEASE-amd64 . Defaults to the output of .Ic `uname -s`-`uname -r`-`uname -p` within the chroot. @@ -659,6 +661,7 @@ svn co svn://svn.freebsd.org/base/head src cd src make buildworld buildkernel cd release +make obj make release make install DESTDIR=/var/freebsd-snapshot .Ed ___ 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"
svn commit: r356686 - head/release
Author: gjb
Date: Mon Jan 13 16:31:58 2020
New Revision: 356686
URL: https://svnweb.freebsd.org/changeset/base/356686
Log:
Fix a typo.
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Mon Jan 13 16:31:00 2020(r356685)
+++ head/release/Makefile Mon Jan 13 16:31:58 2020(r356686)
@@ -54,7 +54,7 @@ TARGET_ARCH= ${TARGET}
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
DISTDIR= dist
-# Define OSRELEASE by using newvars.sh
+# Define OSRELEASE by using newvers.sh
.if !defined(OSRELEASE) || empty(OSRELEASE)
.for _V in TYPE BRANCH REVISION
${_V}!=eval $$(awk '/^${_V}=/{print}'
${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
___
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"
svn commit: r356685 - head/release
Author: gjb
Date: Mon Jan 13 16:31:00 2020
New Revision: 356685
URL: https://svnweb.freebsd.org/changeset/base/356685
Log:
Ensure the TYPE, BRANCH, and REVISION variables are set in
cloudware targets when OSRELEASE is overridden.
Submitted by: Trond Endrestol
PR: 243287
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/Makefile.vm
Modified: head/release/Makefile.vm
==
--- head/release/Makefile.vmMon Jan 13 14:50:22 2020(r356684)
+++ head/release/Makefile.vmMon Jan 13 16:31:00 2020(r356685)
@@ -39,6 +39,12 @@ VAGRANT-VMWARE_FORMAT= vmdk
VAGRANT-VMWARE_DESC= Vagrant Image for VMWare
VAGRANT-VMWARE_DISK= ${OSRELEASE}.vmware.${VAGRANT_FORMAT}
+.for _V in TYPE BRANCH REVISION
+. if !defined(${_V}) || empty(${_V})
+${_V}!=eval $$(awk '/^${_V}=/{print}'
${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
+. endif
+.endfor
+
emulator-portinstall:
.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
___
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"
svn commit: r356230 - in head: . sys/sys
Author: gjb Date: Tue Dec 31 16:01:36 2019 New Revision: 356230 URL: https://svnweb.freebsd.org/changeset/base/356230 Log: Happy New Year 2020! MFC after:1 minute Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/COPYRIGHT head/sys/sys/copyright.h Modified: head/COPYRIGHT == --- head/COPYRIGHT Tue Dec 31 15:57:29 2019(r356229) +++ head/COPYRIGHT Tue Dec 31 16:01:36 2019(r356230) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2019 The FreeBSD Project. +Copyright (c) 1992-2020 The FreeBSD Project. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: head/sys/sys/copyright.h == --- head/sys/sys/copyright.hTue Dec 31 15:57:29 2019(r356229) +++ head/sys/sys/copyright.hTue Dec 31 16:01:36 2019(r356230) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (C) 1992-2018 The FreeBSD Project. All rights reserved. + * Copyright (C) 1992-2020 The FreeBSD Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,7 +36,7 @@ /* FreeBSD */ #define COPYRIGHT_FreeBSD \ - "Copyright (c) 1992-2019 The FreeBSD Project.\n" + "Copyright (c) 1992-2020 The FreeBSD Project.\n" /* Foundation */ #defineTRADEMARK_Foundation \ ___ 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: r354909 - in head: . share/mk
On Thu, Nov 21, 2019 at 09:11:27PM +, Brooks Davis wrote:
> On Thu, Nov 21, 2019 at 04:13:37PM +0000, Glen Barber wrote:
> > On Wed, Nov 20, 2019 at 06:36:58PM +, Brooks Davis wrote:
> > > Author: brooks
> > > Date: Wed Nov 20 18:36:58 2019
> > > New Revision: 354909
> > > URL: https://svnweb.freebsd.org/changeset/base/354909
> > >
> > > Log:
> > > Make the warning for deprecated NO_ variables an error.
> > >
> > > Support for NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB, NO_MAN, NO_PROFILE,
> > > and NO_WARNS as deprecated in 2014 with a warning added for each one
> > > found. Turn these into error in preperation for removal of compatability
> > > support before FreeBSD 13.
> > >
> > > Reviewed by:imp
> > > Relnotes: yes
> > > Sponsored by: DARPA, AFRL
> > > Differential Revision: https://reviews.freebsd.org/D22448
> > >
> >
> > > Modified: head/share/mk/bsd.opts.mk
> > > ==
> > > --- head/share/mk/bsd.opts.mk Wed Nov 20 18:12:01 2019
> > > (r354908)
> > > +++ head/share/mk/bsd.opts.mk Wed Nov 20 18:36:58 2019
> > > (r354909)
> > > @@ -100,7 +100,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
> > > PROFILE \
> > > WARNS
> > > .if defined(NO_${var})
> > > -.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no
> > > instead."
> > > +.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no
> > > instead."
> > > MK_${var}:=no
> > > .endif
> > > .endfor
> > >
> >
> > Had this been exp-run tested? This breaks at least the
> > net/bsdec2-image-upload port, which does *not* set NO_MAN explicitly in
> > its Makefile. I suspect at least several other ports are now implicitly
> > broken as result of this change.
>
> No, it wasn't. I didn't realize it was needed. I could revert if
> there's significant fallout. I've patched net/bsdec2-image-upload and
> I'm testing a patch for emulators/open-vm-tools.
>
> In general the issue is people putting NO_MAN= in Makefiles that
> the freebsd build infrastructure and then never looking at build
> output. In some cases it's clearly blind copy-and-paste (e.g.
> emulators/open-vm-tools sets NO_MAN and NOMAN in a kmod Makefile where
> they do nothing).
>
> Ideally I'd like to suppress these errors in ports unless DEVELOPER is
> defined, but I'm not sure how best to do that.
>
Have you seen the email from antoine in reply to your commit to the
net/bsdec2-image-upload commit?
Glen
signature.asc
Description: PGP signature
Re: svn commit: r354909 - in head: . share/mk
On Thu, Nov 21, 2019 at 09:28:50AM -0700, Ian Lepore wrote:
> On Thu, 2019-11-21 at 16:23 +0000, Glen Barber wrote:
> > On Thu, Nov 21, 2019 at 04:13:37PM +0000, Glen Barber wrote:
> > > On Wed, Nov 20, 2019 at 06:36:58PM +, Brooks Davis wrote:
> > > > Author: brooks
> > > > Date: Wed Nov 20 18:36:58 2019
> > > > New Revision: 354909
> > > > URL: https://svnweb.freebsd.org/changeset/base/354909
> > > >
> > > > Log:
> > > > Make the warning for deprecated NO_ variables an error.
> > > >
> > > > Support for NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB, NO_MAN,
> > > > NO_PROFILE,
> > > > and NO_WARNS as deprecated in 2014 with a warning added for
> > > > each one
> > > > found. Turn these into error in preperation for removal of
> > > > compatability
> > > > support before FreeBSD 13.
> > > >
> > > > Reviewed by: imp
> > > > Relnotes: yes
> > > > Sponsored by: DARPA, AFRL
> > > > Differential Revision:https://reviews.freebsd.org/D22448
> > > >
> > > > Modified: head/share/mk/bsd.opts.mk
> > > > =
> > > > =
> > > > --- head/share/mk/bsd.opts.mk Wed Nov 20 18:12:01 2019(
> > > > r354908)
> > > > +++ head/share/mk/bsd.opts.mk Wed Nov 20 18:36:58 2019(
> > > > r354909)
> > > > @@ -100,7 +100,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
> > > > PROFILE \
> > > > WARNS
> > > > .if defined(NO_${var})
> > > > -.warning "NO_${var} is defined, but deprecated. Please use
> > > > MK_${var}=no instead."
> > > > +.error "NO_${var} is defined, but deprecated. Please use
> > > > MK_${var}=no instead."
> > > > MK_${var}:=no
> > > > .endif
> > > > .endfor
> > > >
> > >
> > > Had this been exp-run tested? This breaks at least the
> > > net/bsdec2-image-upload port, which does *not* set NO_MAN
> > > explicitly in
> > > its Makefile. I suspect at least several other ports are now
> > > implicitly
> > > broken as result of this change.
> > >
> >
> > In fact, on a quick search through ports/*/*/Makefile, I do not see
> > NO_MAN defined *anywhere*. So, this is pulled in from somewhere
> > else,
> > which now I have a feeling more ports than I initially thought are
> > now
> > broken.
> >
>
> Your search was too narrow. Re-do it as "grep -Rw NO_MAN *" from
> /usr/ports and you'll get a lot of hits from within files/ dirs.
>
Thank you for that; I forgot about the files/ directories.
Nonetheless, net/bsdec2-image-upload still does not explicitly set this
knob.
Glen
signature.asc
Description: PGP signature
Re: svn commit: r354909 - in head: . share/mk
On Thu, Nov 21, 2019 at 04:13:37PM +, Glen Barber wrote:
> On Wed, Nov 20, 2019 at 06:36:58PM +, Brooks Davis wrote:
> > Author: brooks
> > Date: Wed Nov 20 18:36:58 2019
> > New Revision: 354909
> > URL: https://svnweb.freebsd.org/changeset/base/354909
> >
> > Log:
> > Make the warning for deprecated NO_ variables an error.
> >
> > Support for NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB, NO_MAN, NO_PROFILE,
> > and NO_WARNS as deprecated in 2014 with a warning added for each one
> > found. Turn these into error in preperation for removal of compatability
> > support before FreeBSD 13.
> >
> > Reviewed by: imp
> > Relnotes: yes
> > Sponsored by: DARPA, AFRL
> > Differential Revision:https://reviews.freebsd.org/D22448
> >
>
> > Modified: head/share/mk/bsd.opts.mk
> > ==
> > --- head/share/mk/bsd.opts.mk Wed Nov 20 18:12:01 2019
> > (r354908)
> > +++ head/share/mk/bsd.opts.mk Wed Nov 20 18:36:58 2019
> > (r354909)
> > @@ -100,7 +100,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
> > PROFILE \
> > WARNS
> > .if defined(NO_${var})
> > -.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no
> > instead."
> > +.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no
> > instead."
> > MK_${var}:=no
> > .endif
> > .endfor
> >
>
> Had this been exp-run tested? This breaks at least the
> net/bsdec2-image-upload port, which does *not* set NO_MAN explicitly in
> its Makefile. I suspect at least several other ports are now implicitly
> broken as result of this change.
>
In fact, on a quick search through ports/*/*/Makefile, I do not see
NO_MAN defined *anywhere*. So, this is pulled in from somewhere else,
which now I have a feeling more ports than I initially thought are now
broken.
Glen
signature.asc
Description: PGP signature
Re: svn commit: r354909 - in head: . share/mk
On Wed, Nov 20, 2019 at 06:36:58PM +, Brooks Davis wrote:
> Author: brooks
> Date: Wed Nov 20 18:36:58 2019
> New Revision: 354909
> URL: https://svnweb.freebsd.org/changeset/base/354909
>
> Log:
> Make the warning for deprecated NO_ variables an error.
>
> Support for NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB, NO_MAN, NO_PROFILE,
> and NO_WARNS as deprecated in 2014 with a warning added for each one
> found. Turn these into error in preperation for removal of compatability
> support before FreeBSD 13.
>
> Reviewed by:imp
> Relnotes: yes
> Sponsored by: DARPA, AFRL
> Differential Revision: https://reviews.freebsd.org/D22448
>
> Modified: head/share/mk/bsd.opts.mk
> ==
> --- head/share/mk/bsd.opts.mk Wed Nov 20 18:12:01 2019(r354908)
> +++ head/share/mk/bsd.opts.mk Wed Nov 20 18:36:58 2019(r354909)
> @@ -100,7 +100,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
> PROFILE \
> WARNS
> .if defined(NO_${var})
> -.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no
> instead."
> +.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no
> instead."
> MK_${var}:=no
> .endif
> .endfor
>
Had this been exp-run tested? This breaks at least the
net/bsdec2-image-upload port, which does *not* set NO_MAN explicitly in
its Makefile. I suspect at least several other ports are now implicitly
broken as result of this change.
Glen
signature.asc
Description: PGP signature
svn commit: r354935 - head/usr.sbin/jail
Author: gjb
Date: Thu Nov 21 04:12:08 2019
New Revision: 354935
URL: https://svnweb.freebsd.org/changeset/base/354935
Log:
Revert r354896, r354899, r354900:
Fix build.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/usr.sbin/jail/Makefile
Modified: head/usr.sbin/jail/Makefile
==
--- head/usr.sbin/jail/Makefile Thu Nov 21 03:10:02 2019(r354934)
+++ head/usr.sbin/jail/Makefile Thu Nov 21 04:12:08 2019(r354935)
@@ -15,13 +15,6 @@ NO_WMISSING_VARIABLE_DECLARATIONS=
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
-# workaround for GNU ld (GNU Binutils) 2.33.1:
-# relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2'
-# https://bugs.freebsd.org/242109
-.if ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv"
-CFLAGS+=-Wl,--no-relax
-.endif
-
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
.endif
___
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: r354900 - head/usr.sbin/jail
On Wed, Nov 20, 2019 at 04:44:58PM -0800, John Baldwin wrote:
> On 11/20/19 3:42 PM, Bjoern A. Zeeb wrote:
> > On 20 Nov 2019, at 23:32, John Baldwin wrote:
> >
> > Hijacking a side-thread:
> >
> > PreS: I think we have way too many of these options and should just
> > remove 3/4 of them again or someone build a proper matrix documenting
> > them all and in which case to use in the developers handbook ;-)
> >
> >> This one also seems dubious, but in a different way:
> >>
> >> usr.bin/Makefile:
> >>
> >> # ARM64TODO gprof does not build
> >> # RISCVTODO gprof does not build
> >> .if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_CPUARCH} != "riscv"
> >> SUBDIR.${MK_TOOLCHAIN}+=gprof
> >> .endif
> >>
> >> Somewhat exacerbated by the whole aarch64 vs arm64 thing and probably
> >> confusion on when to use CPUARCH vs ARCH.
> >
> > This particular case could actually be removed as I thought I made that
> > at least compile when I was working on s390x:
> > https://svnweb.freebsd.org/base?view=revision=351329
> >
> >
> > You can however find more of these elsewhere:
> >
> > ../lib/libc/tests/sys/Makefile:.if ${MACHINE_CPUARCH} != "aarch64" &&
> > ${MACHINE_CPUARCH} != "riscv"
> > ../lib/libcompiler_rt/Makefile.inc:.if ${MACHINE_CPUARCH} == "aarch64"
> > || ${MACHINE_CPUARCH} == "riscv"
> > ../stand/libsa/Makefile:.if ${MACHINE_CPUARCH} == "aarch64" ||
> > ${MACHINE_CPUARCH} == "riscv"
> > ../usr.bin/Makefile:.if ${MACHINE_ARCH} != "aarch64" &&
> > ${MACHINE_CPUARCH} != "riscv"
> > ../usr.bin/gprof/Makefile:.if ${MACHINE_ARCH} != "aarch64" &&
> > ${MACHINE_ARCH} != "riscv" && \
>
> The tests comparing MACHINE_CPUARCH against aarch64 are confusing indeed.
> My understanding is that MACHINE_CPUARCH is arm64 for aarch64? It's kind
> of hard to guess since arch(7) goes to great length to try to describe
> these variables but doesn't give a handy table of what they actually are
> for the various architectures.
>
This breaks the build, regardless.
===> usr.sbin/jail (cleandir)
===> usr.bin/procstat/tests (cleandir)
make[4]: "/releng/13-amd64-GENERIC-snap/usr/src/usr.sbin/jail/Makefile" line
21: Malformed conditional (${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv")
===> usr.bin/rctl (cleandir)
make[4]: Fatal errors encountered -- cannot continue
make[4]: stopped in /releng/13-amd64-GENERIC-snap/usr/src/usr.sbin/jail
--- cleandir_subdir_usr.sbin/jail ---
*** [cleandir_subdir_usr.sbin/jail] Error code 1
Glen
signature.asc
Description: PGP signature
svn commit: r354551 - head/share/man/man4
Author: gjb Date: Fri Nov 8 17:33:42 2019 New Revision: 354551 URL: https://svnweb.freebsd.org/changeset/base/354551 Log: Dereference lem(4), no longer in 13-CURRENT. While here, fix formatting of inline parenthesis and Xrs. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/share/man/man4/netmap.4 Modified: head/share/man/man4/netmap.4 == --- head/share/man/man4/netmap.4Fri Nov 8 17:27:20 2019 (r354550) +++ head/share/man/man4/netmap.4Fri Nov 8 17:33:42 2019 (r354551) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 26, 2019 +.Dd November 8, 2019 .Dt NETMAP 4 .Os .Sh NAME @@ -828,7 +828,7 @@ On .Xr cxgbe 4 , .Xr em 4 , .Xr iflib 4 -(providing igb, em and lem), +.Pq providing Xr igb 4 and Xr em 4 , .Xr ixgbe 4 , .Xr ixl 4 , .Xr re 4 , ___ 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: r350089 - head
On Wed, Jul 17, 2019 at 07:09:06PM +, Mark Johnston wrote: > Author: markj > Date: Wed Jul 17 19:09:05 2019 > New Revision: 350089 > URL: https://svnweb.freebsd.org/changeset/base/350089 > > Log: > Add an initial RELNOTES file. > > The intent is to provide a convenient location to document changes > that are relevant to users of binary FreeBSD distributions, in contrast > with UPDATING, which exists to document caveats for users who build > FreeBSD from source. > > This complements the "Relnotes:" tag in commit messages by providing a > place to document the change in more detail, or in case a "Relnotes:" > tag was accidentally omitted. In particular, "Relnotes:" should be > used if you do not intend to document the change in RELNOTES for some > reason. > > Changes to the file should not be MFCed. For now the file will exist > only in head, but may be updated via direct commits to stable branches > depending on how things go. > I had to go look at the original thread to remind myself about this, but regarding not MFCing changes from head to stable branches, I think there may have been some confusion in the discussion. By "changes should not be MFCed", at least based on my recollection of how the conversation was going, I (at least) meant "not MFCed, but committed as a direct commit to stable branches." In other words, merging the RELNOTES change from head to stable/X does not really make sense, as the revision numbers will have changed, and would inevitably cause merge conflicts. Now that 12.1 is out, maybe we can expand the idea of this file into stable/12 and even stable/11. One additional idea that came to mind is with the formatting for stable branches. For example, in head, there is: rNN: The foo(8) utility was added. For stable branches, I would propose the format of: rNM, MFC of rNN: The foo(8) utility was added. Thoughts? Glen signature.asc Description: PGP signature
svn commit: r353440 - head/release
Author: gjb Date: Fri Oct 11 16:01:30 2019 New Revision: 353440 URL: https://svnweb.freebsd.org/changeset/base/353440 Log: Increase the default VMSIZE for raw, qcow2, vhd, and vmdk virtual machine images due to 'filesystem full' failures. Sponsored by: Rubicon Communications, LLC (Netgate) Modified: head/release/Makefile.vm Modified: head/release/Makefile.vm == --- head/release/Makefile.vmFri Oct 11 14:59:28 2019(r353439) +++ head/release/Makefile.vmFri Oct 11 16:01:30 2019(r353440) @@ -7,7 +7,7 @@ VMTARGETS= vm-image VMFORMATS?=vhd vmdk qcow2 raw -VMSIZE?= 3072M +VMSIZE?= 4096M SWAPSIZE?= 1G VMBASE?= vm ___ 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"
svn commit: r353348 - head/lib/libucl
Author: gjb
Date: Wed Oct 9 15:35:22 2019
New Revision: 353348
URL: https://svnweb.freebsd.org/changeset/base/353348
Log:
Connect the libucl(3) manual page to the build.
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/lib/libucl/Makefile
Modified: head/lib/libucl/Makefile
==
--- head/lib/libucl/MakefileWed Oct 9 14:35:09 2019(r353347)
+++ head/lib/libucl/MakefileWed Oct 9 15:35:22 2019(r353348)
@@ -17,7 +17,8 @@ SRCS= ucl_emitter_streamline.c \
ucl_util.c
.PATH: ${LIBUCL}/src \
- ${LIBUCL}/include
+ ${LIBUCL}/include \
+ ${LIBUCL}/doc
INCS= ucl.h
LIBADD=m
@@ -27,5 +28,7 @@ CFLAGS+= -I${LIBUCL}/include \
-I${LIBUCL}/src \
-I${LIBUCL}/uthash \
-I${LIBUCL}/klib
+
+MAN+= libucl.3
.include
___
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"
svn commit: r353320 - head/usr.sbin/pkg
Author: gjb
Date: Tue Oct 8 18:58:23 2019
New Revision: 353320
URL: https://svnweb.freebsd.org/changeset/base/353320
Log:
Rework the logic for installing the pkg(8) configuration.
'quarterly' package sets do not exist for head, so explicitly
install the 'latest' configuration file there. Otherwise,
fall back to the original conditional evaluation to determine
if the 'latest' or 'quarterly' configuration file should be
installed.
Reported by: manu
Reviewed by: manu
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/usr.sbin/pkg/Makefile
Modified: head/usr.sbin/pkg/Makefile
==
--- head/usr.sbin/pkg/Makefile Tue Oct 8 18:21:44 2019(r353319)
+++ head/usr.sbin/pkg/Makefile Tue Oct 8 18:58:23 2019(r353320)
@@ -1,14 +1,18 @@
# $FreeBSD$
-.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
-PKGCONFBRANCH?=quarterly
-.else
_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
BRANCH?= ${_BRANCH}
+.if ${BRANCH:MCURRENT} != ""
+PKGCONFBRANCH?=latest
+.else
. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
PKGCONFBRANCH?=quarterly
. else
+. if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
+PKGCONFBRANCH?=quarterly
+. else
PKGCONFBRANCH?=latest
+. endif
. endif
.endif
CONFS= FreeBSD.conf.${PKGCONFBRANCH}
___
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: r352520 - head/usr.sbin/pkg
On Tue, Oct 08, 2019 at 07:19:03PM +0200, Emmanuel Vadot wrote: > On Tue, 8 Oct 2019 15:52:52 + > Glen Barber wrote: > > > On Tue, Oct 08, 2019 at 09:18:40AM -0600, Warner Losh wrote: > > > On Tue, Oct 8, 2019 at 8:33 AM Emmanuel Vadot > > > wrote: > > > > Anyway it's still need to be reverted as all arches should use latest > > > > on CURRENT. > > > > > > > > > > Agreed. -current is moving too quickly to use the quarterly, and this 100% > > > breaks all the graphics .ko's since those *MUST* be compiled against the > > > latest kernel. Things are already wonky enough there without introducing > > > this new (bad) behavior to the mix. It should be fixed in other ways, but > > > until those are in place this change makes a bad situation much, much > > > worse. > > > > > > > There is nothing to fix regarding 'latest' and 'quarterly' for CURRENT. > > It works as expected. > > > > root@releng3:/usr/src/usr.sbin/pkg # make BRANCH=CURRENT -V PKGCONFBRANCH > > latest > > root@releng3:/usr/src/usr.sbin/pkg # make BRANCH=BETA3 -V PKGCONFBRANCH > > quarterly > > root@releng3:/usr/src/usr.sbin/pkg # make BRANCH=STABLE -V PKGCONFBRANCH > > latest > > > > Glen > > > > Please have a look at the latest image generated for armv7 and > aarch64, you will see that it doesn't work as expected. > You're right, something is off here. I'm looking into it. Glen signature.asc Description: PGP signature
Re: svn commit: r352520 - head/usr.sbin/pkg
On Tue, Oct 08, 2019 at 09:18:40AM -0600, Warner Losh wrote: > On Tue, Oct 8, 2019 at 8:33 AM Emmanuel Vadot wrote: > > Anyway it's still need to be reverted as all arches should use latest > > on CURRENT. > > > > Agreed. -current is moving too quickly to use the quarterly, and this 100% > breaks all the graphics .ko's since those *MUST* be compiled against the > latest kernel. Things are already wonky enough there without introducing > this new (bad) behavior to the mix. It should be fixed in other ways, but > until those are in place this change makes a bad situation much, much worse. > There is nothing to fix regarding 'latest' and 'quarterly' for CURRENT. It works as expected. root@releng3:/usr/src/usr.sbin/pkg # make BRANCH=CURRENT -V PKGCONFBRANCH latest root@releng3:/usr/src/usr.sbin/pkg # make BRANCH=BETA3 -V PKGCONFBRANCH quarterly root@releng3:/usr/src/usr.sbin/pkg # make BRANCH=STABLE -V PKGCONFBRANCH latest Glen signature.asc Description: PGP signature
Re: svn commit: r352520 - head/usr.sbin/pkg
On Tue, Oct 08, 2019 at 08:22:33AM -0600, Ian Lepore wrote:
> On Tue, 2019-10-08 at 12:26 +0200, Emmanuel Vadot wrote:
> > Hi Glen,
> >
> > On Thu, 19 Sep 2019 16:43:12 + (UTC)
> > Glen Barber wrote:
> >
> > > Author: gjb
> > > Date: Thu Sep 19 16:43:12 2019
> > > New Revision: 352520
> > > URL: https://svnweb.freebsd.org/changeset/base/352520
> > >
> > > Log:
> > > Apply r346792 (cperciva) from stable/12 to head. The original commit
> > > message:
> > >
> > >On non-x86 systems, use "quarterly" packages.
> > >
> > >x86 architectures have "latest" package builds on stable/*, so keep
> > > using
> > >those (they'll get switched over to "quarterly" during releases).
> > >
> > > The original commit was a direct commit to stable/12, as at the time it
> > > was presumed it would not be necessary for head. However, when it is
> > > time
> > > to create a releng branch or switch from PRERELEASE/STABLE to BETA/RC,
> > > the
> > > pkg(7) Makefile needs further adjusting. This commit includes those
> > > further adjustments, evaluating the BRANCH variable from
> > > release/Makefile
> > > to determine the pkg(7) repository to use.
> > >
> > > MFC after: immediate (if possible)
> > > Sponsored by: Rubicon Communications, LLC (Netgate)
> > >
> > > Modified:
> > > head/usr.sbin/pkg/Makefile
> > >
> > > Modified: head/usr.sbin/pkg/Makefile
> > > ==
> > > --- head/usr.sbin/pkg/MakefileThu Sep 19 15:12:32 2019
> > > (r352519)
> > > +++ head/usr.sbin/pkg/MakefileThu Sep 19 16:43:12 2019
> > > (r352520)
> > > @@ -1,6 +1,16 @@
> > > # $FreeBSD$
> > >
> > > +.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
> > > +PKGCONFBRANCH?= quarterly
> > > +.else
> > > +_BRANCH!=${MAKE} -C ${SRCTOP}/release -V BRANCH
> > > +BRANCH?= ${_BRANCH}
> > > +. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
> > > +PKGCONFBRANCH?= quarterly
> > > +. else
> > > PKGCONFBRANCH?= latest
> > > +. endif
> > > +.endif
> > > CONFS= FreeBSD.conf.${PKGCONFBRANCH}
> > > CONFSNAME= FreeBSD.conf
> > > CONFSDIR=/etc/pkg
> >
> > Tier 2 (and weird tier1 like aarch64) only have latest for current so
> > this doesn't work.
> > Also this depends on MACHINE and iirc MACHINE is always the host when
> > cross compiling.
> > I think this need to be reverted.
> >
> > Cheers,
> >
>
> MACHINE is the build host when you first launch make(1), but the
> crossbuild code in Makefile.inc1 overrides MACHINE to TARGET (and
> MACHINE_ARCH to TARGET_ARCH) and launches a sub-make that way.
>
Ah, yes. That explains why when I first looked, my 'make -V [...]' in
usr.sbin/pkg did not work correctly. Thank you for pointing this out.
Glen
signature.asc
Description: PGP signature
Re: svn commit: r352520 - head/usr.sbin/pkg
On Tue, Oct 08, 2019 at 12:26:52PM +0200, Emmanuel Vadot wrote:
>
> Hi Glen,
>
> On Thu, 19 Sep 2019 16:43:12 +0000 (UTC)
> Glen Barber wrote:
>
> > Author: gjb
> > Date: Thu Sep 19 16:43:12 2019
> > New Revision: 352520
> > URL: https://svnweb.freebsd.org/changeset/base/352520
> >
> > Log:
> > Apply r346792 (cperciva) from stable/12 to head. The original commit
> > message:
> >
> >On non-x86 systems, use "quarterly" packages.
> >
> >x86 architectures have "latest" package builds on stable/*, so keep using
> >those (they'll get switched over to "quarterly" during releases).
> >
> > The original commit was a direct commit to stable/12, as at the time it
> > was presumed it would not be necessary for head. However, when it is time
> > to create a releng branch or switch from PRERELEASE/STABLE to BETA/RC, the
> > pkg(7) Makefile needs further adjusting. This commit includes those
> > further adjustments, evaluating the BRANCH variable from release/Makefile
> > to determine the pkg(7) repository to use.
> >
> > MFC after:immediate (if possible)
> > Sponsored by: Rubicon Communications, LLC (Netgate)
> >
> > Modified:
> > head/usr.sbin/pkg/Makefile
> >
> > Modified: head/usr.sbin/pkg/Makefile
> > ==
> > --- head/usr.sbin/pkg/Makefile Thu Sep 19 15:12:32 2019
> > (r352519)
> > +++ head/usr.sbin/pkg/Makefile Thu Sep 19 16:43:12 2019
> > (r352520)
> > @@ -1,6 +1,16 @@
> > # $FreeBSD$
> >
> > +.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
> > +PKGCONFBRANCH?=quarterly
> > +.else
> > +_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
> > +BRANCH?= ${_BRANCH}
> > +. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
> > +PKGCONFBRANCH?=quarterly
> > +. else
> > PKGCONFBRANCH?=latest
> > +. endif
> > +.endif
> > CONFS= FreeBSD.conf.${PKGCONFBRANCH}
> > CONFSNAME= FreeBSD.conf
> > CONFSDIR= /etc/pkg
>
> Tier 2 (and weird tier1 like aarch64) only have latest for current so
> this doesn't work.
It does.
root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=CURRENT -V PKGCONFBRANCH
latest
root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=STABLE -V PKGCONFBRANCH
latest
root@releng3:/usr/src/usr.sbin/pkg # make _BRANCH=RC1 -V PKGCONFBRANCH
quarterly
> Also this depends on MACHINE and iirc MACHINE is always the host when
> cross compiling.
You are correct. I'll fix this.
> I think this need to be reverted.
>
No, I'll implement a proper fix.
Glen
signature.asc
Description: PGP signature
Re: svn commit: r353012 - head/usr.sbin/bsdinstall/scripts
On Wed, Oct 02, 2019 at 10:13:01AM -0600, Ian Lepore wrote: > On Wed, 2019-10-02 at 16:09 +0000, Glen Barber wrote: > > Author: gjb > > Date: Wed Oct 2 16:09:28 2019 > > New Revision: 353012 > > URL: https://svnweb.freebsd.org/changeset/base/353012 > > > > Log: > > Add a comment explaining why the opensolaris_load line in loader.conf > > is explicitly added. > > > > Requested by: rgrimes > > MFC after:3 days > > MFC with: r353004 > > Sponsored by: Rubicon Communications, LLC (Netgate) > > > > Modified: > > head/usr.sbin/bsdinstall/scripts/config > > > > Modified: head/usr.sbin/bsdinstall/scripts/config > > == > > --- head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 16:08:01 2019 > > (r353011) > > +++ head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 16:09:28 2019 > > (r353012) > > @@ -44,6 +44,8 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc > > > > cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf > > rm $BSDINSTALL_TMPBOOT/loader.conf.* > > +# The 'opensolaris_load' line is a workaround for arm64, which does not > > +# automatically load opensolaris.ko with zfs.ko. > > df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo > > "opensolaris_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf > > df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> > > $BSDINSTALL_TMPBOOT/loader.conf > > > > Is this our long-existing problem of not being able to run kldxref as > part of a cross build and install? Or is this some other arm64- > specific problem? > This is a good question. I do not see an error in the log when kldxref is invoked, but I am not certain if that necessarily means anything. Glen signature.asc Description: PGP signature
svn commit: r353012 - head/usr.sbin/bsdinstall/scripts
Author: gjb Date: Wed Oct 2 16:09:28 2019 New Revision: 353012 URL: https://svnweb.freebsd.org/changeset/base/353012 Log: Add a comment explaining why the opensolaris_load line in loader.conf is explicitly added. Requested by: rgrimes MFC after:3 days MFC with: r353004 Sponsored by: Rubicon Communications, LLC (Netgate) Modified: head/usr.sbin/bsdinstall/scripts/config Modified: head/usr.sbin/bsdinstall/scripts/config == --- head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 16:08:01 2019 (r353011) +++ head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 16:09:28 2019 (r353012) @@ -44,6 +44,8 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf rm $BSDINSTALL_TMPBOOT/loader.conf.* +# The 'opensolaris_load' line is a workaround for arm64, which does not +# automatically load opensolaris.ko with zfs.ko. df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "opensolaris_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf ___ 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"
svn commit: r353004 - head/usr.sbin/bsdinstall/scripts
Author: gjb Date: Wed Oct 2 13:30:17 2019 New Revision: 353004 URL: https://svnweb.freebsd.org/changeset/base/353004 Log: Explicitly add opensolaris_load="YES" to loader.conf through the installer when installing the system on a ZFS root filesystem. For arm64, zfs_load="YES" does not add opensolaris.ko as a kld dependency, so add it explicitly to prevent boot-time failures out-of-box. PR: 240478 MFC after:3 days Sponsored by: Rubicon Communications, LLC (Netgate) Modified: head/usr.sbin/bsdinstall/scripts/config Modified: head/usr.sbin/bsdinstall/scripts/config == --- head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 13:25:28 2019 (r353003) +++ head/usr.sbin/bsdinstall/scripts/config Wed Oct 2 13:30:17 2019 (r353004) @@ -44,6 +44,7 @@ cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf rm $BSDINSTALL_TMPBOOT/loader.conf.* +df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "opensolaris_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_TMPBOOT/loader.conf cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot ___ 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"
svn commit: r352520 - head/usr.sbin/pkg
Author: gjb
Date: Thu Sep 19 16:43:12 2019
New Revision: 352520
URL: https://svnweb.freebsd.org/changeset/base/352520
Log:
Apply r346792 (cperciva) from stable/12 to head. The original commit
message:
On non-x86 systems, use "quarterly" packages.
x86 architectures have "latest" package builds on stable/*, so keep using
those (they'll get switched over to "quarterly" during releases).
The original commit was a direct commit to stable/12, as at the time it
was presumed it would not be necessary for head. However, when it is time
to create a releng branch or switch from PRERELEASE/STABLE to BETA/RC, the
pkg(7) Makefile needs further adjusting. This commit includes those
further adjustments, evaluating the BRANCH variable from release/Makefile
to determine the pkg(7) repository to use.
MFC after:immediate (if possible)
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/usr.sbin/pkg/Makefile
Modified: head/usr.sbin/pkg/Makefile
==
--- head/usr.sbin/pkg/Makefile Thu Sep 19 15:12:32 2019(r352519)
+++ head/usr.sbin/pkg/Makefile Thu Sep 19 16:43:12 2019(r352520)
@@ -1,6 +1,16 @@
# $FreeBSD$
+.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
+PKGCONFBRANCH?=quarterly
+.else
+_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
+BRANCH?= ${_BRANCH}
+. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
+PKGCONFBRANCH?=quarterly
+. else
PKGCONFBRANCH?=latest
+. endif
+.endif
CONFS= FreeBSD.conf.${PKGCONFBRANCH}
CONFSNAME= FreeBSD.conf
CONFSDIR= /etc/pkg
___
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"
svn commit: r346275 - head/usr.sbin/portsnap/portsnap
Author: gjb Date: Tue Apr 16 14:07:14 2019 New Revision: 346275 URL: https://svnweb.freebsd.org/changeset/base/346275 Log: Remove INDEX-10 reference, as 10.x is now EoL. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/portsnap/portsnap/portsnap.conf Modified: head/usr.sbin/portsnap/portsnap/portsnap.conf == --- head/usr.sbin/portsnap/portsnap/portsnap.conf Tue Apr 16 13:31:16 2019(r346274) +++ head/usr.sbin/portsnap/portsnap/portsnap.conf Tue Apr 16 14:07:14 2019(r346275) @@ -30,7 +30,6 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3 # REFUSE korean polish portuguese russian ukrainian vietnamese # List of INDEX files to build and the DESCRIBE file to use for each -#INDEX INDEX-10 DESCRIBE.10 #INDEX INDEX-11 DESCRIBE.11 #INDEX INDEX-12 DESCRIBE.12 INDEX INDEX-13 DESCRIBE.13 ___ 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: r350550 - head/share/mk
On Sat, Aug 03, 2019 at 01:06:18AM +, John Baldwin wrote: > Author: jhb > Date: Sat Aug 3 01:06:17 2019 > New Revision: 350550 > URL: https://svnweb.freebsd.org/changeset/base/350550 > > Log: > Flip REPRODUCIBLE_BUILD back to off by default in head. > > Having the full uname output can be useful on head even with > unmodified trees or trees that newvers.sh fails to recognize as > modified. > > Reviewed by:emaste > Differential Revision: https://reviews.freebsd.org/D20895 > I would like to request this commit be reverted. While the original commit message to enable this knob stated the commit would be reverted after stable/12 branched, I have seen no public complaints about enabling REPRODUCIBLE_BUILD by default (and quite honestly, do not see the benefit of disabling it by default -- why wouldn't we want reproducibility?). To me, this feels like a step backwards, with no tangible benefit. Note, newvers.sh does properly detect a modified tree if it can find the VCS metadata directory (i.e., .git, .svn) -- I know this because I personally helped with it. In my opinion, those that want the non-reproducible metadata included in output from 'uname -a' should set WITHOUT_REPRODUCIBLE_BUILDS in their src.conf. Turning off a sane default for the benefit of what I suspect is likely a short list of use cases feels like a step in the wrong direction. Glen signature.asc Description: PGP signature
svn commit: r349372 - head/release
Author: gjb
Date: Tue Jun 25 14:56:13 2019
New Revision: 349372
URL: https://svnweb.freebsd.org/changeset/base/349372
Log:
Include files containing metadata specific to the branch in the
directory where the individual distribution sets exist.
The new metadata files include the build date, svn branch, and
revision of the build.
Requested by: Mellanox Technologies (via kib)
MFC after:3 days
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/release/Makefile.mirrors
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Tue Jun 25 14:50:03 2019
(r349371)
+++ head/release/Makefile.mirrors Tue Jun 25 14:56:13 2019
(r349372)
@@ -19,6 +19,7 @@ FTPDIR?= ${RELEASEDIR}/ftp-stage
.if exists(${RELEASEDIR})
STAGE_TARGETS?=iso-images-stage
.endif
+SRCBRANCH!=${SVN_CMD} info --show-item relative-url ${WORLDDIR}
.if (defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET)) ||
(defined(EMBEDDEDBUILD) && !empty(EMBEDDEDBUILD))
. if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != ""
@@ -185,6 +186,9 @@ iso-images-stage:
.if exists(${RELEASEDIR}/ftp)
mkdir -p ${FTP_DIR}
cp -p ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR}
+ echo ${BUILDDATE} > ${FTP_DIR}/BUILDDATE
+ echo ${SRCBRANCH} > ${FTP_DIR}/SRCBRANCH
+ echo r${SVNREVISION} > ${FTP_DIR}/REVISION
cd ${TLD}/${TARGET} && \
ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
${REVISION}-${BRANCH}
___
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"
svn commit: r349160 - in head/release: . tools
Author: gjb
Date: Mon Jun 17 22:53:39 2019
New Revision: 349160
URL: https://svnweb.freebsd.org/changeset/base/349160
Log:
Fix passing ${CONF_FILES} (which contains MAKE_CONF and
SRC_CONF, __MAKE_CONF and SRCCONF, respectively) through
to arm_install_base() and chroot_arm_build_release().
This prevents failures when the target image is intended
to be build with make.conf(5) and src.conf(5) overrides,
which are correctly handled for non-embedded image builds.
Reported and tested by: Daniel Engberg
PR: 238615
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.sh
head/release/tools/arm.subr
Modified: head/release/release.sh
==
--- head/release/release.sh Mon Jun 17 22:13:59 2019(r349159)
+++ head/release/release.sh Mon Jun 17 22:53:39 2019(r349160)
@@ -388,6 +388,7 @@ chroot_arm_build_release() {
[ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}"
export MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}"
export MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
+ export MAKE_FLAGS="${MAKE_FLAGS} ${CONF_FILES}"
eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS}
-C /usr/src/release obj
export WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C
/usr/src/release -V WORLDDIR)"
export OBJDIR="$(eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1
make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)"
Modified: head/release/tools/arm.subr
==
--- head/release/tools/arm.subr Mon Jun 17 22:13:59 2019(r349159)
+++ head/release/tools/arm.subr Mon Jun 17 22:53:39 2019(r349160)
@@ -166,7 +166,7 @@ arm_install_base() {
TARGET=${EMBEDDED_TARGET} \
TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
- installworld installkernel distribution
+ ${CONF_FILES} installworld installkernel distribution
chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
arm_create_user
___
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"
svn commit: r348474 - head/release/tools
Author: gjb
Date: Fri May 31 18:40:19 2019
New Revision: 348474
URL: https://svnweb.freebsd.org/changeset/base/348474
Log:
Revert r348438.
The fix to override the default python version when building
the sysutils/py-google-compute-engine did not work, and there
are still issues that need to be addressed in the port itself.
See bugzilla 238267 for additional details.
MFC after:6 days
MFC with: r348438
MFC note: no-op to appease the merge tracker
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/gce.conf
head/release/tools/vmimage.subr
Modified: head/release/tools/gce.conf
==
--- head/release/tools/gce.conf Fri May 31 18:29:12 2019(r348473)
+++ head/release/tools/gce.conf Fri May 31 18:40:19 2019(r348474)
@@ -6,14 +6,10 @@
# The default of 3GB is too small for GCE, so override the size here.
export VMSIZE=20G
-# The sysutils/py-google-compute-engine port needs the lang/python
-# symbolic link to point to lang/python2.
-export DEFAULT_VERSIONS="python=2.7"
-
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \
- lang/python lang/python2"
+ lang/python lang/python2 lang/python3"
# Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="ntpd sshd growfs \
Modified: head/release/tools/vmimage.subr
==
--- head/release/tools/vmimage.subr Fri May 31 18:29:12 2019
(r348473)
+++ head/release/tools/vmimage.subr Fri May 31 18:40:19 2019
(r348474)
@@ -72,10 +72,6 @@ cleanup() {
mdconfig -d -u ${mddev}
fi
- # Avoid inheriting the DEFAULT_VERSIONS for lang/python from
- # the gce.conf.
- unset DEFAULT_VERSIONS
-
return 0
}
___
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"
svn commit: r348439 - head/release/tools
Author: gjb
Date: Thu May 30 17:00:57 2019
New Revision: 348439
URL: https://svnweb.freebsd.org/changeset/base/348439
Log:
Increase the size of the Vagrant default image size, as the 3GB
size is too small to bootstrap the firstboot_pkgs list.
While here, add the growfs(8) startup script to /etc/rc.conf,
as Vagrant images can be resized by modifying the Vagrantfile.
Reported by: dbaio
PR: 238226
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/vagrant.conf
Modified: head/release/tools/vagrant.conf
==
--- head/release/tools/vagrant.conf Thu May 30 16:49:40 2019
(r348438)
+++ head/release/tools/vagrant.conf Thu May 30 17:00:57 2019
(r348439)
@@ -3,12 +3,15 @@
# $FreeBSD$
#
+# The default of 3GB is too small for Vagrant, so override the size here.
+export VMSIZE=8G
+
# Packages to install into the image we're creating. This is a deliberately
# minimalist set, providing only the packages necessary to bootstrap.
export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs"
# Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs"
+export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs"
vagrant_common () {
# The firstboot_pkgs rc.d script will download the repository
___
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"
svn commit: r348438 - head/release/tools
Author: gjb
Date: Thu May 30 16:49:40 2019
New Revision: 348438
URL: https://svnweb.freebsd.org/changeset/base/348438
Log:
Fix GCE virtual machine startup.
The ports/head branch recently switched to python3 as the default,
which breaks the sysutils/py-google-compute-engine startup scripts,
as lang/python installs lang/python3{,.x} where lang/python2{,.x}
are needed.
Set DEFAULT_VERSIONS in release/tools/gce.conf to python=2.7, and
remove the lang/python3 inclusion in VM_EXTRA_PACKAGES.
Additionally, unset DEFAULT_VERSIONS in release/tools/vmimage.subr
to prevent persistence of DEFAULT_VERSIONS=python=2.7 in subsequent
VM/cloud image builds.
Note: at present, this affects only 13-CURRENT and 12-STABLE, as
the stable/11 branch had already switched to using the 2019Q2 branch
at the start of the 11.3-RELEASE cycle, so this does not immediately
affect 11.3-BETA, hence the 1-week merge timeout. This had been
manually tested on 13-CURRENT.
Reported by: ler (privately)
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/gce.conf
head/release/tools/vmimage.subr
Modified: head/release/tools/gce.conf
==
--- head/release/tools/gce.conf Thu May 30 16:42:57 2019(r348437)
+++ head/release/tools/gce.conf Thu May 30 16:49:40 2019(r348438)
@@ -6,10 +6,14 @@
# The default of 3GB is too small for GCE, so override the size here.
export VMSIZE=20G
+# The sysutils/py-google-compute-engine port needs the lang/python
+# symbolic link to point to lang/python2.
+export DEFAULT_VERSIONS="python=2.7"
+
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \
- lang/python lang/python2 lang/python3"
+ lang/python lang/python2"
# Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="ntpd sshd growfs \
Modified: head/release/tools/vmimage.subr
==
--- head/release/tools/vmimage.subr Thu May 30 16:42:57 2019
(r348437)
+++ head/release/tools/vmimage.subr Thu May 30 16:49:40 2019
(r348438)
@@ -72,6 +72,10 @@ cleanup() {
mdconfig -d -u ${mddev}
fi
+ # Avoid inheriting the DEFAULT_VERSIONS for lang/python from
+ # the gce.conf.
+ unset DEFAULT_VERSIONS
+
return 0
}
___
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"
svn commit: r347056 - head/release/tools
Author: gjb Date: Fri May 3 17:23:08 2019 New Revision: 347056 URL: https://svnweb.freebsd.org/changeset/base/347056 Log: Increase the default size of the GCE disk image from 3GB to 20GB, as 3GB is too small as discovered in this week's snapshot builds. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/release/tools/gce.conf Modified: head/release/tools/gce.conf == --- head/release/tools/gce.conf Fri May 3 14:43:21 2019(r347055) +++ head/release/tools/gce.conf Fri May 3 17:23:08 2019(r347056) @@ -3,6 +3,9 @@ # $FreeBSD$ # +# The default of 3GB is too small for GCE, so override the size here. +export VMSIZE=20G + # Set to a list of packages to install. export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \ ___ 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"
svn commit: r346959 - in head/release: . tools
Author: gjb
Date: Tue Apr 30 14:29:09 2019
New Revision: 346959
URL: https://svnweb.freebsd.org/changeset/base/346959
Log:
Reduce the default image size for virtual machine disk images from
30GB to 3GB. The raw images can be resized using truncate(1), and
other formats can be resized with tools included with other tools
included with other hypervisors.
Enable the growfs(8) rc(8) at firstboot if the disk was resized
prior to booting the virtual machine for the first time.
Discussed with: several
PR: 232313 (requested in other context)
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.vm
head/release/tools/gce.conf
head/release/tools/vmimage.subr
Modified: head/release/Makefile.vm
==
--- head/release/Makefile.vmTue Apr 30 10:41:20 2019(r346958)
+++ head/release/Makefile.vmTue Apr 30 14:29:09 2019(r346959)
@@ -7,7 +7,7 @@
VMTARGETS= vm-image
VMFORMATS?=vhd vmdk qcow2 raw
-VMSIZE?= 30G
+VMSIZE?= 3072M
SWAPSIZE?= 1G
VMBASE?= vm
Modified: head/release/tools/gce.conf
==
--- head/release/tools/gce.conf Tue Apr 30 10:41:20 2019(r346958)
+++ head/release/tools/gce.conf Tue Apr 30 14:29:09 2019(r346959)
@@ -3,9 +3,6 @@
# $FreeBSD$
#
-# Reduce VMSIZE to be below the free quota limit.
-export VMSIZE=27G
-
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \
Modified: head/release/tools/vmimage.subr
==
--- head/release/tools/vmimage.subr Tue Apr 30 10:41:20 2019
(r346958)
+++ head/release/tools/vmimage.subr Tue Apr 30 14:29:09 2019
(r346959)
@@ -182,6 +182,9 @@ vm_extra_enable_services() {
if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then
echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> \
${DESTDIR}/etc/rc.conf
+ # Expand the filesystem to fill the disk.
+ echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf
+ touch ${DESTDIR}/firstboot
fi
return 0
___
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"
svn commit: r346275 - head/usr.sbin/portsnap/portsnap
Author: gjb Date: Tue Apr 16 14:07:14 2019 New Revision: 346275 URL: https://svnweb.freebsd.org/changeset/base/346275 Log: Remove INDEX-10 reference, as 10.x is now EoL. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/portsnap/portsnap/portsnap.conf Modified: head/usr.sbin/portsnap/portsnap/portsnap.conf == --- head/usr.sbin/portsnap/portsnap/portsnap.conf Tue Apr 16 13:31:16 2019(r346274) +++ head/usr.sbin/portsnap/portsnap/portsnap.conf Tue Apr 16 14:07:14 2019(r346275) @@ -30,7 +30,6 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3 # REFUSE korean polish portuguese russian ukrainian vietnamese # List of INDEX files to build and the DESCRIBE file to use for each -#INDEX INDEX-10 DESCRIBE.10 #INDEX INDEX-11 DESCRIBE.11 #INDEX INDEX-12 DESCRIBE.12 INDEX INDEX-13 DESCRIBE.13 ___ 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"
svn commit: r345379 - head/release/arm64
Author: gjb Date: Thu Mar 21 14:17:55 2019 New Revision: 345379 URL: https://svnweb.freebsd.org/changeset/base/345379 Log: Bump the IMAGE_SIZE for arm64 SoC images to prevent failures due to full filesystem. This makes the size of the arm64 SoC images consistent with armv6 and armv7. MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/release/arm64/PINE64-LTS.conf head/release/arm64/PINE64.conf head/release/arm64/PINEBOOK.conf head/release/arm64/RPI3.conf Modified: head/release/arm64/PINE64-LTS.conf == --- head/release/arm64/PINE64-LTS.conf Thu Mar 21 14:17:12 2019 (r345378) +++ head/release/arm64/PINE64-LTS.conf Thu Mar 21 14:17:55 2019 (r345379) @@ -9,7 +9,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pine64-lts" FAT_SIZE="54m -b 1m" FAT_TYPE="16" -IMAGE_SIZE="2560M" +IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 Modified: head/release/arm64/PINE64.conf == --- head/release/arm64/PINE64.conf Thu Mar 21 14:17:12 2019 (r345378) +++ head/release/arm64/PINE64.conf Thu Mar 21 14:17:55 2019 (r345379) @@ -9,7 +9,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pine64" FAT_SIZE="54m -b 1m" FAT_TYPE="16" -IMAGE_SIZE="2560M" +IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 Modified: head/release/arm64/PINEBOOK.conf == --- head/release/arm64/PINEBOOK.confThu Mar 21 14:17:12 2019 (r345378) +++ head/release/arm64/PINEBOOK.confThu Mar 21 14:17:55 2019 (r345379) @@ -9,7 +9,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pinebook" FAT_SIZE="54m -b 1m" FAT_TYPE="16" -IMAGE_SIZE="2560M" +IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 Modified: head/release/arm64/RPI3.conf == --- head/release/arm64/RPI3.confThu Mar 21 14:17:12 2019 (r345378) +++ head/release/arm64/RPI3.confThu Mar 21 14:17:55 2019 (r345379) @@ -11,7 +11,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-rpi3 sysutils/rpi-firmware" FAT_SIZE="50m -b 1m" FAT_TYPE="16" -IMAGE_SIZE="2560M" +IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 ___ 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"
svn commit: r345013 - head/share/misc
Author: gjb Date: Mon Mar 11 15:47:26 2019 New Revision: 345013 URL: https://svnweb.freebsd.org/changeset/base/345013 Log: Update entries for accounts@, backups@, dnsadm@, mirror-admin@, and remove refadm@. Sponsored by: The FreeBSD Foundation Modified: head/share/misc/organization.dot Modified: head/share/misc/organization.dot == --- head/share/misc/organization.dotMon Mar 11 15:36:24 2019 (r345012) +++ head/share/misc/organization.dotMon Mar 11 15:47:26 2019 (r345013) @@ -41,15 +41,14 @@ srccommitters [label="Src Committers\nsrc-committers@F # Admin teams go here alphabetically sorted -accounts [label="Accounts Team\naccou...@freebsd.org\nmarkm, simon, kensmith,\ndhw"] -backups [label="Backup Administrators\nback...@freebsd.org\nsimon, kensmith,\ndhw"] +accounts [label="Accounts Team\naccou...@freebsd.org\nclusteradm"] +backups [label="Backup Administrators\nback...@freebsd.org\nclusteradm"] bugmeister [label="Bugmeister Team\nbugmeis...@freebsd.org\neadler, gavin, gonzo"] clusteradm [label="Cluster Administrators\ncluster...@freebsd.org\nallanjude, brd,\ndhw, gavin,\ngjb, peter,\nsbruno, simon,\nzi"] -dnsadm [label="DNS Administrators\ndns...@freebsd.org\nbillf, dg, ps,\nkensmith, peter"] -mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-ad...@freebsd.org\nkuriyama, kensmith"] +dnsadm [label="DNS Administrators\ndns...@freebsd.org\nclusteradm"] +mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-ad...@freebsd.org\nclusteradm,\nkuriyama"] perforceadmin [label="Perforce Repository Administrators\nperforce-ad...@freebsd.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] postmaster [label="Postmaster Team\npostmas...@freebsd.org\ndhw, krion, ler, philip, pi, rea, remko, zi"] -refadm [label="Reference Systems Administrators\nref...@freebsd.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] webmaster [label="Webmaster Team\nwebmas...@freebsd.org\ngjb, wblock, blackend,\ngabor, hrs, wosch"] # Misc hats go here alphabetically sorted @@ -69,7 +68,6 @@ _admin -> clusteradm _admin -> dnsadm _admin -> mirroradmin _admin -> perforceadmin -_admin -> refadm _admin -> postmaster _admin -> webmaster ___ 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"
svn commit: r345012 - head/share/misc
Author: gjb Date: Mon Mar 11 15:36:24 2019 New Revision: 345012 URL: https://svnweb.freebsd.org/changeset/base/345012 Log: Update the re@ member list. Sponsored by: The FreeBSD Foundation Modified: head/share/misc/organization.dot Modified: head/share/misc/organization.dot == --- head/share/misc/organization.dotMon Mar 11 14:34:25 2019 (r345011) +++ head/share/misc/organization.dotMon Mar 11 15:36:24 2019 (r345012) @@ -32,7 +32,7 @@ doceng [label="Documentation Engineering Team\ndoceng@ portscommitters [label="Ports Committers\nports-committ...@freebsd.org"] portmgr [label="Port Management Team\nport...@freebsd.org\nadamw, antoine, bapt, bdrewery\nfeld, mat, rene, swills"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secret...@freebsd.org\nrene"] -re [label="Primary Release Engineering Team\n...@freebsd.org\ngjb, kib,\nbdrewery, blackend,\nrgrimes, delphij,\nhrs, glebius,\nmarius, rwatson"] +re [label="Primary Release Engineering Team\n...@freebsd.org\ngjb, kib,\nbdrewery, blackend,\nrgrimes, delphij,\nhrs, glebius,\nmarius"] secteam [label="Security Team\nsect...@freebsd.org\nbenno, delphij,\ndes, emaste,\ngjb, gordon,\nremko"] portssecteam [label="Ports Security Team\nports-sect...@freebsd.org\ndelphij, amdmi3, eadler, feld, jgh, rea, riggs, sbz, simon, swills, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secret...@freebsd.org\nremko"] ___ 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"
svn commit: r343259 - head/usr.bin/units
Author: gjb Date: Mon Jan 21 15:27:58 2019 New Revision: 343259 URL: https://svnweb.freebsd.org/changeset/base/343259 Log: Correct a typo: was -> way. Submitted by: Larry Hynes MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/units/units.1 Modified: head/usr.bin/units/units.1 == --- head/usr.bin/units/units.1 Mon Jan 21 14:55:10 2019(r343258) +++ head/usr.bin/units/units.1 Mon Jan 21 15:27:58 2019(r343259) @@ -158,7 +158,7 @@ by careless unit definitions. Comments in the unit definition file begin with a '#' or '/' character at the beginning of a line. .Pp -Prefixes are defined in the same was as standard units, but with +Prefixes are defined in the same way as standard units, but with a trailing dash at the end of the prefix name. If a unit is not found even after removing trailing 's' or 'es', then it will be checked ___ 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"
svn commit: r342690 - head/release/i386
Author: gjb
Date: Wed Jan 2 16:22:33 2019
New Revision: 342690
URL: https://svnweb.freebsd.org/changeset/base/342690
Log:
Escape a new line following r342283.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/i386/make-memstick.sh
Modified: head/release/i386/make-memstick.sh
==
--- head/release/i386/make-memstick.sh Wed Jan 2 16:11:02 2019
(r342689)
+++ head/release/i386/make-memstick.sh Wed Jan 2 16:22:33 2019
(r342690)
@@ -45,7 +45,7 @@ make_esp_file ${espfilename} ${fat32min} ${1}/boot/loa
mkimg -s mbr \
-b ${1}/boot/mbr \
--p efi:=${espfilename}
+-p efi:=${espfilename} \
-p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
-o ${2}
rm ${espfilename}
___
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"
svn commit: r340983 - head/release/tools
Author: gjb
Date: Mon Nov 26 17:00:39 2018
New Revision: 340983
URL: https://svnweb.freebsd.org/changeset/base/340983
Log:
Fix NTP query on GCE due to unresolved hostname.
PR: 232456
Submitted by: Lucas Kanashiro
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/gce.conf
Modified: head/release/tools/gce.conf
==
--- head/release/tools/gce.conf Mon Nov 26 16:54:16 2018(r340982)
+++ head/release/tools/gce.conf Mon Nov 26 17:00:39 2018(r340983)
@@ -49,7 +49,7 @@ aesni_load="YES"
nvme_load="YES"
EOF
- echo '169.254.169.254 metadata.google.internal metadata' > \
+ echo '169.254.169.254 metadata.google.internal metadata' >> \
${DESTDIR}/etc/hosts
# overwrite ntp.conf
___
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"
svn commit: r340407 - in head: . release/scripts
Author: gjb
Date: Tue Nov 13 19:53:02 2018
New Revision: 340407
URL: https://svnweb.freebsd.org/changeset/base/340407
Log:
In followup to r340406, remove doc from the EXTRA_DISTRIBUTIONS
list and remaining references from the script used to create the
MANIFEST file used by bsdinstall(8).
No MFC is planned at this time.
Sponsored by: The FreeBSD Foundation
Modified:
head/Makefile.inc1
head/release/scripts/make-manifest.sh
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Nov 13 19:51:22 2018(r340406)
+++ head/Makefile.inc1 Tue Nov 13 19:53:02 2018(r340407)
@@ -1287,7 +1287,7 @@ ITOOLS+=makewhatis
#
# Non-base distributions produced by the base system
-EXTRA_DISTRIBUTIONS= doc
+EXTRA_DISTRIBUTIONS=
.if defined(LIBCOMPAT)
EXTRA_DISTRIBUTIONS+= lib${libcompat}
.endif
@@ -1297,7 +1297,7 @@ EXTRA_DISTRIBUTIONS+= tests
DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
+DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,tests,,}
.endif
MTREE_MAGIC?= mtree 2.0
Modified: head/release/scripts/make-manifest.sh
==
--- head/release/scripts/make-manifest.sh Tue Nov 13 19:51:22 2018
(r340406)
+++ head/release/scripts/make-manifest.sh Tue Nov 13 19:53:02 2018
(r340407)
@@ -10,7 +10,6 @@
# $FreeBSD$
base="Base system"
-doc="Additional Documentation"
kernel="Kernel"
ports="Ports tree"
src="System source tree"
@@ -19,7 +18,6 @@ tests="Test suite"
desc_base="${base} (MANDATORY)"
desc_base_dbg="${base} (Debugging)"
-desc_doc="${doc}"
desc_kernel="${kernel} (MANDATORY)"
desc_kernel_dbg="${kernel} (Debugging)"
desc_kernel_alt="Alternate ${kernel}"
@@ -30,7 +28,6 @@ desc_ports="${ports}"
desc_src="${src}"
desc_tests="${tests}"
-default_doc=off
default_src=off
default_ports=off
default_tests=off
___
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"
svn commit: r340406 - head/release/scripts
Author: gjb
Date: Tue Nov 13 19:51:22 2018
New Revision: 340406
URL: https://svnweb.freebsd.org/changeset/base/340406
Log:
The roff ascii.gz documentation installed to /usr/share/doc
was removed in r318881 when roff was removed from the base
system.
This results in the doc.txz distribution set containing a
single directory (./) which is empty.
Remove the "Additional documentation" option from the menu
selection of bsdinstall(8), as the plain-text documentation
installed in /usr/share/doc is installed as part of the
packageworld target.
The doc entry has not been removed from EXTRA_DISTRIBUTIONS
in Makefile.inc1, in case its removal triggers an issue with
freebsd-update(8), which is currently aware of the world/doc
component, so the empty doc.txz continues to be created as
a precaution.
Noticed by: rgrimes
MFC after:2 days
MFC before: 12.0-RC1
Sponsored by: The FreeBSD Foundation
Modified:
head/release/scripts/make-manifest.sh
Modified: head/release/scripts/make-manifest.sh
==
--- head/release/scripts/make-manifest.sh Tue Nov 13 19:44:40 2018
(r340405)
+++ head/release/scripts/make-manifest.sh Tue Nov 13 19:51:22 2018
(r340406)
@@ -51,6 +51,9 @@ for i in ${*}; do
desc="$(eval echo \"\${desc_${distname}}\")"
case ${i} in
+ doc.txz)
+ continue
+ ;;
kernel-dbg.txz)
desc="${desc_kernel_dbg}"
;;
___
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"
svn commit: r339875 - head/release
Author: gjb
Date: Mon Oct 29 21:03:43 2018
New Revision: 339875
URL: https://svnweb.freebsd.org/changeset/base/339875
Log:
Pass _BRANCH in the reldoc target to ensure the correct
src branch is used when generating the hardware.html page.
MFC after:3 days
MFC before: 12.0-BETA3
MFC with: r339873
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Mon Oct 29 21:00:16 2018(r339874)
+++ head/release/Makefile Mon Oct 29 21:03:43 2018(r339875)
@@ -174,6 +174,7 @@ 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 \
WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
___
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"
svn commit: r339873 - head/release
Author: gjb
Date: Mon Oct 29 20:53:05 2018
New Revision: 339873
URL: https://svnweb.freebsd.org/changeset/base/339873
Log:
Set OPTIONS_UNSET in the argument list to env(1), and add
AVAHI to the list. This fixes the textproc/docproj build
seemingly following FLAVORS being added.
Specifically, the problem with the dependency chain here is:
- textproc/docproj depends on print/cups, which sets AVAHI=on
by default;
- net/avahi-app depends on devel/gobject-introspection, which
requires python3+;
- graphics/netpbm depends on graphics/mesa-libs, which can
only be built with python2.7;
- textproc/docproj depends on a number of graphics ports for
font rendering, etc.
MFC after:3 days
MFC before: 12.0-BETA3
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Mon Oct 29 20:21:10 2018(r339872)
+++ head/release/release.sh Mon Oct 29 20:53:05 2018(r339873)
@@ -287,9 +287,9 @@ extra_chroot_setup() {
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
- chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
+ chroot ${CHROOTDIR} env ${PBUILD_FLAGS} \
+ OPTIONS_UNSET="AVAHI FOP IGOR" make -C \
/usr/ports/textproc/docproj \
- OPTIONS_UNSET="FOP IGOR" \
FORCE_PKG_REGISTER=1 \
install clean distclean
fi
___
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"
svn commit: r339741 - head/crypto/openssl/include/openssl
Author: gjb
Date: Thu Oct 25 18:46:45 2018
New Revision: 339741
URL: https://svnweb.freebsd.org/changeset/base/339741
Log:
Update SHLIB_VERSION_NUMBER following the OpenSSL shared library
number bump.
Reported by: jkim
Discussed with: kib
MFC after:immediate
Sponsored by: The FreeBSD Foundation
Modified:
head/crypto/openssl/include/openssl/opensslv.h
Modified: head/crypto/openssl/include/openssl/opensslv.h
==
--- head/crypto/openssl/include/openssl/opensslv.h Thu Oct 25 18:06:23
2018(r339740)
+++ head/crypto/openssl/include/openssl/opensslv.h Thu Oct 25 18:46:45
2018(r339741)
@@ -92,7 +92,7 @@ extern "C" {
* should only keep the versions that are binary compatible with the current.
*/
# define SHLIB_VERSION_HISTORY ""
-# define SHLIB_VERSION_NUMBER "9"
+# define SHLIB_VERSION_NUMBER "111"
#ifdef __cplusplus
___
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"
svn commit: r339730 - head/sys/sys
Author: gjb Date: Thu Oct 25 15:41:26 2018 New Revision: 339730 URL: https://svnweb.freebsd.org/changeset/base/339730 Log: Bump __FreeBSD_version following the OpenSSL shared library version number bump. Submitted by: antoine MFC with: r339709 Sponsored by: The FreeBSD Foundation Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hThu Oct 25 15:41:19 2018(r339729) +++ head/sys/sys/param.hThu Oct 25 15:41:26 2018(r339730) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 130 /* Master, propagated to newvers */ +#define __FreeBSD_version 131 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ 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"
svn commit: r339684 - head/release/tools
Author: gjb Date: Wed Oct 24 15:51:55 2018 New Revision: 339684 URL: https://svnweb.freebsd.org/changeset/base/339684 Log: Reduce the GCE image size to 27G to be lower than the free quota limit. PR: 232313 MFC after:3 days Sponsored by: The FreeBSD Foundation Modified: head/release/tools/gce.conf Modified: head/release/tools/gce.conf == --- head/release/tools/gce.conf Wed Oct 24 14:14:49 2018(r339683) +++ head/release/tools/gce.conf Wed Oct 24 15:51:55 2018(r339684) @@ -3,6 +3,9 @@ # $FreeBSD$ # +# Reduce VMSIZE to be below the free quota limit. +export VMSIZE=27G + # Set to a list of packages to install. export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \ ___ 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"
svn commit: r339657 - head/release
Author: gjb
Date: Tue Oct 23 14:38:08 2018
New Revision: 339657
URL: https://svnweb.freebsd.org/changeset/base/339657
Log:
Add debug.witness.trace=0 back to the installer sysctl.conf(5),
incorrectly removed from head when it should have been removed
from stable/12 post-branch.
Reported by: bdrewery
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Tue Oct 23 14:16:02 2018(r339656)
+++ head/release/Makefile Tue Oct 23 14:38:08 2018(r339657)
@@ -210,6 +210,7 @@ disc1: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+ echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
@@ -237,6 +238,7 @@ bootonly: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+ echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
@@ -261,6 +263,7 @@ dvd: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+ echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
___
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: r339436 - in head: . contrib/gcc gnu/usr.bin/cc/cc_tools lib/clang release sys/conf sys/sys
On Sun, Oct 21, 2018 at 03:45:20PM +, Glen Barber wrote:
> On Sun, Oct 21, 2018 at 11:55:20AM +0200, Dimitry Andric wrote:
> > On 21 Oct 2018, at 04:08, Jan Beich wrote:
> > >
> > > Glen Barber writes:
> > >
> > >> Modified: head/lib/clang/llvm.build.mk
> > >> ==
> > >> --- head/lib/clang/llvm.build.mk Fri Oct 19 00:24:23 2018
> > >> (r339435)
> > >> +++ head/lib/clang/llvm.build.mk Fri Oct 19 00:37:47 2018
> > >> (r339436)
> > >> @@ -17,7 +17,7 @@ CFLAGS+= -I${LLVM_SRCS}/include
> > >> CFLAGS+= -DLLVM_BUILD_GLOBAL_ISEL
> > >> CFLAGS+= -D__STDC_LIMIT_MACROS
> > >> CFLAGS+= -D__STDC_CONSTANT_MACROS
> > >> -#CFLAGS+= -DNDEBUG
> > >> +CFLAGS+=-DNDEBUG
> > >
> > > Would Clang still hit asserts instead of crashing with cryptic messages?
> >
> > In llvm, assertions (and various other internal consistency checks) are
> > turned off by defining NDEBUG. So indeed, if something in the internal
> > state goes in an unexpected direction, you could get crashes or other
> > "interesting" effects.
> >
> > That said, the resulting executable(s) should run somewhat faster, and
> > be somewhat smaller. I think we have always done this for stable
> > branches and releases.
> >
>
> I think I screwed up, and changed this in the wrong branch. I'm looking
> into the "why", but the commit to head in this case should be reverted
> (I'll take care of it if it was not already done), and this particular
> change should be applied to stable/12 (which I will also take care of).
> I first want to look through our docs to understand how I messed this
> up.
>
Ok, reverted in head as of r339541, and the commit to apply the change
to stable/12 is sent to re@ for approval.
Glen
signature.asc
Description: PGP signature
Re: svn commit: r339436 - in head: . contrib/gcc gnu/usr.bin/cc/cc_tools lib/clang release sys/conf sys/sys
On Sun, Oct 21, 2018 at 11:55:20AM +0200, Dimitry Andric wrote:
> On 21 Oct 2018, at 04:08, Jan Beich wrote:
> >
> > Glen Barber writes:
> >
> >> Modified: head/lib/clang/llvm.build.mk
> >> ==
> >> --- head/lib/clang/llvm.build.mk Fri Oct 19 00:24:23 2018
> >> (r339435)
> >> +++ head/lib/clang/llvm.build.mk Fri Oct 19 00:37:47 2018
> >> (r339436)
> >> @@ -17,7 +17,7 @@ CFLAGS+= -I${LLVM_SRCS}/include
> >> CFLAGS+= -DLLVM_BUILD_GLOBAL_ISEL
> >> CFLAGS+= -D__STDC_LIMIT_MACROS
> >> CFLAGS+= -D__STDC_CONSTANT_MACROS
> >> -#CFLAGS+= -DNDEBUG
> >> +CFLAGS+= -DNDEBUG
> >
> > Would Clang still hit asserts instead of crashing with cryptic messages?
>
> In llvm, assertions (and various other internal consistency checks) are
> turned off by defining NDEBUG. So indeed, if something in the internal
> state goes in an unexpected direction, you could get crashes or other
> "interesting" effects.
>
> That said, the resulting executable(s) should run somewhat faster, and
> be somewhat smaller. I think we have always done this for stable
> branches and releases.
>
I think I screwed up, and changed this in the wrong branch. I'm looking
into the "why", but the commit to head in this case should be reverted
(I'll take care of it if it was not already done), and this particular
change should be applied to stable/12 (which I will also take care of).
I first want to look through our docs to understand how I messed this
up.
Glen
signature.asc
Description: PGP signature
svn commit: r339541 - head/lib/clang
Author: gjb
Date: Sun Oct 21 15:54:38 2018
New Revision: 339541
URL: https://svnweb.freebsd.org/changeset/base/339541
Log:
Comment -DNDEBUG in head after r339436 when head was switched
from 12.0-ALPHA10 to 13.0-CURRENT. This edit was a mistake,
and should have been applied to stable/12 upon branching, not
head.
Reported by: jbeich, dim
Sponsored by: The FreeBSD Foundation
Modified:
head/lib/clang/llvm.build.mk
Modified: head/lib/clang/llvm.build.mk
==
--- head/lib/clang/llvm.build.mkSun Oct 21 15:43:20 2018
(r339540)
+++ head/lib/clang/llvm.build.mkSun Oct 21 15:54:38 2018
(r339541)
@@ -17,7 +17,7 @@ CFLAGS+= -I${LLVM_SRCS}/include
CFLAGS+= -DLLVM_BUILD_GLOBAL_ISEL
CFLAGS+= -D__STDC_LIMIT_MACROS
CFLAGS+= -D__STDC_CONSTANT_MACROS
-CFLAGS+= -DNDEBUG
+#CFLAGS+= -DNDEBUG
TARGET_ARCH?= ${MACHINE_ARCH}
BUILD_ARCH?= ${MACHINE_ARCH}
___
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"
svn commit: r339436 - in head: . contrib/gcc gnu/usr.bin/cc/cc_tools lib/clang release sys/conf sys/sys
Author: gjb
Date: Fri Oct 19 00:37:47 2018
New Revision: 339436
URL: https://svnweb.freebsd.org/changeset/base/339436
Log:
- Update head to 13.0-CURRENT.
- Bump MACHINE_TRIPLE, TARGET_TRIPLE, FBSD_MAJOR, FBSD_CC_VER,
FREEBSD_CC_VERSION, OS_VERSION.
- Update comment in UPDATING regarding debugging options.
- Remove debug.witness.trace=0 from installation media.
- Bump __FreeBSD_version.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/Makefile.inc1
head/UPDATING
head/contrib/gcc/config.gcc
head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
head/lib/clang/freebsd_cc_version.h
head/lib/clang/llvm.build.mk
head/release/Makefile
head/sys/conf/newvers.sh
head/sys/sys/param.h
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Oct 19 00:24:23 2018(r339435)
+++ head/Makefile.inc1 Fri Oct 19 00:37:47 2018(r339436)
@@ -126,9 +126,9 @@ TARGET_ABI= gnueabi
.endif
.endif
MACHINE_ABI?= unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.0
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
TARGET_ABI?= unknown
-TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.0
+TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
arm \
Modified: head/UPDATING
==
--- head/UPDATING Fri Oct 19 00:24:23 2018(r339435)
+++ head/UPDATING Fri Oct 19 00:37:47 2018(r339436)
@@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITHOUT_CLANG and
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
- FreeBSD 12.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
+ FreeBSD 13.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
Modified: head/contrib/gcc/config.gcc
==
--- head/contrib/gcc/config.gcc Fri Oct 19 00:24:23 2018(r339435)
+++ head/contrib/gcc/config.gcc Fri Oct 19 00:37:47 2018(r339436)
@@ -434,6 +434,8 @@ case ${target} in
tm_defines="${tm_defines} FBSD_MAJOR=11" ;;
*-*-freebsd12 | *-*-freebsd12.*)
tm_defines="${tm_defines} FBSD_MAJOR=12" ;;
+*-*-freebsd13 | *-*-freebsd13.*)
+ tm_defines="${tm_defines} FBSD_MAJOR=13" ;;
*)
echo 'Please update *-*-freebsd* in gcc/config.gcc'
exit 1
Modified: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
==
--- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Oct 19 00:24:23
2018(r339435)
+++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Oct 19 00:37:47
2018(r339436)
@@ -7,8 +7,8 @@
#define FREEBSD_NATIVE 1
/* Fake out gcc/config/freebsd.h. */
-#defineFBSD_MAJOR 12
-#defineFBSD_CC_VER 121 /* form like __FreeBSD_version
*/
+#defineFBSD_MAJOR 13
+#defineFBSD_CC_VER 130 /* form like __FreeBSD_version
*/
#undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */
#undef TOOL_INCLUDE_DIR/* We don't need one for now. */
Modified: head/lib/clang/freebsd_cc_version.h
==
--- head/lib/clang/freebsd_cc_version.h Fri Oct 19 00:24:23 2018
(r339435)
+++ head/lib/clang/freebsd_cc_version.h Fri Oct 19 00:37:47 2018
(r339436)
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#defineFREEBSD_CC_VERSION 1200016
+#defineFREEBSD_CC_VERSION 130
Modified: head/lib/clang/llvm.build.mk
==
--- head/lib/clang/llvm.build.mkFri Oct 19 00:24:23 2018
(r339435)
+++ head/lib/clang/llvm.build.mkFri Oct 19 00:37:47 2018
(r339436)
@@ -17,7 +17,7 @@ CFLAGS+= -I${LLVM_SRCS}/include
CFLAGS+= -DLLVM_BUILD_GLOBAL_ISEL
CFLAGS+= -D__STDC_LIMIT_MACROS
CFLAGS+= -D__STDC_CONSTANT_MACROS
-#CFLAGS+= -DNDEBUG
+CFLAGS+= -DNDEBUG
TARGET_ARCH?= ${MACHINE_ARCH}
BUILD_ARCH?= ${MACHINE_ARCH}
@@ -33,7 +33,7 @@
svn commit: r339428 - head
Author: gjb Date: Thu Oct 18 19:07:15 2018 New Revision: 339428 URL: https://svnweb.freebsd.org/changeset/base/339428 Log: Correct the comment for the 20181015 entry in ObsoleteFiles.inc. Reported by: rpokala Approved by: re (kib) Sponsored by: The FreeBSD Foundation Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Oct 18 18:33:44 2018(r339427) +++ head/ObsoleteFiles.inc Thu Oct 18 19:07:15 2018(r339428) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20181015: Stale libcasper(3) files following 20181009: OpenSSL 1.1.1 +# 20181015: Stale libcasper(3) files following r329452 OLD_LIBS+=lib/casper/libcap_sysctl.so.0 OLD_LIBS+=lib/casper/libcap_grp.so.0 OLD_LIBS+=lib/casper/libcap_pwd.so.0 ___ 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: r339361 - head
On Wed, Oct 17, 2018 at 07:12:47PM -0700, Ravi Pokala wrote: > Why would the OpenSSL change cause these libcasper files to be > stale? Nothing on that list should have anything to do with OpenSSL, > right? > It seems I misread the report, and the shlib bump occurred in r329452. So the shlib and ObsoleteFiles.inc change is correct, it is the commit log that is incorrect in this case. Thank you for pointing this out. Glen signature.asc Description: PGP signature
svn commit: r339377 - head/sys/conf
Author: gjb
Date: Tue Oct 16 14:16:39 2018
New Revision: 339377
URL: https://svnweb.freebsd.org/changeset/base/339377
Log:
Update head from ALPHA9 to ALPHA10 as part of the 12.0-RELEASE
cycle.
This is expected to be the final ALPHA build of this release
cycle, prior to branching stable/12.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shTue Oct 16 03:18:57 2018(r339376)
+++ head/sys/conf/newvers.shTue Oct 16 14:16:39 2018(r339377)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA9"
+BRANCH="ALPHA10"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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"
svn commit: r339361 - head
Author: gjb Date: Mon Oct 15 17:16:47 2018 New Revision: 339361 URL: https://svnweb.freebsd.org/changeset/base/339361 Log: Remove stale libcasper(3) shared libraries following the OpenSSL 1.1.1 update. Reported by: des Approved by: re (kib) Sponsored by: The FreeBSD Foundation Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Oct 15 16:43:07 2018(r339360) +++ head/ObsoleteFiles.inc Mon Oct 15 17:16:47 2018(r339361) @@ -38,6 +38,19 @@ # xargs -n1 | sort | uniq -d; # done +# 20181015: Stale libcasper(3) files following 20181009: OpenSSL 1.1.1 +OLD_LIBS+=lib/casper/libcap_sysctl.so.0 +OLD_LIBS+=lib/casper/libcap_grp.so.0 +OLD_LIBS+=lib/casper/libcap_pwd.so.0 +OLD_LIBS+=lib/casper/libcap_random.so.0 +OLD_LIBS+=lib/casper/libcap_dns.so.0 +OLD_LIBS+=lib/casper/libcap_syslog.so.0 +OLD_LIBS+=usr/lib32/libcap_sysctl.so.0 +OLD_LIBS+=usr/lib32/libcap_grp.so.0 +OLD_LIBS+=usr/lib32/libcap_pwd.so.0 +OLD_LIBS+=usr/lib32/libcap_random.so.0 +OLD_LIBS+=usr/lib32/libcap_dns.so.0 +OLD_LIBS+=usr/lib32/libcap_syslog.so.0 # 20181009: OpenSSL 1.1.1 OLD_FILES+=usr/include/openssl/des_old.h OLD_FILES+=usr/include/openssl/dso.h ___ 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"
svn commit: r339292 - head/stand/defaults
Author: gjb Date: Wed Oct 10 20:25:41 2018 New Revision: 339292 URL: https://svnweb.freebsd.org/changeset/base/339292 Log: Fix a minor typo in loader.conf(5). Approved by: re (kib) Sponsored by: The FreeBSD Foundation Modified: head/stand/defaults/loader.conf.5 Modified: head/stand/defaults/loader.conf.5 == --- head/stand/defaults/loader.conf.5 Wed Oct 10 20:21:09 2018 (r339291) +++ head/stand/defaults/loader.conf.5 Wed Oct 10 20:25:41 2018 (r339292) @@ -155,7 +155,7 @@ directive, but they may be loaded directly at the .Xr loader 8 prompt. Blacklisted modules may still be loaded indirectly as dependencies of other -moduled. +modules. .It Ar *_load If set to .Dq YES , ___ 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"
svn commit: r339290 - head/release/scripts
Author: gjb Date: Wed Oct 10 19:57:10 2018 New Revision: 339290 URL: https://svnweb.freebsd.org/changeset/base/339290 Log: Add graphics/drm-legacy-kmod and graphics/drm-stable-kmod to the list of packages to include on the dvd installer. Approved by: re (marius, rgrimes) Sponsored by: The FreeBSD Foundation Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh == --- head/release/scripts/pkg-stage.sh Wed Oct 10 19:39:47 2018 (r339289) +++ head/release/scripts/pkg-stage.sh Wed Oct 10 19:57:10 2018 (r339290) @@ -16,6 +16,8 @@ _DVD_PACKAGES="archivers/unzip devel/subversion devel/subversion-static emulators/linux_base-c6 +graphics/drm-legacy-kmod +graphics/drm-stable-kmod misc/freebsd-doc-all net/mpd5 net/rsync ___ 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"
svn commit: r339271 - head/sys/conf
Author: gjb
Date: Tue Oct 9 21:54:58 2018
New Revision: 339271
URL: https://svnweb.freebsd.org/changeset/base/339271
Log:
Update head from ALPHA8 to ALPHA9 as part of the 12.0-RELEASE
cycle.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shTue Oct 9 21:28:26 2018(r339270)
+++ head/sys/conf/newvers.shTue Oct 9 21:54:58 2018(r339271)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA8"
+BRANCH="ALPHA9"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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"
svn commit: r339244 - head/usr.sbin/bsdinstall/scripts
Author: gjb
Date: Mon Oct 8 19:48:58 2018
New Revision: 339244
URL: https://svnweb.freebsd.org/changeset/base/339244
Log:
Fix the distribution path for -ALPHA builds, which are under
the snapshots directory, not releases.
Reported by: David Marec david.marec _at_ davenulle _dot_ org
Approved by: re (rgrimes)
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.sbin/bsdinstall/scripts/mirrorselect
Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect
==
--- head/usr.sbin/bsdinstall/scripts/mirrorselect Mon Oct 8 19:39:05
2018(r339243)
+++ head/usr.sbin/bsdinstall/scripts/mirrorselect Mon Oct 8 19:48:58
2018(r339244)
@@ -161,7 +161,7 @@ _UNAME_R=`uname -r`
_UNAME_R=${_UNAME_R%-p*}
case ${_UNAME_R} in
- *-CURRENT|*-STABLE|*-PRERELEASE)
+ *-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE)
RELDIR="snapshots"
;;
*)
___
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"
svn commit: r339175 - head/release
Author: gjb
Date: Thu Oct 4 01:46:56 2018
New Revision: 339175
URL: https://svnweb.freebsd.org/changeset/base/339175
Log:
Fix the hardware.{txt,html} build in the release/Makefile 'reldoc'
target.
The doc/share/mk/doc.commands.mk sets SVN to /usr/local/bin/svn
by default, which is not necessarily installed by the documentation
project textproc/docproj port.
Ensure SVN can be evaluated properly to include the hardware pages
by iterating through /usr/local/bin and /usr/bin and looking for
both svn and svnlite binaries, and pass the SVN variable explicitly
through env(1) in the reldoc target to avoid failures if it does not
exist.
Approved by: re (rgrimes)
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Wed Oct 3 20:39:48 2018(r339174)
+++ head/release/Makefile Thu Oct 4 01:46:56 2018(r339175)
@@ -90,6 +90,15 @@ 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
@@ -164,6 +173,7 @@ ports.txz:
reldoc:
cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
env MAN4DIR=${WORLDDIR}/share/man/man4 \
+ SVN=${SVN} \
${MAKE} all install clean "FORMATS=html txt" \
INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
___
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"
svn commit: r338991 - head/sys/conf
Author: gjb
Date: Fri Sep 28 00:01:45 2018
New Revision: 338991
URL: https://svnweb.freebsd.org/changeset/base/338991
Log:
Update head from ALPHA7 to ALPHA8 as part of the 12.0-RELEASE
cycle.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shThu Sep 27 21:08:32 2018(r338990)
+++ head/sys/conf/newvers.shFri Sep 28 00:01:45 2018(r338991)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA7"
+BRANCH="ALPHA8"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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"
svn commit: r338849 - head/sys/conf
Author: gjb
Date: Thu Sep 20 23:59:42 2018
New Revision: 338849
URL: https://svnweb.freebsd.org/changeset/base/338849
Log:
Update head from ALPHA6 to ALPHA7 as part of the 12.0-RELEASE
cycle.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shThu Sep 20 23:06:59 2018(r338848)
+++ head/sys/conf/newvers.shThu Sep 20 23:59:42 2018(r338849)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA6"
+BRANCH="ALPHA7"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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"
svn commit: r338754 - head/release/scripts
Author: gjb Date: Tue Sep 18 16:57:04 2018 New Revision: 338754 URL: https://svnweb.freebsd.org/changeset/base/338754 Log: Update the pkg-stage.sh script used to populate packages on the dvd1.iso installation medium from including KDE4 to KDE5, as the KDE4-based ports have been marked as deprecated in the Ports Collection. MFC after:3 days Approved by: re (rgrimes) Sponsored by: The FreeBSD Foundation Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh == --- head/release/scripts/pkg-stage.sh Tue Sep 18 16:16:58 2018 (r338753) +++ head/release/scripts/pkg-stage.sh Tue Sep 18 16:57:04 2018 (r338754) @@ -30,7 +30,7 @@ www/firefox www/links x11-drivers/xf86-video-vmware x11/gnome3 -x11/kde4 +x11/kde5 x11/xorg" # If NOPORTS is set for the release, do not attempt to build pkg(8). ___ 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"
svn commit: r338675 - head/sys/conf
Author: gjb
Date: Thu Sep 13 23:59:59 2018
New Revision: 338675
URL: https://svnweb.freebsd.org/changeset/base/338675
Log:
Update head from ALPHA5 to ALPHA6 as part of the 12.0-RELEASE
cycle.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shThu Sep 13 23:51:54 2018(r338674)
+++ head/sys/conf/newvers.shThu Sep 13 23:59:59 2018(r338675)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA5"
+BRANCH="ALPHA6"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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: r338653 - head/contrib/ofed/infiniband-diags/src
On Thu, Sep 13, 2018 at 04:41:15PM +, Glen Barber wrote: > Author: gjb > Date: Thu Sep 13 16:41:15 2018 > New Revision: 338653 > URL: https://svnweb.freebsd.org/changeset/base/338653 > > Log: > Remove __DATE__ and __TIME__ from ibdiag_common.c, replacing with > the hard-coded string "not available" to ensure reproducible builds. > Sigh. I forgot to remove the "replacing the string with..." part of the commit message. It was removed entirely. Glen signature.asc Description: PGP signature
svn commit: r338653 - head/contrib/ofed/infiniband-diags/src
Author: gjb
Date: Thu Sep 13 16:41:15 2018
New Revision: 338653
URL: https://svnweb.freebsd.org/changeset/base/338653
Log:
Remove __DATE__ and __TIME__ from ibdiag_common.c, replacing with
the hard-coded string "not available" to ensure reproducible builds.
Discussed with: emaste
Approved by: re (rgrimes)
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/ofed/infiniband-diags/src/ibdiag_common.c
Modified: head/contrib/ofed/infiniband-diags/src/ibdiag_common.c
==
--- head/contrib/ofed/infiniband-diags/src/ibdiag_common.c Thu Sep 13
16:27:21 2018(r338652)
+++ head/contrib/ofed/infiniband-diags/src/ibdiag_common.c Thu Sep 13
16:41:15 2018(r338653)
@@ -84,8 +84,7 @@ static const struct ibdiag_opt *opts_map[256];
static const char *get_build_version(void)
{
- return "BUILD VERSION: " IBDIAG_VERSION " Build date: " __DATE__ " "
- __TIME__;
+ return "BUILD VERSION: " IBDIAG_VERSION;
}
static void pretty_print(int start, int width, const char *str)
___
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"
svn commit: r338518 - head/sys/conf
Author: gjb
Date: Fri Sep 7 00:00:31 2018
New Revision: 338518
URL: https://svnweb.freebsd.org/changeset/base/338518
Log:
Update head from ALPHA4 to ALPHA5 as part of the 12.0-RELEASE
cycle.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shThu Sep 6 23:28:35 2018(r338517)
+++ head/sys/conf/newvers.shFri Sep 7 00:00:31 2018(r338518)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA4"
+BRANCH="ALPHA5"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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"
svn commit: r338424 - in head/sys: dev/sound/midi dev/sound/pci modules/sound/driver/csa
Author: gjb
Date: Sat Sep 1 15:07:38 2018
New Revision: 338424
URL: https://svnweb.freebsd.org/changeset/base/338424
Log:
Revert r338423, reapplying r338422, which did get approval but
communication lines got crossed.
Apologies to avatar@ for the confusion.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Added:
head/sys/dev/sound/pci/csamidi.c
- copied unchanged from r338422, head/sys/dev/sound/pci/csamidi.c
Modified:
head/sys/dev/sound/midi/midi.c
head/sys/modules/sound/driver/csa/Makefile
Modified: head/sys/dev/sound/midi/midi.c
==
--- head/sys/dev/sound/midi/midi.c Sat Sep 1 13:43:14 2018
(r338423)
+++ head/sys/dev/sound/midi/midi.c Sat Sep 1 15:07:38 2018
(r338424)
@@ -1467,18 +1467,14 @@ midi_modevent(module_t mod, int type, void *data)
switch (type) {
case MOD_LOAD:
retval = midi_load();
-#if 0
if (retval == 0)
retval = seq_modevent(mod, type, data);
-#endif
break;
case MOD_UNLOAD:
retval = midi_unload();
-#if 0
if (retval == 0)
retval = seq_modevent(mod, type, data);
-#endif
break;
default:
Copied: head/sys/dev/sound/pci/csamidi.c (from r338422,
head/sys/dev/sound/pci/csamidi.c)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/sound/pci/csamidi.cSat Sep 1 15:07:38 2018
(r338424, copy of r338422, head/sys/dev/sound/pci/csamidi.c)
@@ -0,0 +1,290 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+
+ * Copyright (c) 2015-2018 Tai-hwa Liang
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_snd.h"
+#endif
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include "mpufoi_if.h"
+
+SND_DECLARE_FILE("$FreeBSD$");
+
+/* pulled from mpu401.c */
+#defineMPU_DATAPORT0
+#defineMPU_CMDPORT 1
+#defineMPU_STATPORT1
+#defineMPU_RESET 0xff
+#defineMPU_UART0x3f
+#defineMPU_ACK 0xfe
+#defineMPU_STATMASK0xc0
+#defineMPU_OUTPUTBUSY 0x40
+#defineMPU_INPUTBUSY 0x80
+
+/* device private data */
+struct csa_midi_softc {
+ /* hardware resources */
+ int io_rid; /* io rid */
+ struct resource *io;/* io */
+
+ struct mtx mtx;
+ device_tdev;
+ struct mpu401 *mpu;
+ mpu401_intr_t *mpu_intr;
+ int mflags; /* MIDI flags */
+};
+
+static struct kobj_class csamidi_mpu_class;
+static devclass_t midicsa_devclass;
+
+static u_int32_t
+csamidi_readio(struct csa_midi_softc *scp, u_long offset)
+{
+ if (offset < BA0_AC97_RESET)
+ return bus_space_read_4(rman_get_bustag(scp->io),
rman_get_bushandle(scp->io), offset) & 0x;
+ else
+ return (0);
+}
+
+static void
+csamidi_writeio(struct csa_midi_softc *scp, u_long offset, u_int32_t data)
+{
+ if (offset < BA0_AC97_RESET)
+ bus_space_write_4(rman_get_bustag(scp->io),
rman_get_bushandle(scp->io), offset, data);
+}
+
+static void
+csamidi_midi_intr(void *arg)
+{
+ struct csa_midi_softc *scp = (struct csa_midi_softc *)arg;
+
+ if (scp->mpu_intr)
+
svn commit: r338423 - in head/sys: dev/sound/midi dev/sound/pci modules/sound/driver/csa
Author: gjb
Date: Sat Sep 1 13:43:14 2018
New Revision: 338423
URL: https://svnweb.freebsd.org/changeset/base/338423
Log:
Revert r338422, which was did not get official approval from re@.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Deleted:
head/sys/dev/sound/pci/csamidi.c
Modified:
head/sys/dev/sound/midi/midi.c
head/sys/modules/sound/driver/csa/Makefile
Modified: head/sys/dev/sound/midi/midi.c
==
--- head/sys/dev/sound/midi/midi.c Sat Sep 1 11:26:53 2018
(r338422)
+++ head/sys/dev/sound/midi/midi.c Sat Sep 1 13:43:14 2018
(r338423)
@@ -1467,14 +1467,18 @@ midi_modevent(module_t mod, int type, void *data)
switch (type) {
case MOD_LOAD:
retval = midi_load();
+#if 0
if (retval == 0)
retval = seq_modevent(mod, type, data);
+#endif
break;
case MOD_UNLOAD:
retval = midi_unload();
+#if 0
if (retval == 0)
retval = seq_modevent(mod, type, data);
+#endif
break;
default:
Modified: head/sys/modules/sound/driver/csa/Makefile
==
--- head/sys/modules/sound/driver/csa/Makefile Sat Sep 1 11:26:53 2018
(r338422)
+++ head/sys/modules/sound/driver/csa/Makefile Sat Sep 1 13:43:14 2018
(r338423)
@@ -3,7 +3,7 @@
.PATH: ${SRCTOP}/sys/dev/sound/pci
KMOD= snd_csa
-SRCS= device_if.h bus_if.h mpufoi_if.h pci_if.h
-SRCS+= csa.c csamidi.c csapcm.c
+SRCS= device_if.h bus_if.h pci_if.h
+SRCS+= csa.c csapcm.c
.include
___
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: r338404 - head/sys/conf
Trimmed Mark's last reply, to provide more verbose output from the sparc64 build that failed just now with the same error, but more verbosity. >>> stage 3.1: building everything -- In file included from /usr/src/sys/sys/param.h:96, from /usr/src/sys/kern/genoffset.c:35: /usr/src/sys/sys/types.h:46:28: error: machine/endian.h: No such file or directory In file included from /usr/src/sys/sys/types.h:47, from /usr/src/sys/sys/param.h:96, from /usr/src/sys/kern/genoffset.c:35: /usr/src/sys/sys/_types.h:35:28: error: machine/_types.h: No such file or directory In file included from /usr/src/sys/sys/types.h:47, from /usr/src/sys/sys/param.h:96, from /usr/src/sys/kern/genoffset.c:35: /usr/src/sys/sys/_types.h:40: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__blksize_t' /usr/src/sys/sys/_types.h:41: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__blkcnt_t' /usr/src/sys/sys/_types.h:42: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__clockid_t' /usr/src/sys/sys/_types.h:43: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__fflags_t' /usr/src/sys/sys/_types.h:44: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__fsblkcnt_t' /usr/src/sys/sys/_types.h:45: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__fsfilcnt_t' /usr/src/sys/sys/_types.h:46: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__gid_t' /usr/src/sys/sys/_types.h:47: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__id_t' /usr/src/sys/sys/_types.h:48: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__ino_t' /usr/src/sys/sys/_types.h:50: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__lwpid_t' /usr/src/sys/sys/_types.h:51: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__mode_t' /usr/src/sys/sys/_types.h:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__nlink_t' /usr/src/sys/sys/_types.h:55: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__off_t' /usr/src/sys/sys/_types.h:56: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__off64_t' /usr/src/sys/sys/_types.h:57: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__pid_t' /usr/src/sys/sys/_types.h:58: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__rlim_t' /usr/src/sys/sys/_types.h:61: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__sa_family_t' /usr/src/sys/sys/_types.h:62: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__socklen_t' /usr/src/sys/sys/_types.h:66: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__uid_t' /usr/src/sys/sys/_types.h:96: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__char16_t' /usr/src/sys/sys/_types.h:97: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__char32_t' /usr/src/sys/sys/_types.h:112: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__dev_t' /usr/src/sys/sys/_types.h:114: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__fixpt_t' /usr/src/sys/sys/_types.h:122: error: expected specifier-qualifier-list before '__int64_t' /usr/src/sys/sys/_types.h:125: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__rman_res_t' In file included from /usr/src/sys/sys/types.h:65, from /usr/src/sys/sys/param.h:96, from /usr/src/sys/kern/genoffset.c:35: [...] /usr/src/sys/kern/genoffset.c:43: warning: type defaults to 'int' in declaration of 'type name' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44: error: 'struct thread' has no member named 'td_owepreempt' /usr/src/sys/kern/genoffset.c:44:
Re: svn commit: r338404 - head/sys/conf
On Fri, Aug 31, 2018 at 09:34:00AM -0700, Mark Millard wrote: > On Fri, Aug 31, 2018 at 02:20:09PM +0000, Glen Barber wrote: > > > On Fri, Aug 31, 2018 at 08:51:29AM -0400, Ed Maste wrote: > > > > On 30 August 2018 at 22:46, Glen Barber wrote: > > > > > > > > > > As I look closer at the log, I have a sneaking suspicion this may have > > > > > been a transient. I'm redoing the i386 build against the original > > > > > r338401 for i386 alone as a test, if nothing else, to see if it fails > > > > > in > > > > > the same place. > > > > > > > > What's the failure? > > > > > > >>> stage 3.1: building everything > > > -- > > > In file included from /usr/src/sys/kern/genoffset.c:35: > > > In file included from /usr/src/sys/sys/param.h:96: > > > /usr/src/sys/sys/types.h:46:10: fatal error: 'machine/endian.h' file not > > > found > > > #include > > > ^~ > > > 1 error generated. > > > --- genoffset.o --- > > > *** [genoffset.o] Error code 1 > > > > > > So far, 100% reproducible with an empty /usr/obj/. > > > > > > > I see head/i386 is green in CI. > > > > > > > > > > Does CI prune .OBJDIR for each build? > > > > > > > Make that 75% reproducible. I suspect there is a build race occurring. > > ci.freebsd.org occasionally shows examples of this race. For example: > > https://ci.freebsd.org/job/FreeBSD-head-powerpc-build/7454/consoleText > > shows: > > --- genoffset.o --- > /usr/src/sys/sys/types.h:46:28: error: machine/endian.h: No such file or > directory > *** [genoffset.o] Error code 1 > > for -r338319 but the prior build (for -r338318) and > following build (for -r338320) worked fine. > > -r338319 was for something that should make no difference > to the issue: > > QUOTE > Remove trailing slash in pathname so that valid METALOG is created in the > NO_ROOT case of make packages. > END QUOTE > > I've seen other occasional examples. > Thanks for the link to this specific failure. I see nothing in that range of commits that should have any impact here. What caused me to back out the ALPHA rename is this is the first time I've seen this since the code freeze started, and following the first failure, restarted the builds with the same result. I'll go poking around at the CI console output to try to find when the first occurrence happened. Glen signature.asc Description: PGP signature
svn commit: r338410 - head/sys/conf
Author: gjb
Date: Fri Aug 31 16:29:36 2018
New Revision: 338410
URL: https://svnweb.freebsd.org/changeset/base/338410
Log:
Update head from ALPHA3 to ALPHA4 as part of the 12.0-RELEASE
cycle. The i386 build failure appears to be transient, and
now becoming more difficult to reliably reproduce to identify
the cause. I will continue to investigate this, however.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shFri Aug 31 16:15:46 2018(r338409)
+++ head/sys/conf/newvers.shFri Aug 31 16:29:36 2018(r338410)
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="ALPHA3"
+BRANCH="ALPHA4"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
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: r338404 - head/sys/conf
On Fri, Aug 31, 2018 at 02:20:09PM +, Glen Barber wrote: > On Fri, Aug 31, 2018 at 08:51:29AM -0400, Ed Maste wrote: > > On 30 August 2018 at 22:46, Glen Barber wrote: > > > > > > As I look closer at the log, I have a sneaking suspicion this may have > > > been a transient. I'm redoing the i386 build against the original > > > r338401 for i386 alone as a test, if nothing else, to see if it fails in > > > the same place. > > > > What's the failure? > > >>> stage 3.1: building everything > -- > In file included from /usr/src/sys/kern/genoffset.c:35: > In file included from /usr/src/sys/sys/param.h:96: > /usr/src/sys/sys/types.h:46:10: fatal error: 'machine/endian.h' file not > found > #include > ^~ > 1 error generated. > --- genoffset.o --- > *** [genoffset.o] Error code 1 > > So far, 100% reproducible with an empty /usr/obj/. > > > I see head/i386 is green in CI. > > > > Does CI prune .OBJDIR for each build? > Make that 75% reproducible. I suspect there is a build race occurring. Glen signature.asc Description: PGP signature
Re: svn commit: r338404 - head/sys/conf
On Fri, Aug 31, 2018 at 08:51:29AM -0400, Ed Maste wrote: > On 30 August 2018 at 22:46, Glen Barber wrote: > > > > As I look closer at the log, I have a sneaking suspicion this may have > > been a transient. I'm redoing the i386 build against the original > > r338401 for i386 alone as a test, if nothing else, to see if it fails in > > the same place. > > What's the failure? >>> stage 3.1: building everything -- In file included from /usr/src/sys/kern/genoffset.c:35: In file included from /usr/src/sys/sys/param.h:96: /usr/src/sys/sys/types.h:46:10: fatal error: 'machine/endian.h' file not found #include ^~ 1 error generated. --- genoffset.o --- *** [genoffset.o] Error code 1 So far, 100% reproducible with an empty /usr/obj/. > I see head/i386 is green in CI. > Does CI prune .OBJDIR for each build? Glen signature.asc Description: PGP signature
