mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

Fix poudriere image with pkg 1.11

Browse Source
This commit is contained in:
Baptiste Daroussin 2019-06-13 12:49:09 +00:00
parent 81920eee0b
commit 11ffe03b2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=504085
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/poudriere-devel/Makefile
View File

@ -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}/ \

17
ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 Normal file
View File

@ -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 }

2
ports-mgmt/poudriere/Makefile
View File

@ -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}/ \

17
ports-mgmt/poudriere/files/patch-image-pkg1.11 Normal file
View File

@ -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 }