[DRBD-cvs] svn commit by phil - r2782 - in trunk: . scripts - Ok, these changes should make it compile on opensuse10

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-03-05 11:21:36 +0100 (Mon, 05 Mar 2007)
New Revision: 2782

Modified:
   trunk/Makefile
   trunk/scripts/adjust_drbd_config_h.sh
Log:
Ok, these changes should make it compile on opensuse10 and SLES9 (7.147 kernel)
as well.


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-03-05 09:12:34 UTC (rev 2781)
+++ trunk/Makefile	2007-03-05 10:21:36 UTC (rev 2782)
@@ -168,6 +168,7 @@
 
 all tools doc .filelist: drbd/drbd_buildtag.c
 
+export KDIR KVER O
 KDIR := $(shell echo /lib/modules/`uname -r`/build)
 KVER := $(shell KDIR=$(KDIR) O=$(O) scripts/get_uts_release.sh)
 

Modified: trunk/scripts/adjust_drbd_config_h.sh
===================================================================
--- trunk/scripts/adjust_drbd_config_h.sh	2007-03-05 09:12:34 UTC (rev 2781)
+++ trunk/scripts/adjust_drbd_config_h.sh	2007-03-05 10:21:36 UTC (rev 2782)
@@ -80,6 +80,11 @@
   else
     have_sock_create_kern=0
   fi
+  if grep_q "dst_groups" $KDIR/include/linux/netlink.h ; then
+    have_nl_dst_groups=1
+  else
+    have_nl_dst_groups=0
+  fi
 else
     # not a 2.6. kernel. just leave it alone...
     exit 0
@@ -99,6 +104,8 @@
   { ( $have_kmem_cache_s ? '' : '//' ) . \$1}e;
  s{.*(#define DEFINE_SOCK_CREATE_KERN.*)}
   { ( $have_sock_create_kern ? '//' : '' ) . \$1}e;
+ s{.*(#define DRBD_NL_DST_GROUPS.*)}
+  { ( $have_nl_dst_groups ? '//' : '' ) . \$1}e;
  " \
 	  < ./linux/drbd_config.h \
 	  > ./linux/drbd_config.h.new