From nobody Thu Dec 05 13:05:50 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 4Y3vlM03mLz5gTTY; Thu, 05 Dec 2024 13:05:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3vlL6NDjz4w9W; Thu, 5 Dec 2024 13:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733403950; 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=Ww4Jua8+7Sh862fGTSsC2PLSnvRYQEJAfyG5HvkeP5M=; b=R9zeVBhKIAZLgxIbYeeAlFu6QP0yTb24wL7a0klLvRe9eOfP7KmaBUMh8f5S+27Z1f7zhI DgEogrbJbUwWwtj1x96yFsTdIpRj/db36fRD838FzzeRwX1xxaVVRivumCOan4NtiESGHL 3jhUpOlTYmjutOmULmRFvzidUzh0mdL/O14MJ1KYIG+mdUQSH4PqgkwXutw/EmC+OIqQ5+ o+QXZGetKkDxZYhCJ8xDrI63IS/G6kqFTVJlTCLW/LXdi8iuXswsoY1GUdp9shySeWNbSE JehJTiHA+XObydbS3mrjNZJ3oW/obxi+j8Ik9dDuypLPd9Ol21UviZueDI5AAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733403950; 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=Ww4Jua8+7Sh862fGTSsC2PLSnvRYQEJAfyG5HvkeP5M=; b=DTKX+xEDRuueEbmt4adXzp/3L1GEH6U4sijQcsDB4X2/k663Bpas+tpLqbWiH5xtoZ6rCj cUbYXqBbc6TEV92ebBxhpMS1mHRQEkp0IIzAwjMW528FR9PPmcCL6BKyHR2hwug1cXasZm c/bOx2kFUUTcmPWKrNjXRgXj1TfGBxIHQ/7aQZ3jC0tmwMAh+7nDxc11gVgIPtCmJW5C4l 2l+lLwGwe2Ph+Puk2kEtQ0tsIPGrn1DgxEjsmUpPmKoLrBjV9FpRLCtRVBAzgY8xgJKx48 igmrp3lRLhzz5dktJDNXS7tOgW73+0QOXWaVzEFT6MRu8ePXKK05yHll/MU5Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733403950; a=rsa-sha256; cv=none; b=uY9y2RIwyLIldxz5WJ/mfzZx6U3XgIFEqcAXGctUjDB6Zdwtmbaq6y62QIzgUjygL6/LLp FLikASuGHB07vNIXdm+Ho572Ry6pSC3av9gIIteAnOcGhYB4WUQMoEDV6V1QTtGj1qd5Qm jfjMAEm6Wlq5VfGR6YikqYUjbvg7ZKwfE3PDh49jiDCAIByCbl2UwDPbSgvZ5QgKVaIfCt gtErgjZFwkP55nc/V9BvwuiUb5e+8RnFUfKLiw7kkcvSMaLy83OAhFQnGa7ir0wZ/Y4/VN JBpN+Wzga/qRZFUgQ3Z8lNXJyR7ioAWkQFepo53ldsZ8vM9PYH/f6wNTO0Fdmg== 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 4Y3vlL4r9jzt0L; Thu, 5 Dec 2024 13:05:50 +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 4B5D5on5044071; Thu, 5 Dec 2024 13:05:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B5D5okq044068; Thu, 5 Dec 2024 13:05:50 GMT (envelope-from git) Date: Thu, 5 Dec 2024 13:05:50 GMT Message-Id: <202412051305.4B5D5okq044068@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: b2a70d3a470f - main - sysutils/containers-common: simplify, add visibility 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2a70d3a470fb45a1faff2ef54555c339614c993 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2a70d3a470fb45a1faff2ef54555c339614c993 commit b2a70d3a470fb45a1faff2ef54555c339614c993 Author: Sergey A. Osokin AuthorDate: 2024-12-05 13:03:47 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-05 13:03:47 +0000 sysutils/containers-common: simplify, add visibility Remove needless *SRC definitions because those are already defined as WRKSRC_.... There's no functional changes, so do not bump PORTREVISION. Approved by: Differential Revision: --- sysutils/containers-common/Makefile | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/sysutils/containers-common/Makefile b/sysutils/containers-common/Makefile index 7ba93de7c144..2dc41b1456c5 100644 --- a/sysutils/containers-common/Makefile +++ b/sysutils/containers-common/Makefile @@ -28,28 +28,27 @@ IMAGEVERSION= 5.32.2 STORAGEVERSION= 1.55.1 SKOPEOVERSION= 1.16.1 -WRKSRC= ${WRKDIR}/common-${DISTVERSION} -IMAGESRC= ${WRKDIR}/image-${IMAGEVERSION} -STORAGESRC= ${WRKDIR}/storage-${STORAGEVERSION} -SKOPEOSRC= ${WRKDIR}/skopeo-${SKOPEOVERSION} - do-build: - ${GMAKE} -C ${WRKSRC}/docs - ${GMAKE} -C ${STORAGESRC} install.tools + ${GMAKE} -C ${WRKSRC_common}/docs + ${GMAKE} -C ${WRKSRC_storage} install.tools do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/certs.d ${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/hooks.d ${MKDIR} ${STAGEDIR}${PREFIX}/etc/containers/registries.d - ${INSTALL_DATA} ${SKOPEOSRC}/default-policy.json ${STAGEDIR}${PREFIX}/etc/containers/policy.json.sample + ${INSTALL_DATA} ${WRKSRC_skopeo}/default-policy.json \ + ${STAGEDIR}${PREFIX}/etc/containers/policy.json.sample # Temporary until https://github.com/containers/common/pull/1199 propagates to podman and buildah - ${INSTALL_DATA} ${PATCHDIR}/containers.conf ${STAGEDIR}${PREFIX}/etc/containers/containers.conf.sample -#${INSTALL_DATA} ${WRKSRC}/pkg/config/containers.conf-freebsd ${STAGEDIR}${PREFIX}/etc/containers/containers.conf.sample - ${INSTALL_DATA} ${STORAGESRC}/storage.conf-freebsd ${STAGEDIR}${PREFIX}/etc/containers/storage.conf.sample - ${INSTALL_DATA} ${IMAGESRC}/registries.conf ${STAGEDIR}${PREFIX}/etc/containers/registries.conf.sample - ${GMAKE} -C ${WRKSRC}/docs DESTDIR=${STAGEDIR} install - ${GMAKE} -C ${IMAGESRC} PREFIX=${STAGEDIR}${PREFIX} install-docs - ${GMAKE} -C ${STORAGESRC}/docs GOMD2MAN=${LOCALBASE}/bin/go-md2man containers-storage.conf.5 - ${INSTALL_MAN} ${STORAGESRC}/docs/containers-storage.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5 + ${INSTALL_DATA} ${PATCHDIR}/containers.conf \ + ${STAGEDIR}${PREFIX}/etc/containers/containers.conf.sample + ${INSTALL_DATA} ${WRKSRC_storage}/storage.conf-freebsd \ + ${STAGEDIR}${PREFIX}/etc/containers/storage.conf.sample + ${INSTALL_DATA} ${WRKSRC_image}/registries.conf \ + ${STAGEDIR}${PREFIX}/etc/containers/registries.conf.sample + ${GMAKE} -C ${WRKSRC_common}/docs DESTDIR=${STAGEDIR} install + ${GMAKE} -C ${WRKSRC_image} PREFIX=${STAGEDIR}${PREFIX} install-docs + ${GMAKE} -C ${WRKSRC_storage}/docs GOMD2MAN=${LOCALBASE}/bin/go-md2man \ + containers-storage.conf.5 + ${INSTALL_MAN} ${WRKSRC_storage}/docs/containers-storage.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5 .include