pisi/eopkg: Sync with deterministic upstream versions #2964
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ermo
force-pushed
the
eopkg-pisi-ypkg-solusSC-update
branch
4 times, most recently
from
5188726
to
d734f4b
Compare
|
Just to give an idea how each package is changing (when installed side-by-side) compared to the previous versions: --- eopkg-6.txt 2024-06-17 23:01:10.772002005 +0200
+++ eopkg-7.txt 2024-06-24 02:18:11.919587130 +0200
@@ -1,3 +1,2 @@
/usr/bin/eopkg.bin
-/usr/bin/eopkg4-bin
/usr/share/PackageKit/helpers/eopkg/eopkgBackend.bin
--- pisi-111.txt 2024-06-24 00:18:51.121537384 +0200
+++ pisi-112.txt 2024-06-24 02:14:12.400067008 +0200
@@ -1,12 +1,15 @@
/etc/mudur/locale
-/usr/bin/check-newconfigs.py
+/usr/bin/check-newconfigs.py2
/usr/bin/eopkg
/usr/bin/eopkg-cli
+/usr/bin/eopkg.py2
/usr/bin/lseopkg
-/usr/bin/lspisi
-/usr/bin/revdep-rebuild
+/usr/bin/lseopkg.py2
+/usr/bin/lspisi.py2
+/usr/bin/revdep-rebuild.sh
/usr/bin/uneopkg
-/usr/bin/unpisi
+/usr/bin/uneopkg.py2
+/usr/bin/unpisi.py2
/usr/lib/python2.7/site-packages/pisi-3.11-py2.7.egg-info
/usr/lib/python2.7/site-packages/pisi/__init__.py
/usr/lib/python2.7/site-packages/pisi/actionsapi/__init__.py |
ermo
added a commit
to getsolus/solbuild
that referenced
this pull request
Jun 18, 2024
This ensures that solbuild will work with the phase1+2 changes to eopkg and pisi packages [here](getsolus/packages#2964) In addition, make a cosmetic tweak to eopkg install commands (which will effectively be using eopkg.bin when the PR above lands) so the -y flag is set before the -c flag when installing components. Signed-off-by: Rune Morling <[email protected]>
ermo
force-pushed
the
eopkg-pisi-ypkg-solusSC-update
branch
4 times, most recently
from
561d8f1
to
afc910e
Compare
ermo
changed the title
ermo
force-pushed
the
eopkg-pisi-ypkg-solusSC-update
branch
2 times, most recently
from
5a9b085
to
43a7126
Compare
ermo
force-pushed
the
eopkg-pisi-ypkg-solusSC-update
branch
from
43a7126
to
33f09f5
Compare
**Summary** - Remove eopkg4-bin symlink. Use eopkg.bin instead. - eopkg.bin and eopkg.py3 will now deterministically install baselayout and eopkg packages before anything else. - Add eopkg to system.base in preparation for epoch bump process. - Add mirrors.conf and sandbox.conf files in preparation for epoch bump process ownership changes between pisi(py2) and eopkg(py3) packages. Signed-off-by: Rune Morling <[email protected]>
**Summary** - Sync with pisi v3.12.1 upstream release, which always installs baselayout eopkg first if they are present in any given install/upgrade order. - Add rundep on python2-ordered-set package - Make pisi co-installable with the eopkg(py3) package - Miscellaneous shebang and file name extension changes - Sort pspec.xml file sections lexically for ease of reading/tweaking - Change long_description to indicate that pisi is now considered legacy - Create new comar/manager.py3 and comar/package.py3 build scripts in preparation for enabling building pisi with `eopkg.py3 build`. Thank you to @ultr4_l4s3r for the porting work. The current comar/*.py scripts are still python2 for now. Signed-off-by: Rune Morling <[email protected]>
ermo
force-pushed
the
eopkg-pisi-ypkg-solusSC-update
branch
from
33f09f5
to
02f1d61
Compare
sheepman4267
approved these changes
Jun 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Constitutes phase 2 of #2193
eopkg
pisi
eopkg.py3 build.Thank you to @ultr4_l4s3r for the porting work. The current comar/*.py scripts are still python2 for now.
ypkg
(no changes necessary)
solus-sc
(no changes necessary)
Test Plan
Checklist