makepkg: git apply does nothing, any hints?

Development on core packages and the distribution goes on in here.

makepkg: git apply does nothing, any hints?

Postby osnwt » Wed Feb 17, 2016 11:32 am

Hi,

I am new to ArchLinux[ARM] distro and was going to make a PREEMPT_RT kernel version (EDIT: done). As a first step, I installed ArchLinuxARM on UDOO-Quad board (no issues), installed base-devel and git packages, cloned the PKGBUILDs repository and tried to 'makepkg' in core/linux-armv7 directory. It looked like no issues, but I found that it builds 4.4.0 kernel instead of 4.4.1 as it should be.

Looking further I found that no one patch was applied by git apply from PKGBUILD script. After I renamed '.git' directory of PKGBUILDs repository to '.git-' to virtually 'remove' the repository, git apply worked.

So the question: is this an expected behavior (guess no)? How all things work with it right now? Any hints?

PS. I just copied the required directory of the package out of git tree and work with it. But the question remains...
Last edited by osnwt on Thu Feb 18, 2016 9:13 am, edited 1 time in total.
osnwt
 
Posts: 9
Joined: Wed Feb 17, 2016 10:00 am

Re: makepkg: git apply does nothing, any hints?

Postby WarheadsSE » Wed Feb 17, 2016 1:19 pm

Don't build inside the git checkout of PKGBUILDs/

Why? Because git inside of git. The src is a git tree, and you're attempting to use git apply inside a git tree that tried to checkout a git tree.

git-ception. Don't. It will be easily confused on the which tree you want 'git apply' to apply to.
Core Developer
Remember: Arch Linux ARM is entirely community donation supported!
WarheadsSE
Developer
 
Posts: 6727
Joined: Mon Oct 18, 2010 2:12 pm

Re: makepkg: git apply does nothing, any hints?

Postby osnwt » Wed Feb 17, 2016 1:30 pm

I won't ask if that was the case. At least for the kernel the src tree is NOT a git tree, it downloads a tarball which does not have .git directory. So that is not a git inside git.

Also this way I believe is recommended somewhere in FAQ: checkout PKGBUILDs repo, cd and makepkg. I might be wrong, though.

Finally, git manual says that if none of --index or --cached options are given, the 'git apply' only applies patch to the tree and does not require any git repository at all (and I imply it should not use/check for it in that case).

So while it is not an issue, I still wonder how it works for all.
osnwt
 
Posts: 9
Joined: Wed Feb 17, 2016 10:00 am

Re: makepkg: git apply does nothing, any hints?

Postby WarheadsSE » Wed Feb 17, 2016 2:03 pm

if it is not a git src tree, why are you using git apply?
Core Developer
Remember: Arch Linux ARM is entirely community donation supported!
WarheadsSE
Developer
 
Posts: 6727
Joined: Mon Oct 18, 2010 2:12 pm

Re: makepkg: git apply does nothing, any hints?

Postby osnwt » Wed Feb 17, 2016 2:07 pm

Not me, but you (makers of PKGBUILD for linux-armv7):

https://github.com/archlinuxarm/PKGBUIL ... 7/PKGBUILD

Line 57 and below.
osnwt
 
Posts: 9
Joined: Wed Feb 17, 2016 10:00 am

Re: makepkg: git apply does nothing, any hints?

Postby WarheadsSE » Wed Feb 17, 2016 7:39 pm

Ahhhhh
Core Developer
Remember: Arch Linux ARM is entirely community donation supported!
WarheadsSE
Developer
 
Posts: 6727
Joined: Mon Oct 18, 2010 2:12 pm


Return to Arch Linux ARM

Who is online

Users browsing this forum: No registered users and 2 guests