Date: Thu, 13 Jun 2019 12:49:09 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504085 - in head/ports-mgmt: poudriere poudriere-devel poudriere-devel/files poudriere/files Message-ID: <201906131249.x5DCn9O1072562@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Jun 13 12:49:09 2019 New Revision: 504085 URL: https://svnweb.freebsd.org/changeset/ports/504085 Log: Fix poudriere image with pkg 1.11 Added: head/ports-mgmt/poudriere-devel/files/ head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 (contents, props changed) head/ports-mgmt/poudriere/files/ head/ports-mgmt/poudriere/files/patch-image-pkg1.11 (contents, props changed) Modified: head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere/Makefile Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Thu Jun 13 12:34:02 2019 (r504084) +++ head/ports-mgmt/poudriere-devel/Makefile Thu Jun 13 12:49:09 2019 (r504085) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20190311 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 Thu Jun 13 12:49:09 2019 (r504085) @@ -0,0 +1,17 @@ +diff --git src/share/poudriere/image.sh src/share/poudriere/image.sh +index 5a0f2e2b..e34dc063 100644 +--- src/share/poudriere/image.sh ++++ src/share/poudriere/image.sh +@@ -411,10 +411,12 @@ if [ -n "${PACKAGELIST}" ]; then + FreeBSD: { enabled: false } + local: { url: file:///tmp/packages } + EOF ++ mount -t devfs devfs ${WRKDIR}/world/dev + convert_package_list "${PACKAGELIST}" | \ + xargs chroot "${WRKDIR}/world" env \ + REPOS_DIR=/tmp ASSUME_ALWAYS_YES=yes \ + pkg install ++ umount ${WRKDIR}/world/dev + else + cat > "${WRKDIR}/world/tmp/repo.conf" <<-EOF + FreeBSD: { enabled: false } Modified: head/ports-mgmt/poudriere/Makefile ============================================================================== --- head/ports-mgmt/poudriere/Makefile Thu Jun 13 12:34:02 2019 (r504084) +++ head/ports-mgmt/poudriere/Makefile Thu Jun 13 12:49:09 2019 (r504085) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.3.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/poudriere/files/patch-image-pkg1.11 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere/files/patch-image-pkg1.11 Thu Jun 13 12:49:09 2019 (r504085) @@ -0,0 +1,17 @@ +diff --git src/share/poudriere/image.sh src/share/poudriere/image.sh +index 5a0f2e2b..e34dc063 100644 +--- src/share/poudriere/image.sh ++++ src/share/poudriere/image.sh +@@ -411,10 +411,12 @@ if [ -n "${PACKAGELIST}" ]; then + FreeBSD: { enabled: false } + local: { url: file:///tmp/packages } + EOF ++ mount -t devfs devfs ${WRKDIR}/world/dev + convert_package_list "${PACKAGELIST}" | \ + xargs chroot "${WRKDIR}/world" env \ + REPOS_DIR=/tmp ASSUME_ALWAYS_YES=yes \ + pkg install ++ umount ${WRKDIR}/world/dev + else + cat > "${WRKDIR}/world/tmp/repo.conf" <<-EOF + FreeBSD: { enabled: false }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906131249.x5DCn9O1072562>