Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make usr/share/examples more packagey #1176

Closed
wants to merge 1 commit into from

Conversation

llfw
Copy link
Contributor

@llfw llfw commented Apr 16, 2024

3 commits here: 1 adds the Makefile soup to allow examples to live in packages, and two commits move the pf and HAST examples to their proper home.

i can do more commits for the rest of the examples, but i wanted to check the basic idea is sound first.

cc: @evadot, @bapt, @igalic

Copy link
Contributor

@igalic igalic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all happening in the same file, so i don't think it's necessary to split anything.
Just do them all in one go. (and i mean all, not just three three)

@llfw
Copy link
Contributor Author

llfw commented Apr 17, 2024

i'm happy to squash them but i prefer not to do this initially because it makes it difficult to merge into my local branch (which i run in production).

if this passes review / is okay to commit i can squash it, just lmk.

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.
@llfw llfw force-pushed the lf/pkgbase-share-examples branch from ad846c7 to 8402a0f Compare April 18, 2024 14:23
@llfw
Copy link
Contributor Author

llfw commented Apr 18, 2024

  • moved the remaining examples
  • examples without an existing more appropriate package are now in 'FreeBSD-examples'
  • squashed into a single commit

#1171 should be merged before this because it creates the new 'lp' package. edit: done

@bsdimp
Copy link
Member

bsdimp commented Apr 20, 2024

@bapt, @evadot please review...

@bsdimp bsdimp self-assigned this Apr 20, 2024
@evadot
Copy link
Contributor

evadot commented Apr 20, 2024

I think it's good. We will have the examples in the right package and if no matching package is present it will be in the FreeBSD-examples packages.
People can still remove all example by adding WITHOUT_EXAMPLES so it's fine.

@igalic
Copy link
Contributor

igalic commented Apr 21, 2024

I think it's good. We will have the examples in the right package and if no matching package is present it will be in the FreeBSD-examples packages. People can still remove all example by adding WITHOUT_EXAMPLES so it's fine.

i think this means: "i approve".

@bsdimp bsdimp added ready and removed needs-review labels Apr 21, 2024
@bsdimp
Copy link
Member

bsdimp commented Apr 21, 2024

Looks good... Last call...

freebsd-git pushed a commit that referenced this pull request Apr 23, 2024
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: #1176
@bsdimp
Copy link
Member

bsdimp commented Apr 23, 2024

merged

@bsdimp bsdimp closed this Apr 23, 2024
@bsdimp bsdimp added merged and removed ready labels Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants