Fwd: problem compiling ctdb

[Stefan (metze) Metzmacher]

Stefan (metze) Metzmacher schrieb:
> Hi Ronnie,
> 
>> Thanks for help. Since I do not have git, I used "rsync -avz
>> samba.org::ftp/unpacked/ctdb ." that was recomended by ctdb wiki. It
>> looks like this code is old.
>> Finally, I found http://ctdb.samba.org/packages/redhat/RHEL5/ that
>> contains relatively updated code.
> 
> The problem was that there where a non-fast forward change in the
> master tree.
> 
> ctdb.git# git remote update
> Updating origin
> * refs/heads/master: not updating to non-fast forward branch 'master' of
> git://git.samba.org/sahlberg/ctdb
>   old...new: ea5fd7a...af1b3de
> fetch origin: command returned error: 1
> 
> How do you push commits? git push or plain rsync?
> The 'config' file has [receive] denyNonFastForwards = true
> That's why I don't understand how this can happen...

ctdb.git$ git diff ea5fd7a ctdb-1.0.77|cat
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 01d2558..a917b58 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -119,7 +119,7 @@ fi
 %{_bindir}/ctdb
 %{_bindir}/smnotify
 %{_bindir}/ctdb_ipmux
-%{_bindir}/ctdB_diagnostics
+%{_bindir}/ctdb_diagnostics
 %{_bindir}/onnode
 %{_mandir}/man1/ctdb.1.gz
 %{_mandir}/man1/ctdbd.1.gz

I'll fix the unpacked area now, but we should avoid things like this in
future:-)

metze
>> On Wed, Jun 3, 2009 at 1:04 AM, ronnie sahlberg
>> <ronniesahlberg at gmail.com> wrote:
>>> Please update to latest GIT and try again.
>>>
>>> IPMUX has been removed since it is obsolete and replaced by the much better
>>> LVS solution.
>>>
>>>
>>>
>>> On Wed, Jun 3, 2009 at 12:46 AM, Evgeny Privarotskiy <pea1999 at gmail.com>
>>> wrote:
>>>> Hello ,
>>>>
>>>> I am trying to compile ctdb. I pull latest version 2-Jun-2009.
>>>> During make it fails with error:
>>>>
>>>> Compiling utils/ipmux/ipmux.c
>>>> In file included from /usr/include/linux/netfilter_ipv4/ip_queue.h:10,
>>>>                 from /usr/include/libipq.h:37,
>>>>                 from utils/ipmux/ipmux.c:31:
>>>> /usr/include/linux/if.h:59: error: redefinition of `struct ifmap'
>>>> /usr/include/linux/if.h:77: error: redefinition of `struct ifreq'
>>>> /usr/include/linux/if.h:126: error: redefinition of `struct ifconf'
>>>> make: *** [utils/ipmux/ipmux.o] Error 1
>>>>
>>>>
>>>> After some investigation, I found out that there two conflicting includes:
>>>>
>>>> 1. utils/ipmux/ipmux.c -> ./include/includes.h ->
>>>> ./lib/replace/system/network.h->/usr/include/net/if.h
>>>> 2. utils/ipmux/ipmux.c-> /usr/include/libipq.h ->
>>>> /usr/include/linux/netfilter_ipv4/ip_queue.h ->
>>>> /usr/include/linux/if.h
>>>>
>>>> How can I resolve this conflict?
>>>>
>>>> Thanks in advance,
>>>>  Evgeny Privarotskiy
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://lists.samba.org/archive/samba-technical/attachments/20090603/235ee9a1/signature.bin