Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Jun 2026 18:11:12 +0000
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: baee4396c7b7 - stable/15 - Remove `/usr/share/examples/oci` when MK_EXAMPLES == no
Message-ID:  <6a2c4bc0.434fa.2573a03d@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=baee4396c7b7cd262d05a1b8b027ff23c806f809

commit baee4396c7b7cd262d05a1b8b027ff23c806f809
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-04-22 20:51:48 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-06-12 18:10:11 +0000

    Remove `/usr/share/examples/oci` when MK_EXAMPLES == no
    
    MFC after:      1 week
    Fixes:          d03c82c28da86 ("release: add optional OCI images")
    
    (cherry picked from commit ab53a4e9b95de1f6f58a8316b4c4eccf0b1760a2)
---
 tools/build/mk/OptionalObsoleteFiles.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 4a808498ff5f..f720b558e0e1 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1873,6 +1873,8 @@ OLD_FILES+=usr/share/examples/netgraph/raw
 OLD_FILES+=usr/share/examples/netgraph/udp.tunnel
 OLD_FILES+=usr/share/examples/netgraph/virtual.chain
 OLD_FILES+=usr/share/examples/netgraph/virtual.lan
+OLD_FILES+=usr/share/examples/oci/Containerfile.pkg
+OLD_FILES+=usr/share/examples/oci/README
 OLD_FILES+=usr/share/examples/perfmon/Makefile
 OLD_FILES+=usr/share/examples/perfmon/README
 OLD_FILES+=usr/share/examples/perfmon/perfmon.c
@@ -2037,6 +2039,7 @@ OLD_DIRS+=usr/share/examples/libusb20
 OLD_DIRS+=usr/share/examples/libvgl
 OLD_DIRS+=usr/share/examples/mdoc
 OLD_DIRS+=usr/share/examples/netgraph
+OLD_DIRS+=usr/share/examples/oci
 OLD_DIRS+=usr/share/examples/perfmon
 OLD_DIRS+=usr/share/examples/pf
 OLD_DIRS+=usr/share/examples/ppi


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a2c4bc0.434fa.2573a03d>