Re: [CI] Changes needed to build the CVS version of CI.

[John B. <joh...@hp...>]

David B. Zafman wrote:
> The cluster_api.svc change doesn't build in an SSI kernel because although "gcc -E" is run,
> the CONFIG_SSI define isn't set.   The following changes work in my sandbox.  I haven't
> updated to 2.4.18 however.  The nsc_scalls.c change is fine.
> 
> --- ../sandbox.orig/cluster/util/icsgen Wed Feb 27 17:01:23 2002
> +++ cluster/util/icsgen Wed Oct 30 13:46:43 2002
> @@ -1045,7 +1045,7 @@
>         esac
>         $MSG "$NAME: Generating $GEN_TEXT for service $svc to $GEN_FILE"
>         eval "echo $copyright" >> $OUT_FILE
> -       cat $IN | $CPP $DEFINES - | $GEN_SUBR >>$OUT_FILE
> +       cat $IN | $CPP $DEFINES $CPPFLAGS - | $GEN_SUBR >>$OUT_FILE
>         if [ $? -ne 0 ]; then
>                 echo >&2 "$NAME: error generating $GEN_TEXT to $GEN_FILE"
>                 exit 2


I've checked in a slightly different fix for this as a part of my 2.4.18 
merge.

> 
> --- ../sandbox.orig/cluster/util/cluster_api.svc        Fri Jul 12 10:52:32 2002+++
> cluster/util/cluster_api.svc        Wed Oct 30 13:46:51 2002
> @@ -20,6 +20,8 @@
>   * Questions/Comments/Bugfixes to ci-...@li...
>   *
>   */
> +#include <linux/autoconf.h>
> +
>  service cluster_api cluster_api_svc 10 20
> 
>  /*
> @@ -36,6 +38,8 @@
>   param OUT int         *onlinecpus
>  }
> 
> +#ifdef CONFIG_CFS
> +
>  operation rcluster_get_mount NO_SIG_FORWARD {
>   param IN int          my_node
>   param INOUT int               *cookie
> @@ -45,3 +49,4 @@
>   param OUT:OOL:VAR char                **payload
>   param OUT:OOL:VAR char                **dev_name
>  }
> +#endif
>

It needs to be CONFIG_SSI.


> 
> 
> 
> 
> "Brian J. Watson" wrote:
> 
> 
>>Laura and Dave-
>>
>>These changes appear to affect your code. Are you both okay with them?
>>
>>-Brian
>>
>>"Aneesh Kumar K.V" wrote:
>>
>>>Hi,
>>>
>>> Attaching below is the changes needed to build the CVS version of CI.
>>>Mostly #ifdef changes. I am not sure i am using the right #ifdef . Can
>>>someone verify it and do the necessary checkin. ?
>>>
>>> -aneesh
>>>
>>>--- Cluster/ci-linux/ci-kernel/cluster/util/nsc_init.c  Thu Aug  8 05:30:57 2002
>>>+++ TEST/ci-linux/ci-kernel/cluster/util/nsc_init.c     Mon Oct 21 22:51:34 2002
>>>@@ -37,8 +37,8 @@
>>> #include <cluster/clms.h>
>>> #include <cluster/icsgen.h>
>>> #include <cluster/ics_proto.h>
>>>-#include <cluster/procfs.h>
>>> #ifdef CONFIG_SSI
>>>+#include <cluster/procfs.h>
>>> #include <cluster/ssi/ssidev.h>
>>> #endif /* CONFIG_SSI */
>>> #ifdef CONFIG_MOSIX_LL
>>>@@ -287,8 +287,10 @@
>>> #endif
>>> #endif /* NOTYET */
>>>
>>>+#ifdef CONFIG_SSI  /* Or should it be CONFIG_LDLVL ??*/
>>>        /* Create /proc/cluster/node# directory in /proc */
>>>        proc_cluster_init();
>>>+#endif
>>>
>>> #ifdef CONFIG_MOSIX_LL
>>>        init_mosix();
>>>
>>>--- Cluster/ci-linux/ci-kernel/cluster/util/nsc_scalls.c        Sun Oct  6 12:27:06 2002
>>>+++ TEST/ci-linux/ci-kernel/cluster/util/nsc_scalls.c   Mon Oct 21 22:37:45 2002
>>>@@ -44,7 +44,9 @@
>>> #include <cluster/synch.h>
>>> #include <cluster/ssisys.h>
>>> #include <cluster/table.h>
>>>+#ifdef CONFIG_CFS
>>> #include <cluster/ssi/cfs/cfs_mount.h>
>>>+#endif
>>>
>>> #include "ics_cluster_api_protos_gen.h"
>>> #include "ics_cluster_api_macros_gen.h"
>>>
>>>--- Cluster/ci-linux/ci-kernel/cluster/util/cluster_api.svc     Sat Jul 13 06:52:03 2002
>>>+++ TEST/ci-linux/ci-kernel/cluster/util/cluster_api.svc        Mon Oct 21 22:36:55 2002
>>>@@ -36,6 +36,8 @@
>>>        param OUT int                   *onlinecpus
>>> }
>>>
>>>+#ifdef CONFIG_CFS  /* Do we pass this flag when doing icsgen ? */
>>>+
>>> operation rcluster_get_mount NO_SIG_FORWARD {
>>>        param IN int                    my_node
>>>        param INOUT int                 *cookie
>>>@@ -45,3 +47,4 @@
>>>        param OUT:OOL:VAR char          **payload
>>>        param OUT:OOL:VAR char          **dev_name
>>> }
>>>+#endif
>>
>>-------------------------------------------------------
>>This sf.net email is sponsored by:ThinkGeek
>>Welcome to geek heaven.
>>http://thinkgeek.com/sf
>>_______________________________________________
>>ci-linux-devel mailing list
>>ci-...@li...
>>https://lists.sourceforge.net/lists/listinfo/ci-linux-devel
> 
> 
> --
> David B. Zafman                 | Hewlett-Packard Company
> mailto:dav...@hp...      | http://www.hp.com
> "Thus spake the master programmer:  When you have learned to snatch
> the error code from the trap frame, it will be time for you to leave."
> 
> 
> 
> 
> 
> -------------------------------------------------------
> This sf.net email is sponsored by: Influence the future 
> of Java(TM) technology. Join the Java Community 
> Process(SM) (JCP(SM)) program now. 
> http://ads.sourceforge.net/cgi-bin/redirect.pl?sunm0004en
> _______________________________________________
> ci-linux-devel mailing list
> ci-...@li...
> https://lists.sourceforge.net/lists/listinfo/ci-linux-devel
>