git: d8fe9fc368a6 - stable/14 - Remove `/usr/share/examples/oci` when MK_EXAMPLES == no

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Fri, 12 Jun 2026 18:12:33 UTC

The branch stable/14 has been updated by ngie:

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

commit d8fe9fc368a6c85e9841c5c1e690f3ca1c71c539
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:12:19 +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 47a5a402e267..ed8a3941caa9 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1878,6 +1878,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