#
…

2024-03-04

00:02eslerm[m]for mesa, I `git reset --hard` ubuntu/mantic to the first commit in mesa, and then rebased on the main asahi/mesa branch
00:02eslerm[m]just sent out a (hopefully final) lp build
00:03eslerm[m]if the build tests well, mesa and 6.6.0-1004 should be ready to publish
00:04tobhe[m]hm? why not just git reset --hard to the mesa release tag?
00:04eslerm[m]I was planning to pr my branch to ubuntuasahi/mesa's ubunt/mesa branch
00:04eslerm[m]and then pr ubuntu/mesa to main
00:05eslerm[m]these exist in the upstream branch, but are comitted at a different time
00:05eslerm[m]I reset to the intitial commit to make sure I wound the clock back far enough
00:05eslerm[m](I tried to do this more cautiously, and needed to go back and redo this)
00:06eslerm[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)/
00:06tobhe[m]if you plan to not merge you can just force push, so that shouldn't be a problem
00:06tobhe[m]just take asahi-20240228, add some debian build magic and call it done
00:07eslerm[m]most of it should be done, just waiting for builds to test well
00:09tobhe[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
00:12tobhe[m]since upstream rebases and force pushes regularly it might not even be possible to keep a linear commit history
00:12tobhe[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
00:15tobhe[m]but I would pick a different name for the Ubuntu tag
00:16tobhe[m]because now you have two remotes with conflicting tags and that confuses git (and humans)
00:18tobhe[m]normally I'd use something closer to the debain/changelog package version for the Ubuntu tag, see https://github.com/UbuntuAsahi/mesa/tags
00:18tobhe[m]underscore because tags can't have ~
00:27eslerm[m]ack, I can use `Ubuntu-24.0_pre20240228-0asahi3.23.10`
00:27eslerm[m]I wish the `3` was a `1` :)
00:28tobhe_why can't you use 1? because you already uploaded a few?
00:28tobhe_it doesn't really matter but those are per ppa so you can just upload it to another one if it bothers you
00:29eslerm[m]ok, can do since it won't impact github
00:29tobhe[m]but it really doesn't matter. looks like I used both 0 and 1 in the past
00:34eslerm[m]iiuc, if there is no changes the `0` would be dropped, and +`1` means downstream changes
00:36tobhe_mesa has a bit of a special version number anyway. but I couldn't come up with a better one
00:38tobhe_following that post it should probably be asahi1
00:39tobhe_but who starts counting at 1
00:40eslerm[m]the count starts at 0, but then text isn't added
00:41tobhe[m]but then you can't add the text later because 23.10
00:41tobhe[m]or maybe that should be at a different place
00:42tobhe[m]but I think it's normally at the end because it marks a forwardport/backport
00:42tobhe[m]too complicated for my simple mind 🙂
00:44eslerm[m]github doesn't like the tag 24.0~pre20240228-0asahi1.23.10, even though that's they syntax of the current tags
00:44tobhe[m]<tobhe[m]> "underscore because tags can't..." <- ^ this
00:45tobhe[m]also you can git tag on the command line and then push the tag
00:45tobhe[m]for better error messages
00:46eslerm[m]well, on my fork done
00:47eslerm[m]s/to/two/, s/0_pre20231121/0\_pre20231121/
05:03eslerm[m]new build runs ryujinx :)
08:50tobhe_nice! so the next step would be copying the kernel and mesa to asahi-testing
09:07tobhe[m]oh and build 22.04 mesa because otherwise your snaps will break once we push out the new kernel
19:32john-cabaj[m]Hopefully we have some people in the future buying these to test.
19:32john-cabaj[m]I will be financially strapped
19:32tobhe[m]finally two external displays supported by the hw
22:36glem has joined #ubuntu-asahi
23:00glem has quit [Quit: My Mac has gone to sleep. ZZZzzz…]
23:28glem has joined #ubuntu-asahi
…