From nobody Tue Apr 23 04:52:48 2024 X-Original-To: dev-commits-src-main@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 4VNqVn3Zljz5JQmG; Tue, 23 Apr 2024 04:52:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNqVn0GMPz4YTL; Tue, 23 Apr 2024 04:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847969; 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=yjq0Krc5xEW+9FE9/ms6jA5mHEw6BVzgmlUHHP0b6k8=; b=FumT0BQQftmqwVPGqx4172GYVlVkPpiYPf43XJ0ymsp7Y2QBV3haN49RF3cRab1mTpHE+e ey0JnRiJ5pcDdO8fCxh9FTkIX0IegbaMehvqLetMnRfCwRLJaMDOWdJfi9F6MTzhmHaWDk R9NNu4SMyoCJHfIi3WRF5jhe+4vNG5M7SNkRsp0FJ/5K2dlbxxQwxz+pbN9zE9udRjSlx5 +AEsry+uVPBZLR2hb99hkhsdRQgx1N3IJpJKYyb6wjwGUJuJH+alxQfd6RRGUNd+cIGBn6 eL+3tUwlm29Jj4rULwo0GsgJg/8wsn6Lwee/s+BoZbvvsvgbEavkMUNLdbliWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847969; a=rsa-sha256; cv=none; b=nvrB3CYJJG87KD6nghBTyWid+qmYQ14jpRdFASZEeIIwVPgDXW3/3ED4dCm6daDdlSY8Pe wB1R2PYLGyAR/C/LoAUErPCybwqD0EdYva4XZOo5z7o//1AI7K0vr+4/fpIXJQubE5z4cQ CBkM8SpDCEFD59ItGF2r0QHvW/cGybiQTFi2u6bXgYGduHmrQAZ1QaJAW5SSF3ZlR8vBIA KOkokZsbaVSxEudbfVcf+IY4jdRkzG+cel7NgkgZFXsWwv/q8KEthpKvIkBwJ2uLJ2s2up XmFZO6mDcfJyWYSZP/Zh1MCW8Z4mJo+ri/ce8d4TBQBQk9N3RbldJuVavqNdcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847969; 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=yjq0Krc5xEW+9FE9/ms6jA5mHEw6BVzgmlUHHP0b6k8=; b=XGx/rTRxCnND5z/frSlO0eV8lEVIBbn4DuhF2bIGuONSZJHx3BmiIsitMrNAEXdOHXhWw5 Fkhy6BTaXq1yGPlED4F5nwU697SfpTORuh4FcsrBN7ZnUn7A1E78hw//rZ9YT/SX4gtYot PVJwhUae5NqXFxYizKUzeHYPDk18eytHIvzOeKD0A/kN75xlKPzdfQ1Gd7L4XTeD7xxKHr KxU+pkXJfg2iYVpjDH2wKJrgwhrqsv8Dkvrv+5dce61MBaVfYsRI2pKdaFBKqHDY6odqdU 8uA6eGHPKyqlhmwGlKBClmOtSz8BCmdLkn1jP3v20CFhWFB/6YN33lrcsA73gw== 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 4VNqVm6z5FzJBc; Tue, 23 Apr 2024 04:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N4qmGW063913; Tue, 23 Apr 2024 04:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qmLl063910; Tue, 23 Apr 2024 04:52:48 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:48 GMT Message-Id: <202404230452.43N4qmLl063910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c3dd71ab4c1c - main - share/examples: move examples into appropriate packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3dd71ab4c1c1edac99eae505dae1d5628a03ab8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c3dd71ab4c1c1edac99eae505dae1d5628a03ab8 commit c3dd71ab4c1c1edac99eae505dae1d5628a03ab8 Author: Lexi Winter AuthorDate: 2024-04-22 22:08:22 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:35 +0000 share/examples: move examples into appropriate packages Allow a new variable SE_xxxPACKAGE to be used to place an example group into a package. Move the following examples into existing appropriate packages: - bhyve examples into FreeBSD-bhyve - bootforth examples into FreeBSD-bootloader - csh examples into FreeBSD-csh - ipfw examples into FreeBSD-ipfw - jail examples into FreeBSD-jail - pf examples into FreeBSD-pf - ppp examples into FreeBSD-ppp - printing examples into FreeBSD-lp - uefisign examples into FreeBSD-efi-tools - ypldap examples into FreeBSD-yp - hast examples into FreeBSD-hast Move all other examples into the new 'FreeBSD-examples' package. This removes a significant number of files from the FreeBSD-utilities package. Reviewed by: imp, manu Pull Request: https://github.com/freebsd/freebsd-src/pull/1176 --- release/packages/Makefile.package | 2 ++ share/examples/Makefile | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index c7d906b387fd..2c0aa259737d 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -65,6 +65,8 @@ efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities elftoolchain_COMMENT= ElfToolchain programs and libraries elftoolchain_DESC= ElfToolchain programs and libraries +examples_COMMENT= Examples in /usr/share/examples +examples_DESC= Examples in /usr/share/examples fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities diff --git a/share/examples/Makefile b/share/examples/Makefile index 504f3d7807dc..0425e36c1cf5 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -45,6 +45,7 @@ SE_BSD_DAEMON= \ .if ${MK_BHYVE} != "no" LDIRS+= bhyve SE_DIRS+= bhyve +SE_BHYVEPACKAGE=bhyve SE_BHYVE= vmrun.sh PACKAGE_bhyve/vmrun.sh= bhyve .endif @@ -57,6 +58,7 @@ SE_FREEBSD_VERSION= \ README SE_DIRS+= bootforth +SE_BOOTFORTH_PACKAGE=bootloader SE_BOOTFORTH= \ README \ boot.4th \ @@ -67,7 +69,8 @@ SE_BOOTFORTH= \ screen.4th SE_DIRS+= csh -SE_CSH= dot.cshrc +SE_CSHPACKAGE= csh +SE_CSH= dot.cshrc SE_DIRS+= drivers SE_DRIVERS= \ @@ -98,9 +101,11 @@ SUBDIR+= ipfilter .endif SE_DIRS+= ipfw +SE_IPFWPACKAGE= ipfw SE_IPFW= change_rules.sh SE_DIRS+= jails +SE_JAILPACKAGE= jail SE_JAILS= \ README \ VIMAGE \ @@ -203,6 +208,7 @@ SE_PERFMON= \ .if ${MK_PF} != "no" SE_DIRS+= pf .if ${MK_STAGING} == "no" +SE_PFPACKAGE= pf SE_PF= \ ackpri \ faq-example1 \ @@ -223,6 +229,7 @@ SE_PPI= \ ppilcd.c SE_DIRS+= ppp +SE_PPPPACKAGE= ppp SE_PPP= \ chap-auth \ login-auth \ @@ -240,6 +247,7 @@ SE_PPP= \ ppp.secret.span-isp.working SE_DIRS+= printing +SE_PRINTINGPACKAGE=lp SE_PRINTING= \ diablo-if-net \ hpdf \ @@ -342,13 +350,16 @@ SE_SUNRPC_SORT= \ LDIRS+= uefisign SE_DIRS+= uefisign SE_UEFISIGN= uefikeys +SE_UEFISIGNPACKAGE=efi-tools .endif SE_DIRS+= ypldap SE_YPLDAP= ypldap.conf +SE_YPLDAPPACKAGE=yp .if ${MK_HAST} != "no" LDIRS+= hast +SE_HASTPACKAGE= hast SE_DIRS+= hast SE_HAST= ucarp.sh \ ucarp_down.sh \ @@ -379,6 +390,11 @@ SER_${d:tu:C/\//_/g}+= ${d}/${f} .endfor FILESGROUPS+= SER_${d:tu:C/\//_/g} SER_${d:tu:C/\//_/g}DIR+= ${SHAREDIR}/examples/${d} +.if ${SE_${d:tu:C/\//_/g}PACKAGE:U} != "" +SER_${d:tu:C/\//_/g}PACKAGE= ${SE_${d:tu:C/\//_/g}PACKAGE} +.else +SER_${d:tu:C/\//_/g}PACKAGE= examples +.endif .endfor BINDIR= ${SHAREDIR}/examples