!UUYziobKGGxpovWyAN:nixos.org

Robotnix

267 Members
Build Android (AOSP) using Nix | https://github.com/danielfullmer/robotnix85 Servers

Load older messages


SenderMessageTime
8 Sep 2021
@kranzes:matrix.orgkranzesoof00:20:12
@danielrf:matrix.orgdanielrf * At this point, I'd checkout https://github.com/ForkLineageOS/android_frameworks_base, try to revert that commit, and get a cleanly applying reverting patch00:20:25
@kranzes:matrix.orgkranzesIs there no other way, instead of having to keep now a fork of it?00:21:15
@kranzes:matrix.orgkranzesfetchpatch doesnt have something like a dirty patch00:21:23
@kranzes:matrix.orgkranzesor a forced patch00:21:27
@danielrf:matrix.orgdanielrfI don't believe so. You don't need to keep a persistent fork, you just need to create a patch that works against their repo.00:22:09
@danielrf:matrix.orgdanielrf I'd try using git revert and git format-patch 00:22:28
@kranzes:matrix.orgkranzes
In reply to @danielrf:matrix.org
I don't believe so. You don't need to keep a persistent fork, you just need to create a patch that works against their repo.
I don't get it then
00:22:44
@kranzes:matrix.orgkranzes
In reply to @danielrf:matrix.org
At this point, I'd checkout https://github.com/ForkLineageOS/android_frameworks_base, try to revert that commit, and get a cleanly applying reverting patch
How do i get a "cleanly applying reverting patch"?
00:24:15
@danielrf:matrix.orgdanielrf Sorry, I won't be able to help since I have some other work atm, but lots of the patches in robotnix were created by making local forks, applying changes and running git format-patch 00:24:26
@kranzes:matrix.orgkranzesAlright no worries00:24:58
@danielrf:matrix.orgdanielrfthen, when there are updates to the upstream sources, so long as the patches still apply, I shouldn't need to update my local fork of them00:25:10
@kranzes:matrix.orgkranzesI didn't get what you mean by "applying changes"00:25:43
@danielrf:matrix.orgdanielrf"applying changes" => "making new commits"00:26:04
@danielrf:matrix.orgdanielrfin this case, you want a commit that reverts the upstream MicroG changes00:26:17
@danielrf:matrix.orgdanielrfthen you convert that commit(s) to a patch which you use in robotnix00:26:28
@kranzes:matrix.orgkranzesAlright got it00:26:43
@kranzes:matrix.orgkranzesthanks00:26:44
@danielrf:matrix.orgdanielrfnp, good luck!00:26:51
@kranzes:matrix.orgkranzesGit revert used to work on this, but they changed something from what i can tell00:35:48
@kranzes:matrix.orgkranzes https://github.com/Kranzes/robotnix-personal/blob/main/flake.nix
https://github.com/Kranzes/robotnix-personal/blob/main/patches/revert-forklineageos-microg.patch
danielrf this works, its now building the rom!
00:54:28
@kranzes:matrix.orgkranzesimage.png
Download image.png
00:55:59
@kranzes:matrix.orgkranzesits time to go to bed now00:56:02
@kranzes:matrix.orgkranzesand let it compile overnight00:56:08
@danielrf:matrix.orgdanielrf Just tagged and pushed vanilla-2021090722. Tested working on sunfish. 06:59:29
@danielrf:matrix.orgdanielrf I've also has added support for barbet / Pixel 5a (5G). 07:02:35
@danielrf:matrix.orgdanielrfThis is untested in robotnix, but should likely work based on testing by users in other projects. If we have anyone here who has access to a Pixel 5a and would like to build/test, I'd love to hear any results.07:02:40
@cdesai:matrix.orgcde danielrf: if you have a build I don't mind testing. 07:11:31
@danielrf:matrix.orgdanielrfThanks. I'll start a build now and give you a link tomorrow. About to go to sleep07:12:49
* @cdesai:matrix.orgcde just woke up heh07:13:02

Show newer messages


Back to Room ListRoom Version: 6