Changeset View
Changeset View
Standalone View
Standalone View
usr.sbin/pkg/Makefile
# $FreeBSD$ | # $FreeBSD$ | ||||
PACKAGE= pkg-bootstrap | PACKAGE= pkg-bootstrap | ||||
_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH | _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH | ||||
BRANCH?= ${_BRANCH} | BRANCH?= ${_BRANCH} | ||||
emaste: Ah, my original issue is that my environment (in Cirrus-CI) sets `BRANCH` to the name of the… | |||||
.if ${BRANCH:MCURRENT} != "" | .if ${BRANCH:MCURRENT} != "" | ||||
PKGCONFBRANCH?= latest | PKGCONFBRANCH?= latest | ||||
.else | .else | ||||
. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*} | . if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*} | ||||
PKGCONFBRANCH?= quarterly | PKGCONFBRANCH?= quarterly | ||||
. else | . else | ||||
. if ${MACHINE} != "amd64" && ${MACHINE} != "i386" | . if ${MACHINE} != "amd64" && ${MACHINE} != "i386" && ${MACHINE} != "arm64" | ||||
PKGCONFBRANCH?= quarterly | PKGCONFBRANCH?= quarterly | ||||
. else | . else | ||||
PKGCONFBRANCH?= latest | PKGCONFBRANCH?= latest | ||||
. endif | . endif | ||||
. endif | . endif | ||||
.endif | .endif | ||||
PKGCONF?= FreeBSD.conf.${PKGCONFBRANCH} | PKGCONF?= FreeBSD.conf.${PKGCONFBRANCH} | ||||
CONFS= ${PKGCONF} | CONFS= ${PKGCONF} | ||||
Show All 12 Lines |
Ah, my original issue is that my environment (in Cirrus-CI) sets BRANCH to the name of the git branch. I'll take a look at making this more robust in a future review but IMO this change makes sense independently.