[OE-core] [PATCH] git: use DESTDIR=$D instead prefixing all variables by $D

Khem Raj raj.khem at gmail.com
Tue May 3 19:07:07 UTC 2011


On Tue, May 3, 2011 at 11:36 AM, Koen Kooi <koen at dominion.thruhere.net> wrote:
>
> Op 3 mei 2011, om 01:11 heeft Khem Raj het volgende geschreven:
>
>> On Sat, Apr 30, 2011 at 1:01 AM, Koen Kooi <koen at dominion.thruhere.net> wrote:
>>>
>>> Op 30 apr 2011, om 00:09 heeft Saul Wold het volgende geschreven:
>>>
>>>> On 04/29/2011 03:13 AM, Koen Kooi wrote:
>>>>> From: Martin Jansa<martin.jansa at gmail.com>
>>>>>
>>>>> * with git-native and rm_work enabled I've noticed git fetcher errors like:
>>>>>   warning: templates not found /OE/shr-core/tmp/work/x86_64-linux/git-native-1.7.3.4-r0/image/OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/git-core/templates
>>>>>   fatal: Unable to find remote helper for 'http'
>>>>>   for every recipe using http:// for git repo
>>>>> * after this change template_dir points to
>>>>>   /OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/git-core/templates
>>>>>   without that workdir prefix
>>>>> * haven't tested target recipe, but I guess it needs different fix or
>>>>>   maybe it worked before and gets broken by this change (that's why this
>>>>>   is just RFC)
>>>>>
>>>> Is this still just an RFC or has it been tested on the target?
>>>
>>> On the target I get:
>>>
>>> strace -o /tmp/log git clone http://git.pingu.fi/xf86-video-omapfb
>>> Cloning into xf86-video-omapfb...
>>> fatal: Unable to find remote helper for 'http'
>>> root at beagleboard-core:~#
>>>
>>> It does find the templates:
>>>
>>> open("/usr/share/git-core/templates/", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 3
>>> open("/usr/share/git-core/templates/config", O_RDONLY|O_LARGEFILE) = -1 ENOENT (No such file or directory)
>>> lstat64("/usr/share/git-core/templates/branches", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
>>> open("/usr/share/git-core/templates/branches", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 4
>>> lstat64("/usr/share/git-core/templates/description", {st_mode=S_IFREG|0644, st_size=73, ...}) = 0
>>> open("/usr/share/git-core/templates/description", O_RDONLY|O_LARGEFILE) = 4
>>> lstat64("/usr/share/git-core/templates/hooks", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 4
>>> lstat64("/usr/share/git-core/templates/hooks/applypatch-msg.sample", {st_mode=S_IFREG|0755, st_size=452, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/applypatch-msg.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/post-receive.sample", {st_mode=S_IFREG|0755, st_size=552, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/post-receive.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/post-commit.sample", {st_mode=S_IFREG|0755, st_size=160, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/post-commit.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/update.sample", {st_mode=S_IFREG|0755, st_size=3611, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/update.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/pre-applypatch.sample", {st_mode=S_IFREG|0755, st_size=398, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/pre-applypatch.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/commit-msg.sample", {st_mode=S_IFREG|0755, st_size=896, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/commit-msg.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/post-update.sample", {st_mode=S_IFREG|0755, st_size=189, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/post-update.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/pre-commit.sample", {st_mode=S_IFREG|0755, st_size=1578, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/pre-commit.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/prepare-commit-msg.sample", {st_mode=S_IFREG|0755, st_size=1359, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/prepare-commit-msg.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/hooks/pre-rebase.sample", {st_mode=S_IFREG|0755, st_size=5011, ...}) = 0
>>> open("/usr/share/git-core/templates/hooks/pre-rebase.sample", O_RDONLY|O_LARGEFILE) = 6
>>> lstat64("/usr/share/git-core/templates/info", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
>>> open("/usr/share/git-core/templates/info", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 4
>>> lstat64("/usr/share/git-core/templates/info/exclude", {st_mode=S_IFREG|0644, st_size=240, ...}) = 0
>>> open("/usr/share/git-core/templates/info/exclude", O_RDONLY|O_LARGEFILE) = 6
>>>
>>> But that didn't work before since /usr/libexec/git-core isn't getting packaged.
>>>
>>> And I noticed this:
>>>
>>> koen at dominion:/OE/tentacle/sources/openembedded-core$ git grep gitexecdir
>>> meta/recipes-devtools/git/git.inc:      oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \
>>> koen at dominion:/OE/tentacle/sources/openembedded-core$
>>>
>>> 'gitexecdir' is undefined :(
>>>
>>
>> yeah and git/makefile defines it
>> gitexecdir = libexec/git-core
>>
>> may be we could set it to ${libdir}/git-core ?
>
> Nah, tools belong in libexec. Any objections to this or the followup patch?
>

saw that patch later seems good to me.
> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>




More information about the Openembedded-core mailing list