-
Notifications
You must be signed in to change notification settings - Fork 88
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
solbuild: Drop fakeroot use, use eopkg.bin #3850
Conversation
913f3c1
to
5424598
Compare
I have tried this with the new cargo macro to be able to use multiple binaries but still seems to get issues. |
Tested this PR with |
From what I remember from Serpent OS, @ReillyBrogan also added default RUSTFLAGS that explicitly makes Rust use the release profile, but adds the necessary debugging options for that. Looking at ypkg, it seems like those changes never made it across for safe use of the |
|
Doesn't look like this is using the new ypkg
That's the old logic |
Same error as David.
|
Staudey clued me in: subsequent builds also have to use ermo, I edited your description slightly to point this out. |
I could not build firefox 130.0.1 without tmpfs so I tried this however it fails with a different error: |
Subsequent builds can use either the Test plan in OP updated to reflect this. |
Looks like the cache dir logic might not work properly yet -- possibly due to permissions. Any chance you could chroot into the failed build and check the permissions of the sccache path in the log? |
It appears only YPKG/sources remains so I could not check sccache only cache which it also complained about in the log.
|
Yes, I seemed to have used the old ypkg so my report can be dismissed. |
|
Patched it locally now firefox will fail at the xvfb-run step:
|
@joebonrichie what if we changed the build dir to I think firefox is being too smart for its own good here. |
ypkg is failing to find seemingly specifically glib2 libs with fakeroot-less solbuild. So won't add the needed dep on glib2 in some circumstances.
|
5424598
to
fc9eb29
Compare
13cefcc
to
3d9df18
Compare
The version I just pushed was synced with solbuild git master, which is in a 1.7.0-pre state currently. |
Depends on getsolus/eopkg#87 |
3d9df18
to
8fc0401
Compare
The latest version of this no longer uses files4.db and will correctly autoupgrade/create /var/lib/eopkg/info/files.db as necessary, provided that the Test Plan from #4063 is completed first. |
This commit represents a 1.7.0 pre-release build. In my tests, dropping fakeroot is always a bonus. Using eopkg.bin instead of eopkg.py2 can add a slight wall clock overhead. However, this is offset by eopkg.bin being immune to py3 stack upgrade work, which will become increasingly necessary as we work toward removing python2 and eopkg.py2. Note: The present relase still uses eopkg.py2 to build old pspec.xml pkgs. Signed-off-by: Rune Morling <[email protected]>
45ddf1f
to
2eef010
Compare
2eef010
to
a797222
Compare
Note: I have double bumped this past the solbuild release that staff have been using for local tests, hence the failing tests. |
I've tested this and the related PR with the test plan.
|
**Summary** Release notes can be found [here](https://github.com/getsolus/solbuild/releases/tag/v1.7.0).
a797222
to
1967b11
Compare
**Summary** - `eopkg.py2` now writes versioned (v3), gdbm format FilesDB shelves, and versioned LazyDB caches; both using Pickle Protocol Version 2. - `eopkg.py3/bin` now writes versioned (v4), gdbm format FilesDB shelves, and versioned LazyDB caches; both using Pickle Protocol Version 2. - FilesDB and LazyDBs are autoupgraded on version mismatch. - The output of `sudo eopkg.py2/py3/bin rdb` operations has been cleaned up significantly. - Taskfile now uses `eopkg.bin` for indexing operations due to the improved output it provides. - ypkg-install-deps supports an optional -e/--eopkg-cmd argument, which defaults to `eopkg.py3` (look at getsolus/solbuild#117 for how this will be leveraged in solbuild). This is intended to help make the transition between using `eopkg.py2` and `eopkg.py3/bin` much smoother. **Changelog** - [eopkg.py2 3.12.5](https://github.com/getsolus/eopkg/releases/tag/v3.12.5) - [eopkg.py3 4.1.5](https://github.com/getsolus/eopkg/releases/tag/v4.1.5) - [eopkg.py3 4.1.6](https://github.com/getsolus/eopkg/releases/tag/v4.1.6) **Test Plan** - Check out this branch - Clean out the local repo with `go-task clean-local` - Build pisi w/ `go-task localcp` and install it - Pay attention to any mentions of FilesDB rebuilds in subsequent build logs (e.g. eopkg, ypkg and whatever else you decide to build for testing purposes). In particular, pay attention to the `FilesDB (version:` part. - Build eopkg w/ `go-task localcp` and install it and its `python-eopkg` subpackage - Notice how after installing the updated eopkg, subsequent builds will now show a list of which packages are indexed in the local repo prior to the build. - Build ypkg w/ `go-task localcp` and install it - Follow the Test Plan in #3850 **Checklist** - [x] Package was built and tested against unstable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested this as per getsolus/solbuild#77. LGTM!
Summary
Adds the new solbuild with no-fakeroot functionality.
Important note: Landing this PR to -unstable needs to be followed up by updating the solbuild image, otherwise we will get some really annoying failures related to libglib-json moving certain files to a -devel subpackage IIUC.
Depends on #4063 and should be landed after it.
Test Plan
go-task localcp
and install itsolbuild version
and check that it shows 1.7.0go-task localcp
and re-install each of them after each build completesgo-task localcp
and re-install it after the build completesFilesDB (version:
output. It should shift from being version 3 to version 4 fromeopkg
and onwards, which is a sign that the new solbuild is now askingypkg-install-deps
to useeopkg.bin
to install deps (it was hardcoded toeopkg -> eopkg.py2
in ypkg before).go-task local
orgo-task localcp
) to test the new tooling versions.FilesDB (version:
output in the build logs.eopkg.bin
. Once the pisi/eopkg: Add versioned FilesDB and LazyDB instances #4063 PR and the present PR has been landed, we can then update the solbuild images to also use eopkg.bin andFilesDB (version: 4)
.Checklist