[Important] Trixie development is moving to the master branch
You may encounter a merge conflict on your next 'repo sync', and gerrit reviews may show a 'merge conflict' that needs resolution. Even if no merge conflict is flagged, please be alert if your changes, or the changes you are reviewing, introduce a new file. Is the file in the correct directory? If 'bullseye', 'trixie', or 'all' are not an element in the path name, it likely needs to be relocated. Your existing master branch build environments should continue to build bullseye without modification, provided it's not too old. If it's over two weeks old, I recommend you ... 1) 'repo sync' 2) exit and stop build containers ... 'stx control stop' 3) update your configuration with 'stx config --upgrade' 4) rebuild you build containers using 'stx-init-env --rebuild' If you are updating a bullseye version of a package, and see a trixie version now exists, please track down the author of the trixie version and alert him/her of your change. They may need to add a similar change to trixie. Note: At some point in the future (TBD) we will be asking that you port your changes to trixie yourself, and verify that it also builds against the new debian release (instructions will follow). Scott
participants (1)
-
Scott.Little