Commit graph

101 commits

Author SHA1 Message Date
Franco Fichtner
6ff9fadc5d composite/custom: extra argument default was wrong 2026-04-22 15:51:02 +02:00
Franco Fichtner
b3c29c7f0d composite: move "factory" target to custom script
It's mostly the same and the indirection through custom
is annoying to work with.  Since it is just a helper for
the VM image type don't document it further.
2026-04-22 14:21:49 +02:00
Franco Fichtner
bf85679027 composite: support more flexibility in custom/factory builds 2026-04-21 16:52:48 +02:00
Franco Fichtner
c497d92fe7 composite/factory: remove test invoke 2026-03-23 12:11:22 +01:00
Franco Fichtner
ec405754d9 build: better PRODUCT_ZFS handling
Only VM images really handle ZFS.  While here move the handling
to the core repository so rc.loader knows what to do.

We only need a 10 second boot relay on installer vga/serial/dvd/nano.

Also go back to setting the pool name using PRODUCT_ZFS which is
now safeguarded through ALLOWED/REQUESTED.
2026-03-23 11:53:19 +01:00
Franco Fichtner
19201739cd composite: allow chaning factory image through custom image 2026-03-20 15:15:40 +01:00
Franco Fichtner
defbe6c733 composite/nightly: treat upload.log as a nightly step for "watch" use 2026-02-04 09:16:32 +01:00
Franco Fichtner
a77e999b8a composite/watch: peek into latest as well 2026-02-04 08:51:35 +01:00
Franco Fichtner
f8251597c9 build: add REMOTEDIR Makefile support again, fix nightly side effect
Also renames PRODUCT_SERVER to shorter SERVER because it's not really
part of the product.  ;)

Allow the REMOTEDIR to be empty so we can automatically select a matching
directory in download/upload cases.
2025-12-12 09:06:24 +01:00
Franco Fichtner
c83a3f908b build/download: allow REMOTEDIR change and consolidate away from UPLOADDIR 2025-12-10 08:43:38 +01:00
Franco Fichtner
673e0a6948 composite/factory: same same, not different 2025-10-28 14:55:16 +01:00
Franco Fichtner
7efc9bc87f composite: add and use load_core_version 2025-10-28 14:48:06 +01:00
Franco Fichtner
5f14858e12 composite: replace last raw "make print" uses 2025-10-28 14:33:14 +01:00
Franco Fichtner
e2dfc431a0 composite/watch: either 2023 or 2025 but not 2024 2025-10-28 14:19:37 +01:00
Franco Fichtner
32a0cd2adb composite/nightly: use load_make_vars 2025-10-28 14:15:14 +01:00
Franco Fichtner
f5e556676a composite/watch: use load_make_vars 2025-10-28 14:12:12 +01:00
Franco Fichtner
43a519b0a9 composite: a little less of guessing
Since we always run the script from the directory we can
infer that util.sh is also there.
2025-10-28 10:55:48 +01:00
Franco Fichtner
10d06be109 composite: utils bandaid for now 2025-10-28 10:34:34 +01:00
Franco Fichtner
c37eb0375c composite/distribution: shortest match instead of longest here too
We could acutally turn this into an util.sh helper now.
2025-10-28 10:32:42 +01:00
Franco Fichtner
085862e77a composite: add a helper to print env vars safely
Suppressing errors is a bit risky.  Now we require print to
only print existing variables and can check of the evaluation
into the composite script worked ok before continuing.  Also
a bit easier to read.

Other composite scripts will follow as they are being used.
2025-10-28 10:28:02 +01:00
Franco Fichtner
84139b4d47 composite/factory: do not show revision in image names
As hotfixes may end up in images they still correspond to the
release version to avoid confusion.
2025-10-28 10:00:44 +01:00
Franco Fichtner
c69556dc7e composite: shield all "make print" use here 2025-10-21 13:32:26 +02:00
Franco Fichtner
c85a674321 composite/nighly: make a note for the future 2025-10-21 13:29:01 +02:00
Franco Fichtner
f362f560d3 composite/watch: tidy this up 2025-10-21 13:21:17 +02:00
Franco Fichtner
cf2a9e71e1 composite/nightly: keep upload.log and print watch log only at the end 2025-10-21 13:14:25 +02:00
Franco Fichtner
117ac0809d build: support "obsolete" build target for skimming obsolete ports
This simply scans ${PORTSDIR}/MOVED file for the port at hand.
Our skim doesn't delete used but removed ports but thus we also
fail to see if FreeBSD ports (re)moved it until it breaks for good.
2025-07-09 08:10:33 +02:00
Franco Fichtner
d03a3b49d8 composite/pkgver: small tweak 2025-03-26 10:45:07 +01:00
Franco Fichtner
0fca35f7c2 composite/pkgver: add a helper script for a workflow that happens daily 2025-03-26 10:41:51 +01:00
Franco Fichtner
6cac024ae8 composite/hotfix: remove this quirk 2024-11-18 08:57:23 +01:00
Franco Fichtner
75a073bdae composite/hotfix: force second argument empty 2024-10-01 14:14:56 +02:00
Franco Fichtner
2027268ca7 composite/hotfix: refactor a tiny bit more
So core and plugins are different from ports for historic reasons
and scope but acutally merge the code of both to make this more
obvious.  Use run_stage exclusively even for the single-step runs
to make the whole thing consistent.
2024-09-30 23:44:17 +02:00
Franco Fichtner
cd5713d372 composite/hotfix: make this consistent 2024-09-30 20:21:56 +02:00
Franco Fichtner
2772023f35 composite/hotfix: streamline and extend individual rebuild
So the following now works:

    # make hotfix-dhcp6c,os-ddclient-devel,opnsense

And rebuilds all packages using their matching steps and runs the
packages step at the end to provide a final packages set without
the aux packages.
2024-09-27 09:55:36 +02:00
Franco Fichtner
e118cc3dd4 composite/factory: bump to 4G due to unknown ZFS size requirement "change"
3G are enough for UFS but ZFS fails while installibg packages.  This brings
it back to working order and that's good enough.
2024-05-03 14:02:07 +02:00
Franco Fichtner
e06105e069 composite/watch: make globbing more strict 2024-04-16 10:44:17 +02:00
Franco Fichtner
3c68989919 composite/nightly: add "watch" step as an overview of the build 2024-04-16 08:30:45 +02:00
Franco Fichtner
a3a2101c61 composite/hotfix: without forced rebuild we get no log messages
It might be better to revisit logging with pkg-msg/pkg-err but for
now this helps make the operation clearer.
2024-02-20 04:36:33 +01:00
Franco Fichtner
5dd1403005 composite/hotfix: minor tweak to the ports hotfix invoke
Plus a stray semicolon. ;)
2024-02-19 12:16:58 +01:00
Franco Fichtner
2aedf54827 composite/hotfix: switch default hotfixing to partial core/plugins build
I have been unintentionally scrubbing packages sets in the past which
is not a lot of fun so make the default hotfix mode a little less coarse.

While here the biggest issue of the hotfixing is not being able to see
package messages (not errors, these are shown as the build aborts) so
collect them in a variable to show at the end if all was building ok.
This is only relevant for multi-step hotfixing between core/plugins.
2024-02-16 09:52:12 +01:00
Franco Fichtner
11eac352ab build: add hotfix clean target which does core and plugins in one step 2024-02-15 15:23:51 +01:00
Franco Fichtner
e3471710d9 composite/hotfix: use MISMATCH in explicit "ports" target
Improve hotfixing just a little bit now that we have the MISMATCH
option.  "make hotfix-ports" now does this automatically and wasn't
used before.
2024-02-15 13:30:39 +01:00
Franco Fichtner
49f84e452b build/ports: add MISMATCH knob; closes #225 2024-02-14 10:01:56 +01:00
Franco Fichtner
d0e6c47d7c composite/nightly: clear /usr/obj after a full run
We do this to avoid /usr/obj longering causing it to be caught in
ZFS snapshots allegedly done by freebsd-update reducing our available
space ever so slightly until nothing works anymore.
2023-12-01 08:54:08 +01:00
Franco Fichtner
277fa7be97 composite: make 'watch' more usable and add a small documentation 2023-11-08 09:00:30 +01:00
Franco Fichtner
783ccad16f composite/watch: improve this a little 2023-11-08 08:41:08 +01:00
Franco Fichtner
f213553e74 composite/hotfix: improve step parsing
We don't intend to pass down arguments to individual steps passed
down but if someone makes that mistake (like me) at least we don't
run the ports build step now which produces a bogus result.
2023-07-26 08:15:23 +02:00
Franco Fichtner
ef89cfd749 composite: custom image support 2023-04-17 10:41:23 +02:00
Franco Fichtner
7faf1e99f4 composite/hotfix: same same but shorter 2023-02-08 09:57:32 +01:00
Franco Fichtner
62cf737ea3 build|composite: remove PRODUCT_FLAVOUR where irrelevant 2023-02-03 15:13:55 +01:00
Franco Fichtner
fc8df43beb composite/hotfix: strip aux in standard mode 2023-01-31 18:46:42 +01:00