A series of updates to add support for building different debian
releases against the master branch have been merged. The goal is
to allow Debian trixie support to be developed on the master
branch, rather than on a feature branch that needs frequent merges
and cherry picks.
What does this mean to you?
For developers working on Bullseye, little has changed.
- Your current code will continue to build in your current
environment. All you need to do is rebuild you build
containers using 'stx-init-env --rebuild' after your next 'repo
sync'.
- Any required changes to your stx.conf should be applied
automatically.
- Legacy packaging will continue to work.
- No new command line arguments are required
For those working on Trixie.
- You'll need to create a new build environment, independent of
any prior bullseye work.
- In your stx.conf, set the following 'os_codename=bullseye' ...
that's it.
- Follow the normal steps to create a new build environment,
download files, build packages, etc. No extra command line
arguments are required.
For those needing to work on both concurrently.
- Maintain two independent work environments for the two releases
Bullseye and Trixie. DO NOT TRY TO SWITCH BACK AND FORTH!
The details ...
stx.conf.sample
The value 'stx_mirror_url' has been replaced by four values
'os_mirror_url, os_mirror_dist_path, lat_mirror_url,
lat_mirror_lat_path' for maximum flexibility in defining mirror
configurations
The value 'dist=bullseye' has been replaced by three values,
'os_id=debian, os_codename=bullseye (or trixie), os_arch=amd64 (or
aarm64)' to in preparation to support concurrent builds of other
debian releases and architectures on the master branch.
Pre-existing stx.conf files should be automatically adapted to
the new structure and default values. No user intervention is
required if you have been using default values all along.
relocation or renaming of files.
stx-tools/stx/dockerfiles/bullseye/
-> stx-tools/stx/debian/bullseye/dockerfiles/
->
stx-tools/stx/debian/trixie/dockerfiles/
stx-tools/stx/toCOPY/ ->
stx-tools/stx/debian/common/toCOPY/
stx-tools/debian-mirror-tools/config/debian/ ->
stx-tools/debian-mirror-tools/config/debian/bullseye/
->
stx-tools/debian-mirror-tools/config/debian/trixie/
stx-tools/debian-mirror-tools/config/debian/*/*bullseye*
->
stx-tools/debian-mirror-tools/config/debian/bullseye/*/*bullseye*
->
stx-tools/debian-mirror-tools/config/debian/trixie/*/*trixie*
cgcs-root/build-tools/stx/debian-bullseye-image.inc ->
cgcs-root/build-tools/stx/debian-bullseye-image.inc (No change
for bullseye)
->
cgcs-root/build-tools/stx/debian-trixie-image.inc
<git>/debian_pkg_dirs ->
<git>/debian_bullseye_pkg_dirs_std (Note: old location
still supported for bullseye)
->
<git>/debian_trixie_pkg_dirs_std
<git>/debian_pkg_dirs_rt ->
<git>/debian_bullseye_pkg_dirs_rt (Note: old location
still supported for bullseye)
->
<git>/debian_trixie_pkg_dirs_rt
<git>/<pkg_dir>/debian/ ->
<git>/<pkg_dir>/debian/all/ (supports both
bullseye and trixie) (Note: old location still supported for
bullseye)
->
<git>/<pkg_dir>/debian/bullseye/ (bullseye only
version)
->
<git>/<pkg_dir>/debian/trixie/ (trixie only
version)
cgcs-root/build-tools/stx/debian-bullseye-image.inc ->
cgcs-root/build-tools/stx/debian-bullseye-image.inc
->
cgcs-root/build-tools/stx/debian-trixie-image.inc