yashsingh1/xdaforums huggingface dataset:
[One (M8) Android Development] PunkUnity:
https://www.zerobin.net/?f5f7fd205cd820ee#X/2GHoHdg771QLKa+reQT2cPYBibgM3VpU60HFp0VFo=

---------- Post added at 07:02 PM ---------- Previous post was at 07:02 PM ----------

Oh ok, let me update my roomservice... my bad

---------- Post added at 07:04 PM ---------- Previous post was at 07:02 PM ----------

Oh, and add my repo to the kernel AND the device lines for roomservice?

---------- Post added at 07:06 PM ---------- Previous post was at 07:04 PM ----------

https://www.zerobin.net/?c6cd8fbb26e080da#cETXFhrEfw1OdCaAq95iS0+IUxYWtq5rdmMhYK79wBQ=

---------- Post added at 07:08 PM ---------- Previous post was at 07:06 PM ----------

root@sparkybox:~/android/slim/kernel/htc/msm8974# git push https://github.com/PunkUnity/kernel_htc_msm8974

Username for 'https://github.com': PunkUnity

Password for 'https://PunkUnity@github.com':

Counting objects: 27, done.

Delta compression using up to 2 threads.

Compressing objects: 100% (26/26), done.

Writing objects: 100% (27/27), 5.86 KiB | 0 bytes/s, done.

Total 27 (delta 24), reused 1 (delta 0)

To https://github.com/PunkUnity/kernel_htc_msm8974

a17630c..8e98868 lp5.0 -> lp5.0

root@sparkybox:~/android/slim/kernel/htc/msm8974#

---------- Post added at 07:10 PM ---------- Previous post was at 07:08 PM ----------

I think i got it!!

No errors on repo sync!

Building now....

---------- Post added at 07:41 PM ---------- Previous post was at 07:10 PM ----------

Nailed it! I think, lol

https://github.com/PunkUnity/kernel_htc_msm8974/commit/8e988685b8b9fb91d32ce38b995a95240d781f11
[One (M8) Android Development] fizbanrapper:
Check the commit on your github page. I left you a comment so you'd see where you missed a conflict. Resolve that and you should be good to go. Well done!
[One (M8) Android Development] PunkUnity:
Cant figure it out really yet lol. Your comment just says Oops, and it repeats several times. I see some highlighted areas throughout the commit, but I dont really understand it. I think its just showing what was added and what was removed. I dotn know what conflicts to resolve tho.
[One (M8) Android Development] fizbanrapper:
<<<<<<<<<<

=========

The code between those two lines is what git didn't expect to see when it applied the patch... because those items don't appear in the fetched source. Git doesn't know if you want to keep those lines or not. You must figure out what to do with it.

The code between the

=========

And the line that starts with

>>>>>>>>>>

is the code is trying to apply from your cherry-pick.

Delete the 3 lines with all the <<<&====&>>>> and you should be fine.

The **** after >>>>>> is just part of the commit message and needs to be deleted too.
[One (M8) Android Development] PunkUnity:
So in that head.S file it looks like I need to delete all this...

*/

#include <linux/linkage.h>

<<<<<<< HEAD

.arch	armv7-a

=======

#ifdef CONFIG_KEXEC_HARDBOOT

#include <asm/kexec.h>

#include <asm/memory.h>

#endif

>>>>>>> 42763cc... Add kexec-hardboot for MultiROM support

/*

Correct?

---------- Post added at 04:09 AM ---------- Previous post was at 04:07 AM ----------

@fizbanrapper

sorry if Im missing something here. Seems like what you're telling me and what I exactly see aren't completely the same so it looks confusing. Seems like I need to delete all I put above which is more than 3 lines...

---------- Post added at 04:19 AM ---------- Previous post was at 04:09 AM ----------

https://www.zerobin.net/?8d73142075486e67#SxQwS8qYbw69iLMG9f/cU1+vD0GOiDm98RMG89F+GVs=

---------- Post added at 04:27 AM ---------- Previous post was at 04:19 AM ----------

ended up deleting these 3 lines instead....

#include <linux/linkage.h>

#include <asm/kexec.h>

#include <asm/memory.h>

---------- Post added at 04:41 AM ---------- Previous post was at 04:27 AM ----------

That didnt work either. Last I'm going to set it all back the way it was again and am deleting these now. Then I'm going back to sleep lol

Head

.arch	armv7-a

42763cc...

---------- Post added at 05:07 AM ---------- Previous post was at 04:41 AM ----------

:eek: Still building.,.. good sign for now. Be back in a few hours.
[One (M8) Android Development] fizbanrapper:
Delete just these lines.

The original code itself is not actually in conflict, but all the **** above needs to go. Delete those 3 lines and only those 3.
[One (M8) Android Development] PunkUnity:
I didn't know what you meant by *****.

I think I got it now.

Thanks!

---------- Post added at 09:02 AM ---------- Previous post was at 08:51 AM ----------

I get this error now. It happened before too. I think I deleted too much maybe.

https://www.zerobin.net/?64ddff25db6de49e#yc8LeefeWNZIE8JrvmTtcVoo0U/DCHFJzta/e6q2teM=

---------- Post added at 09:21 AM ---------- Previous post was at 09:02 AM ----------

OK.... Im lost now. I deleted the lines correctly.... first link is error, second link is my actual head.S file. It's already edited how you said...

https://www.zerobin.net/?dad72ce4827f3ddf#dikS0myGVCRvkTW68wS2bdyMVAR1Xsa3YWS2VPLy1vA=

https://www.zerobin.net/?0bb306c98ca80515#+WmuXl9o2STPFjczPi6uE8onIJUqs9rHTDffAY2ljRo=

---------- Post added at 09:41 AM ---------- Previous post was at 09:21 AM ----------

I commit the changes and git push back to my github. Maybe I was not doing that step before....?
[One (M8) Android Development] PunkUnity:
This is my 'roomservice"

it's called slimz.xml which I think is ok, btu maybe I have my paths identified wrong still?

I dont think so, since when I change the file contents, it seems to fail in different places each time.

Worth a peak I guess tho

https://www.zerobin.net/?55cc1034feb49831#qaNZV/Kxjb8dX9wDVWjrwOdiLd61QJv8yJDPwMXWIIg=

---------- Post added at 11:08 AM ---------- Previous post was at 11:06 AM ----------

https://github.com/PunkUnity/kernel_htc_msm8974/commit/907d91c04bdcac29333150394e028fbd1c5105d6
[One (M8) Android Development] PunkUnity:
New commit

https://github.com/PunkUnity/kernel_htc_msm8974/commit/599a95a45493d74e2df23bec4c5291f1efcaed28

https://www.zerobin.net/?ff65a6b6c04f8524#3JfblfVK6o//tp08gjxSI/j8rxtJ78ntBF15zW+ZL/0=
[One (M8) Android Development] fizbanrapper:
2 out of 3... Next line needs to be fixed too.

Let's take a step back though. Your commits are to the lp5.0 branch, which is what you're building with according to your room service.xml, but you're building 5.1, so why not use lp5.1 branch? In fact, I'm not sure that lp5.0 branch will even work right before your first commit.

Here's what I'd do.

FYI to your github settings for that repo and change the default branch to lp5.1. That way you're looking at the right branch of your repo every time you go to it.

Now change your branch in roomservice to pull lp5.1 kernel.

Repo sync.

Make a build so you know everything is working right without any changes.

Now do your cherry-pick and resolve any conflicts.

Do not

git push

though, until you get a proper working build with the newly picked commit.

Also don't

repo sync

again until after you've done your git push.

Why? Repo sync will discard your commit. That's a good thing if you screw it up and want to start over. A bad thing if you got it right, but didn't git push.

This sounds like a huge pain, but it's what you need to do. You need to get practice with all of the things you're touching, and this will give you that.

The kexec patch should take you a while because of where you're at experience-wise. Don't get discouraged. A month from now you'll be able to do it in 5 minutes start to finish.
[One (M8) Android Development] PunkUnity:
For now I syncd from the stock kernel source and started a build. Just to get something out today. Then when it's done, i'll start reworking all that info. Thanks!
[One (M8) Android Development] fizbanrapper:
Makes sense. After you think you've got tree cherry-pick right and you're ready to try and build with it, instead of brunch m8, do

make bootimage

That will build just the kernel, ramdisk and dtb. If you're going to get an error in compiling the kernel, the above will get you there faster since you're not building any ROM crap with it.
[One (M8) Android Development] PunkUnity:
https://www.zerobin.net/?3695a8a4cf4e4108#EjMzqoh9tNFyqiKyvNpfbLnp7Gkk3BkuKAgfgcPKIoQ= [MENTION=5676253]fizbanrapper[/MENTION]

Idk. I think Im going to delete the 2 repos and start over. Im just getting too deep into repo hell lol
[One (M8) Android Development] fizbanrapper:
That's actually a pretty good idea when you're getting started. Good luck.
[One (M8) Android Development] PunkUnity:
sooo much BS lol. I deleted BOTH kernel src repos from my GitHub. I re-forked them both. Repo init slim 5.1 etc. Repo Sync finishes with:

Fetching projects: 100% (522/522), done.

Syncing work tree: 100% (522/522), done.

error: kernel/htc/msm8974/: prior sync failed; rebase still in progress

root@sparkybox:~/android/slim# git rebase --abort

No rebase in progress?

root@sparkybox:~/android/slim#

So IDK...

---------- Post added at 05:34 PM ---------- Previous post was at 05:33 PM ----------

https://www.zerobin.net/?709bbcd1e69abeca#0ttsFN5H+EBwuCr1hWWqnt10v/vLiuy0mcFT6iwUPr8=
[One (M8) Android Development] fizbanrapper:
Delete the msm8974 folder. Also find it in the .repo projects or project-objects folder and delete it there too.
[One (M8) Android Development] PunkUnity:
I fixed it through other methods lol. Repo sync clear now, We'll see what happens during this build haha

---------- Post added at 06:54 PM ---------- Previous post was at 06:52 PM ----------

and I still dont understand git check out that well, but Im getting almost everything else git wise. That little course I took helped
[One (M8) Android Development] PunkUnity:
OK started from scratch and seems to be going much much better now.

https://www.zerobin.net/?4b7f1c382d64bd98#b6XjkQwtqO2MCsPmjPDwP33ImQejdCpVdhifN71+MvU=

---------- Post added at 08:49 PM ---------- Previous post was at 08:46 PM ----------

and last shot at it until tomorrownight unless it fails real quick on this build. I should be able to figure out all the errors form here, hopefully. I see how you could probably do all this in a few minutes or so, but if you don't know how everything works it makes it real easy to break stuff and make it last for days lol. At least in my case haha. :fingers crossed:
[One (M8) Android Development] PunkUnity:
FAIL... damn

https://www.zerobin.net/?37578d7cccf9a443#hpXb3xgOl4sta8pHyVW6hEMaDpVSGuM7u4nzLMAVyxM=

Maybe I need to delete those lines again? From head.S?

---------- Post added at 10:21 PM ---------- Previous post was at 10:10 PM ----------

https://www.zerobin.net/?e640143ebcd42648#iSTg+9eh673RIn01kWTAOOhrydF9/UhVS+wZRMMYrtg=

Getting closer....

---------- Post added at 10:29 PM ---------- Previous post was at 10:21 PM ----------

https://github.com/PunkUnity/kernel_htc_msm8974/commit/9262fe45595d37642ccedd35292d55b73ea44f20

and ya, i missed the part to get a working build before i push and commit to my github repo. I wasn't getting the obvious fact that the local system and github can be 2 different versions of the same repo until you push, pull, commit, cherry pick, repo sync, etc... thats when the changes are transferred and merged in different ways. I seenow how all that works.... now I just need practice. I still dont understand how you understand how and what files need to be modified based on the errors outputted etc...
[One (M8) Android Development] ckvisme:
I'm only understanding 30% (or less ?) of what you are saying.. But I think it's awesome you r figuring it out and fizbanrapper jumping in too coach as needed.. This is part of what makes this such a great community... Great people, pulling together, sharing knowledge!
[One (M8) Android Development] PunkUnity:
Damn... I understood <5% a few days ago lol.... But I'm learning haha. Ya I like learning this and [MENTION=5676253]fizbanrapper[/MENTION] is a living saint! I really appreciate his hard work and patience with me through all this. I really look forward to working with him in the future. Hopefully a little more near his level! I'm taking a few basic courses on coding in general, as well as Java more specifically.

On a side not... more fails... I made a small change to the cm_m8_deconf file again... Im just missing something fundamental I think

https://www.zerobin.net/?334480050c27c5b4#zuibDDEfBt2KgLvX9JO8CK3glUmDeX/QyjiPD4nxmY0=

Building again. This time I didnt just keep pushing my small changes. Just rebuiulding until I nail it. Then I'll commit the change and merge it to my github! Thanks for all the help, patience and support form you all!

---------- Post added at 10:58 PM ---------- Previous post was at 10:49 PM ----------

https://www.zerobin.net/?7ca8d81290a6faf2#bbvGxmYJb5IWJPYUKl7Kt5YV1GMStmgAL80bOtEc4RE=

fail again. Gotta be close. I'll re-read everything, again, and see if I forgot something

---------- Post added at 11:18 PM ---------- Previous post was at 10:58 PM ----------

https://www.zerobin.net/?7ac760b952f71a98#wA6dMl9JvOaCt5DTMfDXALup/pCuDkmMo0bv1ikXeeY=

I'll paste the current state of the 2 files giving me trouble tomorrow sometime after work. Sorry I couldnt get the patch going everyone!
[One (M8) Android Development] ckvisme:
No worries [MENTION=4983354]SonneKonig[/MENTION]... holiday weekend for me so I haven't really had a chance to play with yesterday's build..

Lol, you doing GREAT...and in all fairness I can easily run Slim as a secondary... It's just nice to have the kexec ...like android, I'm all about options.. ?
[One (M8) Android Development] PunkUnity:
I'm on multirom with slim and it's the only/primary ROM installed.... So idk if it's a fluke but it works
[One (M8) Android Development] PunkUnity:
Side note: Whenever a build starts, this always happens... Good or bad builds....

find: `dummy': No such file or directory

seems like it automatically tries to find "dummy" and it never exists, and it takes a long time to do the search...

Maybe there's a script or something we can make to get rid of that, unless it's some critical function, because it seems like a waste and completely useless lol

---------- Post added at 08:53 AM ---------- Previous post was at 08:51 AM ----------

@fizbanrapper

it looks like it's failing due to **** I dont have in my file anymore! I've already deleted the lines it seems to be tripping out over. GRRR LOL

https://www.zerobin.net/?753ba4946f97a140#d/21AlArWxP/2iLce039g4LqJ2SJmtjMw0XYKZLfiDs=

Im pushing my files just so you can do a sanity check for me hahahaha. Let me know whenever is convenient for you.

---------- Post added at 08:59 AM ---------- Previous post was at 08:53 AM ----------

Im guessing we would have to add something to the make file or the envsetup.sh file.... Just a shot in the dark...

---------- Post added at 09:26 AM ---------- Previous post was at 08:59 AM ----------

https://www.zerobin.net/?5a2909b1605cb9a2#dnApsp7C54CoAB/+9U44KAkzyMbp1wzyCn06izGedrY=

---------- Post added at 09:29 AM ---------- Previous post was at 09:26 AM ----------

https://www.zerobin.net/?817653cf43ce673f#LL8Ffb9jG2JU90eENh7fb0xFvKe2hF4YFNdM3ZVtxhk=

my arch/arm/mach-msm/include/mach/memory.h file setup. Seems to be failing there too

---------- Post added at 10:11 AM ---------- Previous post was at 09:29 AM ----------

oot/android/slim/kernel/htc/msm8974/arch/arm/mach-msm/include/mach/memory.h:28:2: error: #error "Address for kexec hardboot page not defined"

#error "Address for kexec hardboot page not defined"

The address IS Defined! LOL> Its about the lease amount of errors I can nail it down to.
[One (M8) Android Development] fizbanrapper:
Add this line right under the kexec lines in your defconfig

CONFIG_ATAGS_PROC=y
[One (M8) Android Development] PunkUnity:
OK guys... Don't want to get any real hopes up, but... I at least compiled the correct boot.img today! Now I'm compiling the whole rom with that Kexec patch! Hope it finishes strong! Been building for over an hour

---------- Post added at 01:40 PM ---------- Previous post was at 01:29 PM ----------

When and if it finishes, I'll clean flash it on my phone and test it before posting it. Couple more hours to go max if everything goes well...
[One (M8) Android Development] PunkUnity:
OK, so I cherry picked, resolved the conflicts, then I git add -A, but I never did ccherry-pick --continue LOL... Im REALLY sorry guys... Build is still going, and if it works, will probably be a new regular build WITHOUT KEXEC patch. But I will come out on top. Im very into this and spending countless hours studying and trial and error, etc. Bare with me here.... please stand by....

---------- Post added at 04:41 PM ---------- Previous post was at 04:32 PM ----------

Might get lucky because, I think I re-modified the files needed to get kexec patched in, BEFORE I started my build... If so, then the cherry pick continue thing shouldn't matter, but it might, since Im still only around 60% up on the GitHub knowledge!
[One (M8) Android Development] ckvisme:
Keep it up!... Hell you just gave us a great build 2 days ago...lol, skill come from lots of practice..and it sounds like your getting plenty ?

In my experience (with everything in life) the people who jump in right at the start and slog through the mire, are those that end up being the best!
[One (M8) Android Development] tuxattack80:
[MENTION=4983354]SonneKonig[/MENTION] you're doing a heck of a job! Keep it up you'll get it and if you get to aggravated just walk away for a couple days to refresh. Sometimes that's the best thing to do, believe that's why I gave up building for awhile because I honestly burnt myself out lol.
[One (M8) Android Development] PunkUnity:
OK boys and girls. New build is uploading. Looks like we just went form ALPHA to a BETA build too. You can thank SlimRoms for that! Might be some goodies up in there. As for Kexec being patched into the kernel, well, you tell me lol. My Slim build doesnt need the patch for multirom support apparently, it just works for me. So ya, I really NEED a few people to test this out with multirom, wifi, audio, etc. You know the gig! BUT, at least I have some kind of build. AND, even if I have to start form scratch, which I doubt I will ever again, I know EXACTLY what to do, and what NOT to do! So redoing it and cherry-picking, merging, etc, I can do in under an hour now! Enjoy!

https://www.androidfilehost.com/?w=files&flid=34675

[MENTION=5676253]fizbanrapper[/MENTION]

[MENTION=6402880]ckvisme[/MENTION] [MENTION=4980163]tuxattack80[/MENTION]
[One (M8) Android Development] ckvisme:
Hoopla! Downloading now... Thx for hanging in there.. Awesome
[One (M8) Android Development] PunkUnity:
OH YA! Clean flash please! It went form Alpha to Beta, and the patch may or may not be in the kernel! So please clean flash this baby! Thanks! Have fun!
[One (M8) Android Development] tuxattack80:
Thanks for the new build and all the time invested!! Downloading right now, never used multirom but for the sake of testing I may give it a wirl in a while.... Want to feel out the new beta a little first though lol! Thanks again to both you guys
[One (M8) Android Development] ckvisme:
If you haven't tried multirom.. You really should, I like to flash and change stuff up daily... Well hourly sometimes... But then when I'm busy or just want to do whatever 20 seconds and boom I can be booted back to which ever rom I want... Great for testing and trying out new mods.

Booted and running good so far!

Negative on the multirom support on this one (bet the next build will though ?)

Thx for your work t really is a good rom.. Seems pretty smooth.. Time to play
[One (M8) Android Development] PunkUnity:
Ok. So, for some reason, unknown to me lol, I was not allowed to commit or push my final change that I made in /kernel/htc/msm8974/arch/arm/mach-msm/restart.c file. It's the same change I had to make previoisly in /kernel/htc/msm8974/arch/arm/boot/compressed/head.S. I don't know why it wouldn't let me make the change. Something to do with my "detached HEAD state" lol... So I made the change again, git commit add -a, then git status, then git push. I think I upstreamed the change, hopefully. Now I am compiling another boot.img to see if it fails or not. If all this doesn't work, then i'll start over. BUt that will be all done tomorrow. I declare tomorrow the definite end to all this madness. I don't quit, I set clear goals tho!
[One (M8) Android Development] tuxattack80:
On a bit of off topic yet very important news for this device it looks like CM may have just completely solved sound issues for the device according to the OP for the m8 in their thread!! Fingers crossed it's actually a go. May test it out a bit tomorrow and see if that's something that could possibly be pick worthy should land in tonights nightly :)

So far so good on newest build BTW!
[One (M8) Android Development] PunkUnity:
Ya, nice catch! Let me know what's going on over there if possible. I will indeed try and cherry pick that in here for everyone. I would really like to solve the KEXEC Patch first, if possible, and it is. But if I'm having trouble, then maybe I'll jump on that first instead. Might have to hold a vote lol. But If sound is a real issue for you guys, that seems more important than MuiltiROM. I won't abndon anything, and I wont give up! I'll push myself until I get this ROM dialed for you guys! Never be afraid to send me a PM or a hangouts message! If you feel like donating, then send it to [MENTION=5676253]fizbanrapper[/MENTION] and/or someone over at SlimRoms!

Thanks again!

Compiling new boot.img now.

---------- Post added at 07:44 PM ---------- Previous post was at 07:38 PM ----------

[MENTION=4980163]tuxattack80[/MENTION] [MENTION=6402880]ckvisme[/MENTION]

I just got a new boot.img

will someone test the NEWEST one out form my androidfilehost.com and see if that gets multirom working, thanks!

Don't forget to wipe dalvik and cache too please, just to be safe!

As always, have fun!

---------- Post added at 07:47 PM ---------- Previous post was at 07:44 PM ----------

https://www.androidfilehost.com/?fid=24052804347769847

---------- Post added at 08:14 PM ---------- Previous post was at 07:47 PM ----------

[/COLOR [MENTION=5676253]fizbanrapper[/MENTION]

This wasn't in the instructions lol

https://github.com/PunkUnity/kernel_htc_msm8974/commit/4a8121eaf65efe5fff203563b24dee6bde7207bc

Same BS tho haha

I really appreciate you teaching me this ****. Ya, ****! Cuz that's what it seems like when you have no F-ing clue what you're doing at first. MOstly I think it just takes time, and it really comes down to how dedicated you are to learn a new subject, of any kind, at an Adult age. It's usually either an obsessive hobby or your career that urges you to really learn what you're doing. I guess I fall into the former category. As do most our devs in the community I presume.

---------- Post added at 08:29 PM ---------- Previous post was at 08:14 PM ----------

If I get to the point where I need faster build times and can't afford a new slushbox, I might do soemthing like this.... opinions?

http://vmblog.com/archive/2014/02/1...builder-now-available-on-aws-marketplace.aspx

http://romfoundry.com/

---------- Post added at 08:30 PM ---------- Previous post was at 08:29 PM ----------

https://aws.amazon.com/marketplace/pp/B00HZ3NSPE/ref=_ptnr_aosp2_prweb_
[One (M8) Android Development] fizbanrapper:
I'm very happy to help! Google taught me everything I know, and that's not a good way to learn. Very inefficient. You seem to be doing very well with it.

As for the issues you're having, it is why I suggested that you may want to do a git clone to a directory outside of your slim build directory. No missing heads, overwritten commits or any other BS to deal with. It's a bit more painful to set up if you want to compile the kernel to test it, but it's doable.

I've been a bit short in my responses lately, but it's my first night back from a long weekend. Tomorrow I should be able to spend some more time on this with you.