Attachment #254422 for bug #282248

View | Details | Raw Unified | Return to bug 282248
Collapse All | Expand All




PORTNAME=	poudriere
DISTVERSION=	3.4.99.20240812
CATEGORIES=	ports-mgmt
PKGNAMESUFFIX=	-dsh2dsh

MAINTAINER=	dsh@bamus.cz
COMMENT=	Port build and test system (fork with more features)

LICENSE=	BSD2CLAUSE

CONFLICTS_INSTALL=	poudriere*

USE_GITHUB=	yes
GH_ACCOUNT=	dsh2dsh
GH_TAGNAME=	c984ecd

GNU_CONFIGURE=	yes
ETCDIR=		${PREFIX}/etc/poudriere.d

OPTIONS_DEFINE=	BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH
OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH
OPTIONS_SUB=	yes

MANIFESTS_DESC=		Install manifests for jail creation
MANIFESTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests

PORTCONFIG_DESC=	Install portconfig for options command
PORTCONFIG_RUN_DEPENDS=	portconfig>0:ports-mgmt/portconfig

QEMU_DESC=	Add qemu-user-static for non-x86 architectures
QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static


# gmake is not strictly needed but handles test jobs better
TEST_DEPENDS=	gmake>0:devel/gmake
TEST_ENV=	MAKE=gmake
.if make(test)
MAKE_CMD=	gmake
.endif
TEST_TARGET=	check
TEST_ARGS=	-s
TEST_ARGS+=	${_MAKE_JOBS}
# ccache passthrough helps for building pkg a few hundred times.
# ccache not added as a dependency because it is only used if setup
# and provided in the env already.
# XXX: Passthrough local PKGREPOSITORY dir for fetch support
ccache_vars=	CCACHE_DIR_NON_ROOT_SAFE CCACHE_GROUP \
		CCACHE_GID CCACHE_STATIC_PREFIX CCACHE_TEMPDIR \
		CCACHE_DIR CCACHE_NLEVELS
.for _cv in ${ccache_vars}
.  if !empty(${_cv})
TEST_ENV+=	${_cv}=${${_cv}}
.  endif
.endfor

.include <bsd.port.options.mk>

# rm -x support came in 10.0.  A bundled rm is used if not supported in base.
# While <10 is technically not supported in the Ports Tree, Poudriere
# detects this and it being a package build tool it should still be
# supported as a user may be installing this to build packages for upgrading
# their system to a supported release.
.if ${OSVERSION} < 1000000
PLIST_SUB+=	RM=""
.else
PLIST_SUB+=	RM="@comment "
.endif

post-patch:
	${REINPLACE_CMD} \
	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
	    ${WRKSRC}/src/bin/poudriere.in

post-install:
	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
	    ${STAGEDIR}${DATADIR}/MANIFESTS

post-install-BASH-on:
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
	${INSTALL_DATA} ${WRKSRC}/completions/bash/poudriere \
	    ${STAGEDIR}${PREFIX}/share/bash-completion/completions/

post-install-ZSH-on:
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/

.include <bsd.port.mk>

Added Link Here

(-)b/ports-mgmt/poudriere-dsh2dsh/distinfo (+3 lines)
1	TIMESTAMP = 1723471537
2	SHA256 (dsh2dsh-poudriere-3.4.99.20240812-c984ecd_GH0.tar.gz) = 423ff3eaa91e7dfa91a19818456c82323d78233c589f9b206e5f30d5a77a8d76
3	SIZE (dsh2dsh-poudriere-3.4.99.20240812-c984ecd_GH0.tar.gz) = 5745709

Added Link Here

(-)b/ports-mgmt/poudriere-dsh2dsh/pkg-descr (+9 lines)
1	poudriere is a tool primarily designed to test package production on FreeBSD.
2	However, most people will find it useful to bulk build ports for FreeBSD.
3
4	Changes from upstream:
5
6	* Better reuse of prebuilded FreeBSD packages.
7	* Speedup building by rebuilding only changed ports.
8	* Share go mod cache between builders and store downloaded modules in
9	`DISTFILES_CACHE`.




bin/poudriere
@sample etc/poudriere.conf.sample
%%ETCDIR%%/hooks/bulk.sh.sample
%%ETCDIR%%/hooks/pkgbuild.sh.sample
@sample(0,0,0) etc/poudriered.conf.sample
etc/rc.d/poudriered
@comment libexec/poudriere/cachec
libexec/poudriere/clock
libexec/poudriere/cpdup
libexec/poudriere/dirempty
libexec/poudriere/dirwatch
libexec/poudriere/locked_mkdir
libexec/poudriere/nc
libexec/poudriere/poudriered
libexec/poudriere/ptsort
libexec/poudriere/pwait
libexec/poudriere/rename
%%RM%%libexec/poudriere/rm
libexec/poudriere/setsid
libexec/poudriere/sh
libexec/poudriere/timeout
libexec/poudriere/timestamp
%%BASH%%share/bash-completion/completions/poudriere
share/man/man8/poudriere-bulk.8.gz
share/man/man8/poudriere-distclean.8.gz
share/man/man8/poudriere-image.8.gz
share/man/man8/poudriere-jail.8.gz
share/man/man8/poudriere-logclean.8.gz
share/man/man8/poudriere-options.8.gz
share/man/man8/poudriere-pkgclean.8.gz
share/man/man8/poudriere-ports.8.gz
share/man/man8/poudriere-queue.8.gz
share/man/man8/poudriere-status.8.gz
share/man/man8/poudriere-testport.8.gz
share/man/man8/poudriere-version.8.gz
share/man/man8/poudriere.8.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Caddyfile.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample
%%DATADIR%%/MANIFESTS
%%DATADIR%%/api.sh
%%DATADIR%%/awk/dependency_loop.awk
%%DATADIR%%/awk/file_cmp_reg.awk
%%DATADIR%%/awk/humanize.awk
%%DATADIR%%/awk/json.awk
%%DATADIR%%/awk/json_jail.awk
%%DATADIR%%/awk/json_top.awk
%%DATADIR%%/awk/parse_MOVED.awk
%%DATADIR%%/awk/processonelog.awk
%%DATADIR%%/awk/processonelog2.awk
%%DATADIR%%/awk/siginfo_buildtime.awk
%%DATADIR%%/awk/unique_pkgnames_from_flavored_origins.awk
%%DATADIR%%/bulk.sh
%%DATADIR%%/common.sh
%%DATADIR%%/daemon.sh
%%DATADIR%%/distclean.sh
%%DATADIR%%/foreachport.sh
%%DATADIR%%/html/assets/DataTables-1.13.8/css/dataTables.bootstrap5.min.css
%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_asc.png
%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_asc_disabled.png
%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_both.png
%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_desc.png
%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_desc_disabled.png
%%DATADIR%%/html/assets/DataTables-1.13.8/js/dataTables.bootstrap5.min.js
%%DATADIR%%/html/assets/DataTables-1.13.8/js/jquery.dataTables.min.js
%%DATADIR%%/html/assets/bootstrap-5.3.2/css/bootstrap.min.css
%%DATADIR%%/html/assets/bootstrap-5.3.2/js/bootstrap.bundle.min.js
%%DATADIR%%/html/assets/favicon.png
%%DATADIR%%/html/assets/jquery-3.7.1/jquery-3.7.1.js
%%DATADIR%%/html/assets/jquery-3.7.1/jquery-3.7.1.min.js
%%DATADIR%%/html/assets/jquery-3.7.1/jquery-3.7.1.min.map
%%DATADIR%%/html/assets/jquery.dataTables.rowGrouping-1.2.9.js
%%DATADIR%%/html/assets/logo-dark.png
%%DATADIR%%/html/assets/logo-light.png
%%DATADIR%%/html/assets/poudriere.js
%%DATADIR%%/html/build.html
%%DATADIR%%/html/index.html
%%DATADIR%%/html/jail.html
%%DATADIR%%/html/robots.txt
%%DATADIR%%/image.sh
%%DATADIR%%/image_dump.sh
%%DATADIR%%/image_firmware.sh
%%DATADIR%%/image_hybridiso.sh
%%DATADIR%%/image_iso.sh
%%DATADIR%%/image_mfs.sh
%%DATADIR%%/image_rawdisk.sh
%%DATADIR%%/image_tar.sh
%%DATADIR%%/image_usb.sh
%%DATADIR%%/image_zfs.sh
%%DATADIR%%/image_zsnapshot.sh
%%DATADIR%%/include/asserts.sh
%%DATADIR%%/include/cache.sh
%%DATADIR%%/include/colors.pre.sh
%%DATADIR%%/include/colors.sh
%%DATADIR%%/include/common.sh.dragonfly
%%DATADIR%%/include/common.sh.freebsd
%%DATADIR%%/include/display.sh
%%DATADIR%%/include/fs.sh
%%DATADIR%%/include/hash.sh
%%DATADIR%%/include/html.sh
%%DATADIR%%/include/parallel.sh
%%DATADIR%%/include/pkg.sh
%%DATADIR%%/include/pkgqueue.sh
%%DATADIR%%/include/shared_hash.sh
%%DATADIR%%/include/util.sh
%%DATADIR%%/jail.sh
%%DATADIR%%/logclean.sh
%%DATADIR%%/options.sh
%%DATADIR%%/pkgclean.sh
%%DATADIR%%/ports.sh
%%DATADIR%%/processonelog.sh
%%DATADIR%%/queue.sh
%%DATADIR%%/status.sh
%%DATADIR%%/testport.sh
%%ZSH%%share/zsh/site-functions/_poudriere

Return to bug 282248

Added Link Here

(-)b/ports-mgmt/poudriere-dsh2dsh/Makefile (+88 lines)
1	PORTNAME= poudriere
2	DISTVERSION= 3.4.99.20240812
3	CATEGORIES= ports-mgmt
4	PKGNAMESUFFIX= -dsh2dsh
5
6	MAINTAINER= dsh@bamus.cz
7	COMMENT= Port build and test system (fork with more features)
8
9	LICENSE= BSD2CLAUSE
10
11	CONFLICTS_INSTALL= poudriere*
12
13	USE_GITHUB= yes
14	GH_ACCOUNT= dsh2dsh
15	GH_TAGNAME= c984ecd
16
17	GNU_CONFIGURE= yes
18	ETCDIR= ${PREFIX}/etc/poudriere.d
19
20	OPTIONS_DEFINE= BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH
21	OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH
22	OPTIONS_SUB= yes
23
24	MANIFESTS_DESC= Install manifests for jail creation
25	MANIFESTS_RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests
26
27	PORTCONFIG_DESC= Install portconfig for options command
28	PORTCONFIG_RUN_DEPENDS= portconfig>0:ports-mgmt/portconfig
29
30	QEMU_DESC= Add qemu-user-static for non-x86 architectures
31	QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static
32
33
34	# gmake is not strictly needed but handles test jobs better
35	TEST_DEPENDS= gmake>0:devel/gmake
36	TEST_ENV= MAKE=gmake
37	.if make(test)
38	MAKE_CMD= gmake
39	.endif
40	TEST_TARGET= check
41	TEST_ARGS= -s
42	TEST_ARGS+= ${_MAKE_JOBS}
43	# ccache passthrough helps for building pkg a few hundred times.
44	# ccache not added as a dependency because it is only used if setup
45	# and provided in the env already.
46	# XXX: Passthrough local PKGREPOSITORY dir for fetch support
47	ccache_vars= CCACHE_DIR_NON_ROOT_SAFE CCACHE_GROUP \
48	CCACHE_GID CCACHE_STATIC_PREFIX CCACHE_TEMPDIR \
49	CCACHE_DIR CCACHE_NLEVELS
50	.for _cv in ${ccache_vars}
51	. if !empty(${_cv})
52	TEST_ENV+= ${_cv}=${${_cv}}
53	. endif
54	.endfor
55
56	.include <bsd.port.options.mk>
57
58	# rm -x support came in 10.0. A bundled rm is used if not supported in base.
59	# While <10 is technically not supported in the Ports Tree, Poudriere
60	# detects this and it being a package build tool it should still be
61	# supported as a user may be installing this to build packages for upgrading
62	# their system to a supported release.
63	.if ${OSVERSION} < 1000000
64	PLIST_SUB+= RM=""
65	.else
66	PLIST_SUB+= RM="@comment "
67	.endif
68
69	post-patch:
70	${REINPLACE_CMD} \
71	-e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
72	${WRKSRC}/src/bin/poudriere.in
73
74	post-install:
75	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
76	${STAGEDIR}${DATADIR}/MANIFESTS
77
78	post-install-BASH-on:
79	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
80	${INSTALL_DATA} ${WRKSRC}/completions/bash/poudriere \
81	${STAGEDIR}${PREFIX}/share/bash-completion/completions/
82
83	post-install-ZSH-on:
84	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
85	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
86	${STAGEDIR}${PREFIX}/share/zsh/site-functions/
87
88	.include <bsd.port.mk>

Added Link Here

(-)b/ports-mgmt/poudriere-dsh2dsh/pkg-plist (-1 / +115 lines)
0	-	1	bin/poudriere
		2	@sample etc/poudriere.conf.sample
		3	%%ETCDIR%%/hooks/bulk.sh.sample
		4	%%ETCDIR%%/hooks/pkgbuild.sh.sample
		5	@sample(0,0,0) etc/poudriered.conf.sample
		6	etc/rc.d/poudriered
		7	@comment libexec/poudriere/cachec
		8	libexec/poudriere/clock
		9	libexec/poudriere/cpdup
		10	libexec/poudriere/dirempty
		11	libexec/poudriere/dirwatch
		12	libexec/poudriere/locked_mkdir
		13	libexec/poudriere/nc
		14	libexec/poudriere/poudriered
		15	libexec/poudriere/ptsort
		16	libexec/poudriere/pwait
		17	libexec/poudriere/rename
		18	%%RM%%libexec/poudriere/rm
		19	libexec/poudriere/setsid
		20	libexec/poudriere/sh
		21	libexec/poudriere/timeout
		22	libexec/poudriere/timestamp
		23	%%BASH%%share/bash-completion/completions/poudriere
		24	share/man/man8/poudriere-bulk.8.gz
		25	share/man/man8/poudriere-distclean.8.gz
		26	share/man/man8/poudriere-image.8.gz
		27	share/man/man8/poudriere-jail.8.gz
		28	share/man/man8/poudriere-logclean.8.gz
		29	share/man/man8/poudriere-options.8.gz
		30	share/man/man8/poudriere-pkgclean.8.gz
		31	share/man/man8/poudriere-ports.8.gz
		32	share/man/man8/poudriere-queue.8.gz
		33	share/man/man8/poudriere-status.8.gz
		34	share/man/man8/poudriere-testport.8.gz
		35	share/man/man8/poudriere-version.8.gz
		36	share/man/man8/poudriere.8.gz
		37	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Caddyfile.sample
		38	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample
		39	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample
		40	%%DATADIR%%/MANIFESTS
		41	%%DATADIR%%/api.sh
		42	%%DATADIR%%/awk/dependency_loop.awk
		43	%%DATADIR%%/awk/file_cmp_reg.awk
		44	%%DATADIR%%/awk/humanize.awk
		45	%%DATADIR%%/awk/json.awk
		46	%%DATADIR%%/awk/json_jail.awk
		47	%%DATADIR%%/awk/json_top.awk
		48	%%DATADIR%%/awk/parse_MOVED.awk
		49	%%DATADIR%%/awk/processonelog.awk
		50	%%DATADIR%%/awk/processonelog2.awk
		51	%%DATADIR%%/awk/siginfo_buildtime.awk
		52	%%DATADIR%%/awk/unique_pkgnames_from_flavored_origins.awk
		53	%%DATADIR%%/bulk.sh
		54	%%DATADIR%%/common.sh
		55	%%DATADIR%%/daemon.sh
		56	%%DATADIR%%/distclean.sh
		57	%%DATADIR%%/foreachport.sh
		58	%%DATADIR%%/html/assets/DataTables-1.13.8/css/dataTables.bootstrap5.min.css
		59	%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_asc.png
		60	%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_asc_disabled.png
		61	%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_both.png
		62	%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_desc.png
		63	%%DATADIR%%/html/assets/DataTables-1.13.8/images/sort_desc_disabled.png
		64	%%DATADIR%%/html/assets/DataTables-1.13.8/js/dataTables.bootstrap5.min.js
		65	%%DATADIR%%/html/assets/DataTables-1.13.8/js/jquery.dataTables.min.js
66	%%DATADIR%%/html/assets/bootstrap-5.3.2/css/bootstrap.min.css
67	%%DATADIR%%/html/assets/bootstrap-5.3.2/js/bootstrap.bundle.min.js
68	%%DATADIR%%/html/assets/favicon.png
69	%%DATADIR%%/html/assets/jquery-3.7.1/jquery-3.7.1.js
70	%%DATADIR%%/html/assets/jquery-3.7.1/jquery-3.7.1.min.js
71	%%DATADIR%%/html/assets/jquery-3.7.1/jquery-3.7.1.min.map
72	%%DATADIR%%/html/assets/jquery.dataTables.rowGrouping-1.2.9.js
73	%%DATADIR%%/html/assets/logo-dark.png
74	%%DATADIR%%/html/assets/logo-light.png
75	%%DATADIR%%/html/assets/poudriere.js
76	%%DATADIR%%/html/build.html
77	%%DATADIR%%/html/index.html
78	%%DATADIR%%/html/jail.html
79	%%DATADIR%%/html/robots.txt
80	%%DATADIR%%/image.sh
81	%%DATADIR%%/image_dump.sh
82	%%DATADIR%%/image_firmware.sh
83	%%DATADIR%%/image_hybridiso.sh
84	%%DATADIR%%/image_iso.sh
85	%%DATADIR%%/image_mfs.sh
86	%%DATADIR%%/image_rawdisk.sh
87	%%DATADIR%%/image_tar.sh
88	%%DATADIR%%/image_usb.sh
89	%%DATADIR%%/image_zfs.sh
90	%%DATADIR%%/image_zsnapshot.sh
91	%%DATADIR%%/include/asserts.sh
92	%%DATADIR%%/include/cache.sh
93	%%DATADIR%%/include/colors.pre.sh
94	%%DATADIR%%/include/colors.sh
95	%%DATADIR%%/include/common.sh.dragonfly
96	%%DATADIR%%/include/common.sh.freebsd
97	%%DATADIR%%/include/display.sh
98	%%DATADIR%%/include/fs.sh
99	%%DATADIR%%/include/hash.sh
100	%%DATADIR%%/include/html.sh
101	%%DATADIR%%/include/parallel.sh
102	%%DATADIR%%/include/pkg.sh
103	%%DATADIR%%/include/pkgqueue.sh
104	%%DATADIR%%/include/shared_hash.sh
105	%%DATADIR%%/include/util.sh
106	%%DATADIR%%/jail.sh
107	%%DATADIR%%/logclean.sh
108	%%DATADIR%%/options.sh
109	%%DATADIR%%/pkgclean.sh
110	%%DATADIR%%/ports.sh
111	%%DATADIR%%/processonelog.sh
112	%%DATADIR%%/queue.sh
113	%%DATADIR%%/status.sh
114	%%DATADIR%%/testport.sh
115	%%ZSH%%share/zsh/site-functions/_poudriere