Page MenuHomeFreeBSD
Differential D50289

build.7: Improve building pkgbase
AcceptedPublic
Actions

Authored by ziaee on May 10 2025, 9:33 PM.
Tags
Referenced Files
F126387369: D50289.id155464.diff
Mon, Aug 18, 6:44 PM
F126374004: D50289.id155473.diff
Mon, Aug 18, 2:49 PM
F126364895: D50289.id155486.diff
Mon, Aug 18, 12:45 PM
Unknown Object (File)
Sun, Aug 17, 12:28 AM
Unknown Object (File)
Sat, Aug 16, 8:11 PM
Unknown Object (File)
Sat, Aug 16, 12:55 PM
Unknown Object (File)
Fri, Aug 15, 7:43 PM
Unknown Object (File)
Fri, Aug 15, 1:17 PM
View All 93 Files
Subscribers
dch
des
emaste
imp
manu

Details

Reviewers
mhorne
carlavilla
ivy
markj
0mp
Group Reviewers
pkgbase
manpages
Summary

The packages target was previously listed under kernel, move it to the
general source make targets listing. Add the currently undocumented update-packages target as
well.

Fixes: 1d26746cfd4a(build.7: Document the packages target)
Fixes: 0ac8aa55da1c(pkgbase: Add incremental packages)
Fixes: 26490d9b74f0(pkgbase: allow update-packages for first)
Reported by: ivy (update-packages)

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 64190
Build 61074: arc lint + arc unit

Event Timeline

ziaee created this revision.May 10 2025, 9:33 PM
Herald added a subscriber: imp. · View Herald TranscriptMay 10 2025, 9:33 PM
ziaee requested review of this revision.May 10 2025, 9:33 PM
Harbormaster completed remote builds in B64069: Diff 155267.May 10 2025, 9:33 PM
markj added inline comments.May 11 2025, 4:05 PM
share/man/man7/build.7
376

I think this could use more detail -- what's the difference between updating packages and creating a new repo?

emaste added subscribers: manu, emaste.May 11 2025, 4:13 PM
emaste added inline comments.
share/man/man7/build.7
376

It was added in 0ac8aa55da1cb5e53a9102fd007dd01ee6d17894 by @manu. The commit message has a description of what it does.

ziaee added inline comments.May 11 2025, 5:09 PM
share/man/man7/build.7
376

I think this could use more detail

I couldn't agree more, but I'm at a point where I can't figure out how to use this stuff to prod at how it works and make it perfect, so I think the answer is to get stub documentation in and iterate on it.

We're all in on pkgbase, cool, let's get some stub information that is at least correct in the tree where it's discoverable.

We're telling people to use this stuff, and that we're deprecating the old stuff, but it's not in the manual.

ziaee added inline comments.May 11 2025, 5:13 PM
share/man/man7/build.7
267

This is a move error, I will fix this when I get home.

ziaee planned changes to this revision.May 11 2025, 5:31 PM

I also intend to change this to "Update the pkg(7) repository created by the *packages* target".

ziaee updated this revision to Diff 155299.May 11 2025, 7:11 PM

address issues i mentioned previously

Harbormaster completed remote builds in B64089: Diff 155299.May 11 2025, 7:11 PM
ziaee marked 2 inline comments as done.May 11 2025, 7:13 PM
markj added inline comments.May 11 2025, 7:19 PM
share/man/man7/build.7
376

In the spirit of "iterating on it," Ed linked the commit which added this target and explains how it works--is that enough to experiment and start fleshing this out? If update-packages is not behaving the way you expect, then can you please explain here what's going wrong?

ziaee added a comment.May 11 2025, 7:34 PM

I did see that commit already when I was preparing this sir. My make packages fails on e6000sw not found. I do have a /etc/src.conf at https://people.freebsd.org/~ziaee/tmp/src.conf .

ziaee edited the summary of this revision. (Show Details)May 11 2025, 7:45 PM
ziaee updated this revision to Diff 155301.May 11 2025, 7:59 PM

Apparently update-packages also can create the initial repo.
This is confusing and we should simplify this.

Harbormaster completed remote builds in B64091: Diff 155301.May 11 2025, 7:59 PM
ziaee edited the summary of this revision. (Show Details)May 11 2025, 8:01 PM
ziaee edited the summary of this revision. (Show Details)
ziaee edited the summary of this revision. (Show Details)May 11 2025, 8:16 PM
ivy added a comment.May 14 2025, 3:27 PM

can we just have a single target (for example, make packages) which either creates or updates the repository? if necessary there could also be a make clean-packages target but i'm not sure this is needed, you can just delete the repository if you want that.

i understand make update-packages added different functionality when it was first added but i'm not sure this is really useful long term and it is confusing.

ivy requested changes to this revision.May 14 2025, 5:26 PM

as discussed on IRC, if you want to document the current situation, i agree with @markj that the section on update-packages needs more detail, specifically about how it only adds changed packages to the new repository.

This revision now requires changes to proceed.May 14 2025, 5:26 PM
emaste added a comment.May 14 2025, 5:32 PM

It's unfortunate that the existing package targets (e.g. packageworld) are not related to pkgbase. It's probably worth pointing this out explicitly. Maybe something like "This target is used while building a release (and is not related to packaged base)"

ziaee updated this revision to Diff 155459.May 14 2025, 5:59 PM

address reviewer feedback, thanks! I would have done this previously
but I did not know that.

Harbormaster completed remote builds in B64180: Diff 155459.May 14 2025, 6:00 PM
ivy added inline comments.May 14 2025, 6:11 PM
share/man/man7/build.7
273

mention ${REPODIR}, set in src-env.conf, it is the path to the base directory under which each repository will be created, e.g.:

% grep REPODIR /etc/src-env.conf 
REPODIR=/home/ivy/packages/base
% ls /home/ivy/packages/base
FreeBSD:15:amd64/
379
380

reword as appropriate, but i think this is the pertinent information

ziaee added a comment.EditedMay 14 2025, 6:15 PM

make packages is incompatible with PORTS_MODULES, what is the replacement workflow? documented in https://reviews.freebsd.org/D50355

ziaee updated this revision to Diff 155464.May 14 2025, 7:03 PM
ziaee marked an inline comment as done.

Incorperate ivys suggestions. Thank you so much.

Harbormaster completed remote builds in B64184: Diff 155464.May 14 2025, 7:03 PM
ivy added inline comments.May 14 2025, 8:10 PM
share/man/man7/build.7
282

the ABI dir is appended to REPODIR, so this should probably just be /usr/obj/${SRCDIR}/repo

ziaee updated this revision to Diff 155470.May 14 2025, 8:36 PM

Fix nice catch by ivy

Harbormaster completed remote builds in B64186: Diff 155470.May 14 2025, 8:36 PM
ziaee updated this revision to Diff 155471.May 14 2025, 8:47 PM

Add REPODIR to ENVIRONMENT

Harbormaster completed remote builds in B64187: Diff 155471.May 14 2025, 8:48 PM
ziaee updated this revision to Diff 155472.May 14 2025, 8:56 PM

Switch repodir and pkgabi

Harbormaster completed remote builds in B64188: Diff 155472.May 14 2025, 8:56 PM
ziaee updated this revision to Diff 155473.May 14 2025, 8:59 PM

typo

Harbormaster completed remote builds in B64189: Diff 155473.May 14 2025, 8:59 PM
ivy accepted this revision.May 14 2025, 9:03 PM
This revision is now accepted and ready to land.May 14 2025, 9:03 PM
ziaee updated this revision to Diff 155486.May 15 2025, 12:24 AM

Does this fix it?
Also included, try to improve the release targets unrelated to pkgbase.

This revision now requires review to proceed.May 15 2025, 12:24 AM
Harbormaster completed remote builds in B64190: Diff 155486.May 15 2025, 12:24 AM
dch added a subscriber: dch.Jun 8 2025, 5:33 PM
ziaee added a reviewer: 0mp.Jun 11 2025, 4:29 PM
ziaee added a project: pkgbase.Wed, Aug 6, 5:27 PM
markj added a comment.Thu, Aug 7, 2:59 PM

Thank you, this version is more useful.

share/man/man7/build.7
281

REPODIR's default value is /${OBJDIR}/${SRCDIR}/repo. It'd be useful to mention that.

ziaee updated this revision to Diff 159972.Thu, Aug 7, 4:29 PM
ziaee marked an inline comment as done.

Thanks Mark, that's really great info!
I added that to the REPODIR description in ENVIRONMENT.

Harbormaster completed remote builds in B66066: Diff 159972.Thu, Aug 7, 4:30 PM
markj accepted this revision.Fri, Aug 8, 1:24 PM
This revision is now accepted and ready to land.Fri, Aug 8, 1:24 PM
des added a subscriber: des.Fri, Aug 8, 7:29 PM
des added inline comments.
share/man/man7/build.7
292

“...unrelated to packaged base” or something like that; either way, “packages” should not be marked up since you are not directly referencing the target.

440

“...unrelated to packaged base” or something like that; either way, “packages” should not be marked up since you are not directly referencing the target.

717

“packages” should not be marked up since you are not directly referencing the target.

719

I suggest you explain OBJROOT in a separate entry.

Revision Contents
Changeset List

PathSize
share/
man/
man7/
62 lines

Diff 155486

View Options

share/man/man7/build.7

Loading...