-
Notifications
You must be signed in to change notification settings - Fork 23
Convert patches between 32 and 64 bit library path #109
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
Conversation
|
PoC type implementation - it does work and produces patches that apply. Mode of operation could be improved - currently it does a lot of looping and grepping the same files. Could probably be done with one or two bigger sed commands all at once. Testing required:
Oh, and the candidate list currently contains "/usr/lib/patchmanager-test" for easy testing. This should be removed before merging. |
|
I tested this on a 64-bit device and the reason it was failing was that |
6c08186 to
578f22c
Compare
|
As discussed, we don't want to duplicate the mangle list in both cpp source and shell script. |
19f880a to
14d9c98
Compare
|
@b100dian please review, seems to work but may be bad c++. |
|
Nothing wrong per se in the changes (just nits) but, however I tried playing around with 1. having only one MANGLED_CANDIDATES entry and 2. see if pm_unapply would work and even 3. If a setting could show the paths to the user (not clear how to pass the setting to pm_apply now, maybe |
b100dian
left a comment
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.
All good from my point of view, maybe it needs more testing. Oh, and the wording in the settings page maybe needs review.
I've added a last commit refreshing patches on bitness mangling change and fixed the 'last' caveat.
|
Hmm maybe I spoke too soon, I still get errors like "PatchManagerObject::tryToUnlinkFakeParent" |
|
Ok, just tested this build with 4.3.0 armv7hl and the setting does not harm existing 32-bit patches, and it tried to fix this 64-bit patch https://coderus.openrepos.net/pm2/project/patch-five-cameras-tucana which didn't apply as it shouldn't, but for the right reasons (the Other than this, with the last change (re-order to mangle before test if applied) it seemed to work correctly even at pm3 upgrade scripts on my 4.2.0 64-bit device. |
|
Zig-zagging through my notifications, I need to test the last two checkboxes. Could find some time tomorrow. |
|
Tested by "does it work reliably with patches that contain both lib64 and lib paths (e.g. patches a Silica file and a systemd service on 64bit)?" appending this to an existing patch To an existing patch, looks alright (it patched one file in lib64 and another one in lib) |
a build artefact was introduced in 9431443 / sailfishos-patches#109
Fixes #71
#71