*** rainemak_ is now known as rainemak | 10:39 | |
nephros | Ah, Chum is getting 4.6 I see! :) | 17:26 |
---|---|---|
piggz[m] | already?? | 17:27 |
mal | heh, I just enabled first build like minute or two ago :D | 17:27 |
piggz[m] | thats great .. means i will be able to install 4.6 on my daily | 17:27 |
nephros | `osc r` told me. | 17:28 |
mal | piggz[m]: is the chum able to handle the new version numbering? | 17:28 |
piggz[m] | nephros: are you running that in a while(1) ? | 17:28 |
piggz[m] | mal: need to check | 17:28 |
mal | I mean to use 4.6_aarch64 for example | 17:28 |
nephros | piggz[m]: well, were I a computer I might. | 17:28 |
nephros | Chum GUI will not handle that correctly at the moment I think. | 17:29 |
mal | ok, please fix it :) | 17:29 |
mal | we probably will add compatibility symlinks though | 17:30 |
nephros | https://github.com/sailfishos-chum/sailfishos-chum-gui/issues/270 | 17:30 |
piggz[m] | this? https://github.com/sailfishos-chum/sailfishos-chum-gui/issues/270 | 17:31 |
piggz[m] | snap! | 17:31 |
nephros | precisely. | 17:31 |
nephros | so there's some technical, and some emotional fallout from that change. | 17:32 |
mal | about that comment in the issue, the existing full version is still available in ssu just like before, we just hope to make less obs builds by cutting useless parts of the version from the obs repo urls | 17:37 |
nephros | I understand and appreciate this. | 17:38 |
mal | and obs is a bit limited in some ways, the symlinks we used already in 4.5.0.25 were made manually | 17:38 |
nephros | mal: What, no Mind2 agent yet which ust does the right thing? ;) | 17:39 |
nephros | mal: we had that issue of the chum package colliding with a new one in 4.6, which one was that I forget. | 17:44 |
mal | ah | 17:48 |
mal | did I forget that | 17:48 |
mal | damn | 17:48 |
nephros | pcre2 | 17:49 |
mal | yeah, forgot it :( | 17:50 |
mal | need to see how to handle that | 17:51 |
nephros | What I can do is push a change like https://github.com/sailfishos-chum/pcre2/compare/master...sfos-4.6-nobump to chum. | 17:52 |
mal | which packages use that? | 17:53 |
mal | only one package it seems | 17:53 |
nephros | Yes. | 17:53 |
nephros | And a pretty useless one at that :P | 17:54 |
nephros | But there is also a colliding package put at OpenRepos. | 17:55 |
nephros | previous discussion: https://irclogs.sailfishos.org/logs/%23sailfishos/%23sailfishos.2024-02-28.log.html | 17:56 |
piggz[m] | mal: nephros: is there a #if (sailfish_version) type code available? then i can wrap the url's in ssu.cpp to use releaseMajorMinor for >= 4.6 | 17:59 |
nephros | piggz[m]: you can always parse /etc/sailfish-release | 18:02 |
piggz[m] | nephros: i feel like i have done this somewhere ... | 18:02 |
piggz[m] | let me check amazfish | 18:02 |
mal | pretty sure ssu provides all needed things | 18:02 |
piggz[m] | mal: so just call this method? https://github.com/sailfishos/ssu/blob/master/dbus/org.nemo.ssu.xml#L82 | 18:08 |
nephros | piggz[m]: or this? https://github.com/sailfishos/ssu/blob/c9efabb97797f20d28ca7182d7a774ffb328ccf9/libssu/ssu.h#L169 | 18:12 |
nephros | same thing but not dbus. | 18:12 |
mal | yeah, grab release() the use release.section('.', 0, 1)); to get the major.minor and then add conditional here https://github.com/sailfishos-chum/sailfishos-chum-gui/blob/main/src/ssu.cpp#L131 | 18:15 |
mal | something like that | 18:15 |
mal | or you can make some simpler comparison using major and minor like something similar to sailfishos_version on obs | 18:16 |
mal | so there would be no need for string comparisons | 18:16 |
mal | so major = release.section('.', 0, 0)); and minor release.section('.', 1, 1)); and then release = major * 10000 + minor * 100 or whatever | 18:17 |
mal | piggz[m]: nephros: ^ | 18:18 |
mal | just for reference those commands are the ones used for versions in this https://github.com/sailfishos/ssu/commit/f384e35d908f23c411e6ce226773aa608139b71f | 18:18 |
piggz[m] | chum gui isnt linking to libssu, but using the dbus interface | 18:21 |
nephros | piggz[m]: ah, I was confused by the #include ssu.h. Still, should amout to the same thing. | 18:24 |
nephros | mal: About the pcre2 situation. Assuming a user has the chum version (--> vendor==chum) installed, when updating to 4.6, will the update force a vendor change? | 18:28 |
piggz[m] | zypper dup will do a vendor change iirc | 18:30 |
nephros | that's good. | 18:30 |
mal | but will version --dup | 18:30 |
mal | or official update way | 18:30 |
nephros | yeah because if not there's no way out :) | 18:30 |
mal | maybe I need to flash some device with 4.5.0 install that app and pcre2 and test | 18:30 |
nephros | I mean maybe it's too much effort for the packages in question, but I'm interested because we might run into similar issues in the future. | 18:32 |
nephros | so this is kind of a test case to develop a method. | 18:33 |
mal | nephros: chum is already having issue with that package | 18:35 |
mal | nephros: wondering what would happen if we just replace the chum version with the official one and then disable build of it for 4.6 | 18:37 |
nephros | mal: That is I guess what is in master right now: Use SailfishOs upstream in https://github.com/sailfishos-chum/pcre2/commit/a7049e89470241c38d41444da644bb7c23824d2e | 18:41 |
nephros | and disable build in https://github.com/sailfishos-chum/pcre2/commit/228d40949b6092213770e765c5193e4bf0c33650 | 18:41 |
nephros | So, tag that, and put into chum. fine. | 18:42 |
nephros | But I think the vendor issue then still remains an open question. | 18:43 |
nephros | Did I understanf this right? | 18:43 |
nephros | In fact, the tag is there, and the branch https://build.sailfishos.org/package/show/home:nephros:branches:sailfishos:chum:testing/pcre2 is using it. | 18:54 |
Keto | vendor issue? | 19:04 |
Keto | ah, right | 19:05 |
nephros | Keto: yes, will regular SFOS update initiate/override a vendor change or not. | 19:07 |
rinigus | mal and piggz: but isn't chum gui fine as it is with new 4.6 releases? it is just feeding this URL (https://github.com/sailfishos-chum/sailfishos-chum-gui/blob/main/src/ssu.cpp#L8C25-L8C93) to SSU and SSU, in my understanding, just changes `%(release)` to whatever SFOS you have. if versioning string is now just 4.6 then that should be returned by `%(release)`. or do I miss something? | 19:23 |
piggz[m] | rinigus ... we need to use releaseMajorMinor afaik ? | 19:23 |
piggz[m] | new variable | 19:23 |
Keto | zypp config solver.dupAllowVendorChange has the default true, so it should allow vendor change on dist-upgrade. assuming the system update done through packagekit uses the same method | 19:23 |
rinigus | piggz: but what does `%(release)` return then in 4.6? something else? like 4.6.0.1? | 19:25 |
Keto | the '%(release)' variable works like before and returns the full version | 19:26 |
piggz[m] | thought so | 19:26 |
Keto | and I will create symlinks with the full version for the repos | 19:26 |
Keto | but at some point transition to using the releaseMajorMinor would be good | 19:28 |
piggz[m] | yeah, so nothing will break right now, but better to switch | 19:28 |
rinigus | Keto: (was reading https://github.com/sailfishos/ssu/pull/16, I presume that's the one). OK, so, if we start using `https://repo.sailfishos.org/obs/sailfishos:/chum/%(releaseMajor).%(releaseMinor)_%(arch)/` for GUI compiled against SFOS version >= 4.6, we can later skip making symlinks | 19:28 |
Keto | yep | 19:29 |
rinigus | that way we will avoid loading pointless work on Keto | 19:29 |
rinigus | sorry, we would have to use releaseMajorMinor . easier | 19:30 |
piggz[m] | yup | 19:30 |
piggz[m] | im trying to build some code like that atm | 19:30 |
rinigus | in Chum there was a macro encoding SFOS release. we could just ifdef with it | 19:31 |
piggz[m] | ah ok .. i was going to do runtime check | 19:31 |
rinigus | don't do it - let's keep it simple :) | 19:31 |
piggz[m] | rinigus: feel free to take it on ... i dont have a build env set up very well after a laptop rebuild | 19:32 |
rinigus | piggz: sure. not that I have an environment working either. but that's not needed - we can use OBS :) | 19:33 |
piggz[m] | sure, macro is a bit simpler for that .. for a runtime check, id at least want to be sure it compiles :) | 19:33 |
piggz[m] | rinigus: sure? i only see CHUMGUI_VERSION | 19:36 |
rinigus | piggz: scroll to the end of https://build.sailfishos.org/project/prjconf/sailfishos:4.6 | 19:36 |
rinigus | see sailfishos_version | 19:37 |
rinigus | piggz: I'll be off to sleep. if you decide to skip it, I'll deal with it in the next few days | 19:37 |
piggz[m] | ah ok .. | 19:37 |
attah | So the great rebuild has started? | 19:53 |
mal | yeah, testing chum first | 19:58 |
attah | Jaay :) | 19:58 |
*** cquence1 is now known as cquence | 20:31 |
Generated by irclog2html.py 2.17.1 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!