search

g7 / sailfishx-patcher-f5321

Patcher script that applies the f5321 (Xperia X Compact) compatibility layer on top of official Sailfish X f5121 images
29 stars 5 forks source link

fixes for kvarken (rpm HACK 1.2.4.jolla => 1.2.6.jolla, VALID_PRODUCTS in flash.sh) #21

Closed teleshoes closed 3 years ago

teleshoes commented 3 years ago

primary.xml is just wrong for kvarken i guess? i dont actually know whats failing where, but the rpm versions fetched for kvarken just dont exist.

without this hack, i get the old: error: open of <html> failed: No such file or directory (from the rpm cmd, since curl fetches a 404 html error page)

with this hack, i print 3 times: HACK PKG PATH: oss/armv7hl/augeas-libs-1.12.0+git2-1.2.4.jolla.armv7hl.rpm => oss/armv7hl/augeas-libs-1.12.0+git2-1.2.6.jolla.armv7hl.rpm

teleshoes commented 3 years ago

(image build confirmed working for me on 4.1.0.24, with these fixes)

g7 commented 3 years ago

Hello!

First of all, thanks for keeping this thing alive :)

I think I found a more future-proof way to handle the missing primary.xml.gz. Apparently, since 4.1.0, Jolla switched to an "hashed" filename (<sha256 of the file>-primary.tar.gz) so probably the primary.xml.gz file the script was getting was a leftover from 4.0 or so.

c5e0fc4 fixes this by looking for a suitable file on the repository metadata (repomd.xml) first. It seems to work, but I'm unable to test, so if you're willing to it would be awesome! :)

teleshoes commented 3 years ago

thanks! im going to open another PR for the unrelated fix i included here, which i think is still necessary. i will test it tmrw and reflash