Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFC] xbps-src: add -A flag for host arch, create masterdir per host arch #46263

Merged
merged 3 commits into from Jan 23, 2024

Conversation

classabbyamp
Copy link
Member

@classabbyamp classabbyamp commented Sep 26, 2023

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 <arch>
    • This will create a new masterdir per host arch automatically
  • using an arbitrary masterdir is still supported via -m <masterdir>, 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 <arch> take priority over [arch] if both are specified? buildbot config will be changed
  • This could be an opportunity to change the name of masterdir to something else, like masterdir (the containers CI uses are already called void-buildroot-<libc>) if this changes, it will be separate; there's too much to change both coherently

TODO

  • various documentation/other xbps-src changes as needed
  • buildbot changes if needed

@classabbyamp classabbyamp added the xbps-src xbps-src related label Sep 26, 2023
@classabbyamp classabbyamp requested a review from a team September 26, 2023 07:52
@lemmi
Copy link
Member

lemmi commented Sep 26, 2023

I like this change a lot. Personally I'm not opposed to remove the redundant flag to {binary-,}bootstrap, or at least fail if both options, -A and the argument to bootstrap, are specified. I'm less eager to rename masterdir, but since it's kind of an odd choice, I'm not against that.

@SpidFightFR
Copy link
Contributor

Following the progress on that PR, it looks very interesting ! 🙏

Copy link

Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.

@github-actions github-actions bot added the Stale label Dec 26, 2023
@github-actions github-actions bot removed the Stale label Dec 27, 2023
@classabbyamp classabbyamp force-pushed the host-arch branch 4 times, most recently from 3c09358 to 51c7335 Compare January 17, 2024 05:44
@classabbyamp classabbyamp changed the title [RFC] xbps-src: add -A flag for host arch, create masterdir per host arch [RFC] xbps-src: add -A flag for host arch, create buildroot per host arch, rename masterdir to buildroot Jan 17, 2024
classabbyamp added a commit to classabbyamp/void-infrastructure that referenced this pull request Jan 17, 2024
classabbyamp added a commit to classabbyamp/void-infrastructure that referenced this pull request Jan 17, 2024
@classabbyamp classabbyamp force-pushed the host-arch branch 2 times, most recently from 1a0ee3b to 6c812a3 Compare January 22, 2024 18:00
@classabbyamp classabbyamp changed the title [RFC] xbps-src: add -A flag for host arch, create buildroot per host arch, rename masterdir to buildroot [RFC] xbps-src: add -A flag for host arch, create masterdir per host arch Jan 22, 2024
classabbyamp added a commit to classabbyamp/void-infrastructure that referenced this pull request Jan 22, 2024
classabbyamp added a commit to classabbyamp/void-linux.github.io that referenced this pull request Jan 22, 2024
xbps-src Show resolved Hide resolved
classabbyamp added a commit to classabbyamp/void-linux.github.io that referenced this pull request Jan 22, 2024
Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

classabbyamp added a commit to classabbyamp/void-linux.github.io that referenced this pull request Jan 22, 2024
classabbyamp added a commit to classabbyamp/void-linux.github.io that referenced this pull request Jan 22, 2024
the-maldridge pushed a commit to void-linux/void-infrastructure that referenced this pull request Jan 23, 2024
the-maldridge pushed a commit to void-linux/void-linux.github.io that referenced this pull request Jan 23, 2024
@the-maldridge the-maldridge merged commit 6beadba into void-linux:master Jan 23, 2024
7 of 8 checks passed
@classabbyamp classabbyamp deleted the host-arch branch January 23, 2024 04:02
classabbyamp added a commit to classabbyamp/xbps that referenced this pull request Feb 10, 2024
many flags were missing, also updates for new flags:
- host arch (void-linux/void-packages#46263)
- verbose (void-linux/void-packages#48637)
classabbyamp added a commit to classabbyamp/xbps that referenced this pull request Feb 18, 2024
many flags were missing, also updates for new flags:
- host arch (void-linux/void-packages#46263)
- verbose (void-linux/void-packages#48637)
classabbyamp added a commit to classabbyamp/xbps that referenced this pull request Mar 1, 2024
many flags were missing, also updates for new flags:
- host arch (void-linux/void-packages#46263)
- verbose (void-linux/void-packages#48637)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
xbps-src xbps-src related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants