From owner-svn-ports-head@freebsd.org Thu Jun 13 12:49:11 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3142415B1285; Thu, 13 Jun 2019 12:49:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C2DAE833F5; Thu, 13 Jun 2019 12:49:10 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A28A760; Thu, 13 Jun 2019 12:49:10 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5DCnAsk072565; Thu, 13 Jun 2019 12:49:10 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5DCn9O1072562; Thu, 13 Jun 2019 12:49:09 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201906131249.x5DCn9O1072562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 13 Jun 2019 12:49:09 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/ports-mgmt: poudriere poudriere-devel poudriere-devel/files poudriere/files X-SVN-Commit-Revision: 504085 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C2DAE833F5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jun 2019 12:49:11 -0000 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 }