#
#ubuntu-asahi · 2024-03-04 00:41
tobhe[m]but then you can't add the text later because 23.10
#ubuntu-asahi · 2024-03-04 00:40
eslerm[m]the count starts at 0, but then text isn't added
#ubuntu-asahi · 2024-03-04 00:39
tobhe_but who starts counting at 1
#ubuntu-asahi · 2024-03-04 00:38
tobhe_following that post it should probably be asahi1
#ubuntu-asahi · 2024-03-04 00:36
tobhe_mesa has a bit of a special version number anyway. but I couldn't come up with a better one
#ubuntu-asahi · 2024-03-04 00:34
eslerm[m]https://www.ducea.com/2006/06/17/ubuntu-package-version-naming-explanation/
#ubuntu-asahi · 2024-03-04 00:34
eslerm[m]iiuc, if there is no changes the `0` would be dropped, and +`1` means downstream changes
#ubuntu-asahi · 2024-03-04 00:29
tobhe[m]but it really doesn't matter. looks like I used both 0 and 1 in the past
#ubuntu-asahi · 2024-03-04 00:29
eslerm[m]ok, can do since it won't impact github
#ubuntu-asahi · 2024-03-04 00:28
tobhe_it doesn't really matter but those are per ppa so you can just upload it to another one if it bothers you
#ubuntu-asahi · 2024-03-04 00:28
tobhe_why can't you use 1? because you already uploaded a few?
#ubuntu-asahi · 2024-03-04 00:27
eslerm[m]I wish the `3` was a `1` :)
#ubuntu-asahi · 2024-03-04 00:27
eslerm[m]ack, I can use `Ubuntu-24.0_pre20240228-0asahi3.23.10`
#ubuntu-asahi · 2024-03-04 00:18
tobhe[m]underscore because tags can't have ~
#ubuntu-asahi · 2024-03-04 00:18
tobhe[m]normally I'd use something closer to the debain/changelog package version for the Ubuntu tag, see https://github.com/UbuntuAsahi/mesa/tags
#ubuntu-asahi · 2024-03-04 00:16
tobhe[m]https://gitlab.freedesktop.org/asahi/mesa/-/tags/asahi-20240228 vs https://github.com/eslerm/mesa/releases/tag/asahi-20240228
#ubuntu-asahi · 2024-03-04 00:16
tobhe[m]because now you have two remotes with conflicting tags and that confuses git (and humans)
#ubuntu-asahi · 2024-03-04 00:15
tobhe[m]but I would pick a different name for the Ubuntu tag
#ubuntu-asahi · 2024-03-04 00:15
tobhe[m]not bad, eebfe841 matches https://gitlab.freedesktop.org/asahi/mesa/-/tags/asahi-20240228
#ubuntu-asahi · 2024-03-04 00:12
tobhe[m]but by keeping our diff on top small and easy to review we can at least make sure we didn't break anything in merges
#ubuntu-asahi · 2024-03-04 00:12
eslerm[m]how does this look? https://github.com/eslerm/mesa/releases/tag/asahi-20240228
#ubuntu-asahi · 2024-03-04 00:12
tobhe[m]since upstream rebases and force pushes regularly it might not even be possible to keep a linear commit history
#ubuntu-asahi · 2024-03-04 00:09
tobhe[m]imo most important is to show that the commit history up to asahi-20240228 is intact and then there's some packaging on top
#ubuntu-asahi · 2024-03-04 00:07
eslerm[m]most of it should be done, just waiting for builds to test well
#ubuntu-asahi · 2024-03-04 00:06
tobhe[m]just take asahi-20240228, add some debian build magic and call it done
#ubuntu-asahi · 2024-03-04 00:06
tobhe[m]if you plan to not merge you can just force push, so that shouldn't be a problem
#ubuntu-asahi · 2024-03-04 00:06
eslerm[m]s/(I tried to do this more cautiously, and needed to go back and redo this)/(I tried to do this more cautiously at first, only restting as much as *needed*, but ended up needing to go back further)/
#ubuntu-asahi · 2024-03-04 00:05
eslerm[m](I tried to do this more cautiously, and needed to go back and redo this)
#ubuntu-asahi · 2024-03-04 00:05
eslerm[m]I reset to the intitial commit to make sure I wound the clock back far enough
#ubuntu-asahi · 2024-03-04 00:05
eslerm[m]these exist in the upstream branch, but are comitted at a different time
#ubuntu-asahi · 2024-03-04 00:04
eslerm[m]tobhe[m]: there are some out of order commits https://github.com/eslerm/mesa/compare/ubuntu/mantic...UbuntuAsahi%3Amesa%3Aubuntu/mantic
#ubuntu-asahi · 2024-03-04 00:04
eslerm[m]and then pr ubuntu/mesa to main
#ubuntu-asahi · 2024-03-04 00:04
eslerm[m]I was planning to pr my branch to ubuntuasahi/mesa's ubunt/mesa branch
#ubuntu-asahi · 2024-03-04 00:04
tobhe[m]hm? why not just git reset --hard to the mesa release tag?
#ubuntu-asahi · 2024-03-04 00:03
eslerm[m]if the build tests well, mesa and 6.6.0-1004 should be ready to publish
#ubuntu-asahi · 2024-03-04 00:02
eslerm[m]just sent out a (hopefully final) lp build
#ubuntu-asahi · 2024-03-04 00:02
eslerm[m]https://github.com/eslerm/mesa/tree/ubuntu/mantic
#ubuntu-asahi · 2024-03-04 00:02
eslerm[m]for mesa, I `git reset --hard` ubuntu/mantic to the first commit in mesa, and then rebased on the main asahi/mesa branch
#ubuntu-asahi · 2024-03-03 23:34
eslerm[m]I'll ask a friend who has likely seen this ppa scenario resolved a few different ways
#ubuntu-asahi · 2024-03-03 23:30
tobhe[m]but that is when one package replaces another I think
#ubuntu-asahi · 2024-03-03 23:29
john-cabaj[m]I’ve heard of the concept of a transitional package
#ubuntu-asahi · 2024-03-03 23:29
tobhe[m]but it feels pretty risky to me
#ubuntu-asahi · 2024-03-03 23:29
tobhe[m]like have an ubuntu-asahi meta package update with a postinst script doing that
#ubuntu-asahi · 2024-03-03 23:29
tobhe[m]we can maybe call add-apt-repository from a maintainer script
#ubuntu-asahi · 2024-03-03 23:28
tobhe[m]I don't think there is a package
#ubuntu-asahi · 2024-03-03 23:28
tobhe[m]One thing I tried to avoid is having to keep two ppas in sync. I'd prefer if everyone used the same
#ubuntu-asahi · 2024-03-03 23:28
eslerm[m]is there a package that configures apt ppas? or is it baked into the image?
#ubuntu-asahi · 2024-03-03 23:27
tobhe[m]but how?
#ubuntu-asahi · 2024-03-03 23:25
eslerm[m]on the new ppa, we could make sure folks have 9 months of supoort to upgrade between releases
#ubuntu-asahi · 2024-03-03 23:25
eslerm[m]what if we only migrated mantic's ppas?

plus ›