From nobody Mon Oct 21 17:54:39 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XXNHM284Qz5ZZLx; Mon, 21 Oct 2024 17:54:39 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXNHM1TWWz473C; Mon, 21 Oct 2024 17:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729533279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o03m1nSUcBH9gG2iNEw8YUKjsrpNEA3YMyKbLwQh3QM=; b=bguRMEYcRmaY3lzYdScMJAcDXmFXXot2hhJjyV+qyY9qWNmIx+4gwgkZCR+nJJxrLRMofY GKcNkUva+gAGzm4lSvDszLhRRsEneeAqLnGy3h7VwpzMnzKln/bKlnlqb0PKQJCfAaCtBK hYKx2wwEhAw7jFgkB6JayVxsvp1MkRM4YaP7Ev6X+7ACAMysUjVxAU/i6Lzx2cvIFnB0Ej onB8A7fw/LE53Z0MO2za5/4BnW9LbHWVvNBbNSlcegKyRDH8mAurF870GRzg7766n3HHgH qPZ+sBPet0WbbowPRlrei7wKoo0JOiP8BTbVoX9U/ApAq7Q+JWAKl5GQAlT8mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729533279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o03m1nSUcBH9gG2iNEw8YUKjsrpNEA3YMyKbLwQh3QM=; b=PrLr6do+WPr8rmFS7tiTaqvK77jcex8LC03rO1rwGpqCPQFb8LV/70c9jCPnx4V7UMg+mw CBDmuEWWb9jouXQ6yisTgZt/MNHEFdS4Ryph+LlTYSNDbi2fONN+4PO7Tmv1X/yGK9ltX6 HUDPK25wQYZ9mBz2T6wcaqMvlv1IJyw4+aeuvYI1K7p+6z6+pAtYZxap7PT6yi8Bf/UGc/ DewslyeDw7WrQbWOgSTH38KyUlI6wrox5UBRovPbNjFZK16hjA652KAUGDIG2ObKOt4m1k U/Cjmj9gZeRDXrh0YotIj+pUOo1IG6iMzx1pjcAT/jIUDFYnsSEHNY1y7EkrHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729533279; a=rsa-sha256; cv=none; b=J1hf250e+kFrFNNnDrD+OXzfduMQ9aMT8m3gx3ht4uoSV2FhosjPWy58/E30Pz/pndp0ua KRZYGqjqReEKFADBskEfGJUkut5sus1ZpqhvlvX94MnbA/9cEcY/wg3hF34vu5OY9SesAb Iju8MSWIYDJgWQ82ZjVsK4Tao4VZpdEIpUx1U1Utg03pqUTUmAbrb7lCt4MTaTg33Xnrut dpeDATLSCB9fIbJsfKnARI8zKZv5ghLGeDKpv1W8OvDMgD3UKnAPRkfqfki6EY0tTdUgt1 PqC+yexBRbjcTfJeSGQx98hAWJls3ixbFYKMUazEmYhjBCsvOsMKLqZww6ZALg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XXNHM14jWzgWR; Mon, 21 Oct 2024 17:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LHsdOa059994; Mon, 21 Oct 2024 17:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LHsdio059991; Mon, 21 Oct 2024 17:54:39 GMT (envelope-from git) Date: Mon, 21 Oct 2024 17:54:39 GMT Message-Id: <202410211754.49LHsdio059991@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 2b48bc59c42b - main - ports-mgmt/poudriere-dsh2dsh: added fork of poudriere 3.4.99.20240812 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b48bc59c42b252ac5fd76db33e04e9a230fcb37 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b48bc59c42b252ac5fd76db33e04e9a230fcb37 commit 2b48bc59c42b252ac5fd76db33e04e9a230fcb37 Author: Denis Shaposhnikov AuthorDate: 2024-10-21 17:52:08 +0000 Commit: Matthias Fechner CommitDate: 2024-10-21 17:53:57 +0000 ports-mgmt/poudriere-dsh2dsh: added fork of poudriere 3.4.99.20240812 Changes from upstream: * Better reuse of prebuilded FreeBSD packages. * Speedup building by rebuilding only changed ports. * Share go mod cache between builders and store downloaded modules in `DISTFILES_CACHE`. https://github.com/dsh2dsh/poudriere PR: 282248 --- ports-mgmt/Makefile | 1 + ports-mgmt/poudriere-dsh2dsh/Makefile | 88 +++++++++++++++++++++++++ ports-mgmt/poudriere-dsh2dsh/distinfo | 3 + ports-mgmt/poudriere-dsh2dsh/pkg-descr | 9 +++ ports-mgmt/poudriere-dsh2dsh/pkg-plist | 115 +++++++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+) diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile index 016706fcc9e6..a28c7229e54a 100644 --- a/ports-mgmt/Makefile +++ b/ports-mgmt/Makefile @@ -70,6 +70,7 @@ SUBDIR += portupgrade-devel SUBDIR += poudriere SUBDIR += poudriere-devel + SUBDIR += poudriere-dsh2dsh SUBDIR += psearch SUBDIR += py-FreeBSD-ports SUBDIR += py-pnu-portstreelint diff --git a/ports-mgmt/poudriere-dsh2dsh/Makefile b/ports-mgmt/poudriere-dsh2dsh/Makefile new file mode 100644 index 000000000000..8d4f06d12602 --- /dev/null +++ b/ports-mgmt/poudriere-dsh2dsh/Makefile @@ -0,0 +1,88 @@ +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 + +# 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 diff --git a/ports-mgmt/poudriere-dsh2dsh/distinfo b/ports-mgmt/poudriere-dsh2dsh/distinfo new file mode 100644 index 000000000000..2cbc142e4c21 --- /dev/null +++ b/ports-mgmt/poudriere-dsh2dsh/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1723471537 +SHA256 (dsh2dsh-poudriere-3.4.99.20240812-c984ecd_GH0.tar.gz) = 423ff3eaa91e7dfa91a19818456c82323d78233c589f9b206e5f30d5a77a8d76 +SIZE (dsh2dsh-poudriere-3.4.99.20240812-c984ecd_GH0.tar.gz) = 5745709 diff --git a/ports-mgmt/poudriere-dsh2dsh/pkg-descr b/ports-mgmt/poudriere-dsh2dsh/pkg-descr new file mode 100644 index 000000000000..447ee25fcb16 --- /dev/null +++ b/ports-mgmt/poudriere-dsh2dsh/pkg-descr @@ -0,0 +1,9 @@ +poudriere is a tool primarily designed to test package production on FreeBSD. +However, most people will find it useful to bulk build ports for FreeBSD. + +Changes from upstream: + + * Better reuse of prebuilded FreeBSD packages. + * Speedup building by rebuilding only changed ports. + * Share go mod cache between builders and store downloaded modules in + `DISTFILES_CACHE`. diff --git a/ports-mgmt/poudriere-dsh2dsh/pkg-plist b/ports-mgmt/poudriere-dsh2dsh/pkg-plist new file mode 100644 index 000000000000..50311b55a168 --- /dev/null +++ b/ports-mgmt/poudriere-dsh2dsh/pkg-plist @@ -0,0 +1,115 @@ +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