git: 99767f704b5d - main - sysutils/arc_summary: Match script to FreeBSD version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Dec 2023 13:30:33 UTC
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=99767f704b5d493ce2d04365a42f70bdadb31bf7 commit 99767f704b5d493ce2d04365a42f70bdadb31bf7 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2023-12-15 00:55:29 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2023-12-15 12:59:06 +0000 sysutils/arc_summary: Match script to FreeBSD version The latest arc_summary from the OpenZFS repository fails to run on FreeBSD 13.2. Resolve this by installing arc_summary from a branch of our src repository that matches the major version of the target system. PR: 274605 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43070 --- sysutils/arc_summary/Makefile | 21 +++++++++++++++------ sysutils/arc_summary/distinfo | 10 +++++++--- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sysutils/arc_summary/Makefile b/sysutils/arc_summary/Makefile index b41161f58d1b..47782014e038 100644 --- a/sysutils/arc_summary/Makefile +++ b/sysutils/arc_summary/Makefile @@ -1,8 +1,11 @@ PORTNAME= arc_summary -PORTVERSION= 20231023 +PORTVERSION= 20231114 CATEGORIES= sysutils -MASTER_SITES= https://raw.githubusercontent.com/openzfs/zfs/${_REV}/cmd/ -DISTFILES= ${PORTNAME}?${PORTVERSION} +MASTER_SITES= https://cgit.freebsd.org/src/plain/sys/contrib/openzfs/cmd/ \ + https://cgit.freebsd.org/src/plain/sys/contrib/openzfs/cmd/arc_summary/:13 +DISTFILES= ${PORTNAME}3?h=releng/13.2:13 \ + ${PORTNAME}?h=releng/14.0 \ + ${PORTNAME} MAINTAINER= jrm@FreeBSD.org COMMENT= Print ZFS ARC cache statistics and other information @@ -21,12 +24,18 @@ NO_BUILD= yes NO_WRKSUBDIR= yes PLIST_FILES= bin/arc_summary -_REV= e57909265b4352832d69f5107bac7e56d6a8fbd2 +.include <bsd.port.pre.mk> do-extract: - ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${PORTNAME} +.if ${OSVERSION} < 1400000 + ${CP} ${DISTDIR}/${PORTNAME}3?h=releng/13.2 ${WRKSRC}/${PORTNAME} +.elif ${OSVERSION} >= 1400000 && ${OSVERSION} < 1500000 + ${CP} ${DISTDIR}/${PORTNAME}?h=releng/14.0 ${WRKSRC}/${PORTNAME} +.else + ${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC}/${PORTNAME} +.endif do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/sysutils/arc_summary/distinfo b/sysutils/arc_summary/distinfo index 3532084a5e8a..be2951e8d7a5 100644 --- a/sysutils/arc_summary/distinfo +++ b/sysutils/arc_summary/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1700833863 -SHA256 (arc_summary?20231023) = 44e8d4aec6614aacfece3a12a6953e0f68b4358fa9621415f25200b346020132 -SIZE (arc_summary?20231023) = 37268 +TIMESTAMP = 1702600566 +SHA256 (arc_summary3?h=releng/13.2) = 978d3743bc99a936c05418e3f08d6041535214196d081a6c87938c01a7936da2 +SIZE (arc_summary3?h=releng/13.2) = 34365 +SHA256 (arc_summary?h=releng/14.0) = 81fc104da57777f45c931c9c2f425f1fe219d12dc61a9d2928a1b03561f9aecb +SIZE (arc_summary?h=releng/14.0) = 37272 +SHA256 (arc_summary) = 44e8d4aec6614aacfece3a12a6953e0f68b4358fa9621415f25200b346020132 +SIZE (arc_summary) = 37268