diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2020-11-11 22:20:36 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2020-11-11 22:20:36 +0000 |
| commit | 7102cd71c012687757fd4180382a22ab6075d47c (patch) | |
| tree | 962f353f3304a3eb6d75091ca88f70792bed4c31 /ports-mgmt | |
| parent | 2c2f09a005a8618c86a7a47f1087a9938f9703fe (diff) | |
| download | ports-7102cd71c012687757fd4180382a22ab6075d47c.tar.gz ports-7102cd71c012687757fd4180382a22ab6075d47c.zip | |
- Fix jail creation for 12.2+ seeing sys/param.h error.
MFH: 2020Q4
Notes
Notes:
svn path=/head/; revision=554917
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/poudriere-devel/Makefile | 6 | ||||
| -rw-r--r-- | ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 3d74485c05ac..db191d9c0a98 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20200326 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -52,11 +52,9 @@ PLIST_SUB+= RM="@comment " .endif post-patch: - ${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ - ${WRKSRC}/poudriere - ${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.* + ${WRKSRC}/src/bin/poudriere post-install: ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ diff --git a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh b/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh new file mode 100644 index 000000000000..1552bc5689fc --- /dev/null +++ b/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh @@ -0,0 +1,11 @@ +--- src/share/poudriere/jail.sh.orig 2020-11-11 22:16:56 UTC ++++ src/share/poudriere/jail.sh +@@ -174,7 +174,7 @@ update_version() { + local version_extra="$1" + + if [ -r "${SRC_BASE}/sys/conf/newvers.sh" ]; then +- eval `grep "^[RB][A-Z]*=" ${SRC_BASE}/sys/conf/newvers.sh ` ++ eval `grep "^REVISION=\|^BRANCH=" ${SRC_BASE}/sys/conf/newvers.sh ` + RELEASE=${REVISION}-${BRANCH} + else + RELEASE=$(jget ${JAILNAME} version) |