There is an updated pull request by classabbyamp against master on the void-packages repository https://github.com/classabbyamp/void-packages host-arch https://github.com/void-linux/void-packages/pull/46263 [RFC] xbps-src: add -A flag for host arch, create masterdir per host arch #### Testing the changes - I tested the changes in this PR: **YES** ### Overview - default masterdir naming now includes the host `XBPS_ARCH`, e.g. `masterdir-x86_64` - setting the host `XBPS_ARCH` can be done with `-A ` - This will create a new masterdir per host arch automatically - using an arbitrary masterdir is still supported via `-m `, and overrides whatever `-A` would set - the invocation of `[binary-]bootstrap` no longer (ab)uses `$XBPS_TARGET_PKG` for setting the masterdir's host architecture #### Before *default:* ``` $ ./xbps-src binary-bootstrap $ ls ... masterdir ... ``` *nondefault masterdir:* ``` $ ./xbps-src -m masterdir-idk binary-bootstrap $ ls ... masterdir-idk ... ``` *specific host arch:* ``` $ ./xbps-src -m masterdir-musl binary-bootstrap x86_64-musl $ ls ... masterdir-musl ... ``` *cross with specific host arch:* ``` $ ./xbps-src -m masterdir-musl binary-bootstrap x86_64-musl $ ./xbps-src -m masterdir-musl -a aarch64-musl pkg foo ``` #### After *default:* ``` $ ./xbps-src binary-bootstrap $ ls ... masterdir-x86_64 ... ``` *nondefault masterdir:* ``` $ ./xbps-src -m masterdir-idk binary-bootstrap $ ls ... masterdir-idk ... ``` *specific host arch:* ``` $ ./xbps-src -A x86_64-musl binary-bootstrap $ ls ... masterdir-x86_64-musl ... ``` *cross with specific host arch:* ``` $ ./xbps-src -A x86_64-musl binary-bootstrap $ ./xbps-src -A x86_64-musl -a aarch64-musl pkg foo ``` ### Thoughts - By removing the `[binary-]bootstrap [arch]` invocation style, there will be changes needed to buildbot configuration. If left in, should `-A ` take priority over `[arch]` if both are specified? - This could be an opportunity to change the name of `masterdir` to something else, like `buildroot` (the containers CI uses are already called `void-buildroot-`) ### TODO - [ ] various documentation/other xbps-src changes as needed - [ ] buildbot changes if needed A patch file from https://github.com/void-linux/void-packages/pull/46263.patch is attached