[Kdfs-commits] [tools]UNNAMED PROJECT branch, master, updated. ea51d9d6e21a6c9e7f4e671705904d89d965404d

[Pierre R. <pr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  ea51d9d6e21a6c9e7f4e671705904d89d965404d (commit)
       via  e74e387bf3c60d9a1b25fd4481a15fc9a68f531c (commit)
      from  99784aa03802a96d85649b18a1173e6637d26e57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ea51d9d6e21a6c9e7f4e671705904d89d965404d
Author: Pierre Riteau <Pie...@ir...>
Date:   Tue Oct 20 17:06:39 2009 +0200

    Add generated files to gitignore

diff --git a/.gitignore b/.gitignore
index 4246edc..9cc9f4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,7 @@ ncscope.*
 /stamp-h1
 Makefile.in
 Makefile
+
+tools/*
+!tools/*.c
+!tools/Makefile.am

commit e74e387bf3c60d9a1b25fd4481a15fc9a68f531c
Author: Pierre Riteau <Pie...@ir...>
Date:   Tue Oct 20 17:00:45 2009 +0200

    [FIX] Make mkfs_kdfs compile

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 484846e..24e0dda 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,7 @@
 ###
 dist_bin_SCRIPTS = krg_legacy_scheduler krgboot_helper krginit_helper
 
-bin_PROGRAMS = migrate checkpoint restart krgadm krgcapset krgcr-run krgboot krginit ipccheckpoint ipcrestart
+bin_PROGRAMS = migrate checkpoint restart krgadm krgcapset krgcr-run krgboot krginit ipccheckpoint ipcrestart mkfs_kdfs
 
 INCLUDES = -I@top_srcdir@/libs/include
 LDADD = @top_builddir@/libs/libkerrighed/libkerrighed.la @top_builddir@/libs/libkrgcb/libkrgcb.la
@@ -23,6 +23,7 @@ krgboot_SOURCES = krgboot.c
 krginit_SOURCES = krginit.c
 ipccheckpoint_SOURCES = ipccheckpoint.c
 ipcrestart_SOURCES = ipcrestart.c
+mkfs_kdfs_SOURCES = mkfs_kdfs.c
 
 EXTRA_DIST = krginit_helper.conf
 
diff --git a/utils/mkfs_kdfs.c b/tools/mkfs_kdfs.c
similarity index 98%
rename from utils/mkfs_kdfs.c
rename to tools/mkfs_kdfs.c
index 264bb87..c0399eb 100644
--- a/utils/mkfs_kdfs.c
+++ b/tools/mkfs_kdfs.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <asm/page.h>
+#include <sys/user.h>
 
 // for __cpu_to_le16
 #include <linux/byteorder/little_endian.h>
@@ -33,8 +33,7 @@
 #include <asm/types.h>
 
 /* KDDM includes */
-#include <kerrighed/sys/types.h>
-#include <kerrighed/krgnodemask.h>
+#include <krgnodemask.h>
 #include <kerrighed_tools.h>
 
 /* From "super.h": */

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                   |    4 ++++
 tools/Makefile.am            |    3 ++-
 {utils => tools}/mkfs_kdfs.c |    5 ++---
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename {utils => tools}/mkfs_kdfs.c (98%)


hooks/post-receive
-- 
UNNAMED PROJECT