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

Sat Apr 30 08:01:57 UTC 2011

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 :(

I'll do a follow-up patch to fix git on the target, but that has *never* worked in yocto/oe-core. So please apply this patch to get at least fetching working with rm_work.

regards,

Koen

> 
> Sau!
> 
> 
>> Signed-off-by: Martin Jansa<Martin.Jansa at gmail.com>
>> Signed-off-by: Koen Kooi<koen at dominion.thruhere.net>
>> ---
>>  meta/recipes-devtools/git/git.inc        |    4 ++--
>>  meta/recipes-devtools/git/git_1.7.4.3.bb |    2 +-
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
>> index e1d1c71..843a1d3 100644
>> --- a/meta/recipes-devtools/git/git.inc
>> +++ b/meta/recipes-devtools/git/git.inc
>> @@ -14,8 +14,8 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk"
>>  inherit autotools
>> 
>>  do_install () {
>> -	oe_runmake install prefix=${D} bindir=${D}${bindir} gitexecdir=${D}${gitexecdir} \
>> -		template_dir=${D}${datadir}/git-core/templates \
>> +	oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \
>> +		template_dir=${datadir}/git-core/templates \
>>  		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
>>  }
>> 
>> diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.4.3.bb
>> index 603d2fd..2ff1ed5 100644
>> --- a/meta/recipes-devtools/git/git_1.7.4.3.bb
>> +++ b/meta/recipes-devtools/git/git_1.7.4.3.bb
>> @@ -1,6 +1,6 @@
>>  require git.inc
>> 
>> -PR = "r0"
>> +PR = "r1"
>> 
>>  EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
>>                   ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \