Details

Reviewers

kevans
markj

Group Reviewers

pkgbase

Commits

rG099bd9e6ab8f: pkgbase: rework certctl package to only run rehash on the main package
rGf8e46fd61e05: pkgbase: rework certctl package to only run rehash on the main package

Summary

Rework how ucl manifest are generated leveraging ucl features and flua

now the ucl generation is done via a lua script which uses libucl to
ingest the template and use variables as defined in its command line.

the template will include only if it exist a ucl file named after the
package name which will complement the template or overwrite what was
defined in the template if defined in this specific ucl file

this allows to overwrite license, but add script only to the packages
who actually needs them.

As a results the post install scripts are now only added to the right
package and not also added to the subpackages like -man or -dev

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 56662
Build 53550: arc lint + arc unit

Event Timeline

bapt created this revision.Mar 15 2024, 5:03 PM

Herald added subscribers: jrtc27, imp. · View Herald TranscriptMar 15 2024, 5:03 PM

bapt requested review of this revision.Mar 15 2024, 5:03 PM

Harbormaster completed remote builds in B56626: Diff 135786.Mar 15 2024, 5:04 PM

bapt added reviewers: pkgbase, kevans, markj.Mar 15 2024, 5:05 PM

Add kernel and source packages

Herald added a subscriber: emaste. · View Herald TranscriptMar 15 2024, 5:35 PM

Harbormaster completed remote builds in B56627: Diff 135792.Mar 15 2024, 5:35 PM

typo

Harbormaster completed remote builds in B56628: Diff 135793.Mar 15 2024, 5:37 PM

emaste added inline comments.Mar 17 2024, 1:38 PM

release/packages/binutils.ucl
1–17	This file is unused after all binutils removed from the base system - I deleted now in 1e4cd5ed54d73dcb8e9af92990e7bf005b9a5710
release/packages/generate-ucl.lua
7	This script is sort of internal use only so doesn't warrant a man page but some comment in here about usage would be good - indicate that args are variable value pairs
release/packages/generate-ucl.sh
33–34	is this a separate change that can be handled first?
release/packages/runtime.ucl
13	extra blank line?

Overall I like it, but maybe we need a way to define keys for all flavors of a package. See my inline comment about ssh.

As emaste pointed out, the removal of vital seems unrelated and should go into a separate patch.

Makefile.inc1
2112	Indentation is wrong here.
2121	Indentation is wrong here.
release/packages/generate-ucl.lua
6	You also want to check `#arg >= 2` I think.
7
12
15
release/packages/ssh.ucl
0	Just picking an example - doesn't this mean that the `FreeBSD-ssh-man` package will be installed with `licenses = [BSD2CLAUSE]` instead of ISCL? Presumably that's not what we want. Or, at least we may want some way to specify keys for all flavors of a package without having to create ssh-man.ucl etc..

Address all comments

Harbormaster completed remote builds in B56662: Diff 135861.Mar 18 2024, 9:07 AM

fix indentation

Harbormaster completed remote builds in B56663: Diff 135862.Mar 18 2024, 9:08 AM

bapt marked 8 inline comments as done.Mar 18 2024, 9:09 AM

bapt added inline comments.

release/packages/generate-ucl.sh
33–34	actually no, the vital flag is supposed to be appended directly the to right ucl files, so there was a mistake, which is now fixed

markj accepted this revision.Mar 19 2024, 6:40 AM

markj added inline comments.

release/packages/generate-ucl.sh
158	Leftover debugging.
release/packages/template.ucl
18	IMO it is a bit weird to hard-code the path `release/packages` here.

This revision is now accepted and ready to land.Mar 19 2024, 6:40 AM

address @marjk last comments

This revision now requires review to proceed.Mar 19 2024, 6:50 AM

bapt marked 2 inline comments as done.Mar 19 2024, 6:51 AM

Harbormaster completed remote builds in B56690: Diff 135930.Mar 19 2024, 6:51 AM

Please let me know if you'd like some testing.

This revision is now accepted and ready to land.Mar 19 2024, 6:52 AM

Closed by commit rGf8e46fd61e05: pkgbase: rework certctl package to only run rehash on the main package (authored by bapt). · Explain WhyMar 19 2024, 7:00 AM

This revision was automatically updated to reflect the committed changes.

bapt added a commit: rGf8e46fd61e05: pkgbase: rework certctl package to only run rehash on the main package.

markj added inline comments.Mar 19 2024, 7:04 AM

release/packages/generate-ucl.lua
2	Sorry - I only just thought of this: won't this break `make packages` on non-FreeBSD build hosts? Do we expect that to work? Should we use a bootstrapped flua executable?

bapt added a commit: rG099bd9e6ab8f: pkgbase: rework certctl package to only run rehash on the main package.Mar 27 2024, 8:37 AM

pkgbase: rework certctl package to only run rehash on the main package
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 135861

Makefile.inc1

release/packages/binutils.ucl

release/packages/certctl.ucl

release/packages/clang-all.ucl

release/packages/clang.ucl

release/packages/clibs.ucl

release/packages/dtb.ucl

release/packages/generate-ucl.lua

release/packages/generate-ucl.sh

release/packages/jail.ucl

release/packages/kernel.ucl

release/packages/lld-all.ucl

release/packages/lld.ucl

release/packages/lldb-all.ucl

release/packages/lldb.ucl

release/packages/runtime.ucl

release/packages/src-sys.ucl

release/packages/src.ucl

release/packages/ssh-all.ucl

release/packages/ssh.ucl

release/packages/template.ucl

release/packages/unbound-all.ucl

release/packages/unbound.ucl

release/packages/utilities.ucl

pkgbase: rework certctl package to only run rehash on the main packageClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 135861

Makefile.inc1

release/packages/binutils.ucl

release/packages/certctl.ucl

release/packages/clang-all.ucl

release/packages/clang.ucl

release/packages/clibs.ucl

release/packages/dtb.ucl

release/packages/generate-ucl.lua

release/packages/generate-ucl.sh

release/packages/jail.ucl

release/packages/kernel.ucl

release/packages/lld-all.ucl

release/packages/lld.ucl

release/packages/lldb-all.ucl

release/packages/lldb.ucl

release/packages/runtime.ucl

release/packages/src-sys.ucl

release/packages/src.ucl

release/packages/ssh-all.ucl

release/packages/ssh.ucl

release/packages/template.ucl

release/packages/unbound-all.ucl

release/packages/unbound.ucl

release/packages/utilities.ucl

pkgbase: rework certctl package to only run rehash on the main package
ClosedPublic
Actions

Revision Contents
Changeset List