[Pkg-lustre-svn-commit] updated: [6cc6baf] Replaced no-darwin.patch
Marco Nelles
marco.nelles at credativ.de
Fri Jun 1 09:30:05 UTC 2012
The following commit has been merged in the master branch:
commit 6cc6baf732eb3e716260a1e4c85abc5cdf28dba0
Author: Marco Nelles <marco.nelles at credativ.de>
Date: Fri Jun 1 11:29:07 2012 +0200
Replaced no-darwin.patch
diff --git a/debian/patches/no-darwin.patch b/debian/patches/no-darwin.patch
index 88319d1..4660ea4 100644
--- a/debian/patches/no-darwin.patch
+++ b/debian/patches/no-darwin.patch
@@ -1,103 +1,49 @@
-## no-darwin.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
-## DP: Remove faulty 'if DARWIN' blocks from autoMakefile.am files
-## DP: Remove darwin subdirs from autoMakefile.am files
-
-Index: lustre/lnet/include/libcfs/Makefile.am
-===================================================================
---- lustre.orig/lnet/include/libcfs/Makefile.am 2011-11-16 13:56:06.000000000 +0100
-+++ lustre/lnet/include/libcfs/Makefile.am 2011-11-16 14:04:25.300096325 +0100
+diff --git a/libcfs/include/libcfs/Makefile.am b/libcfs/include/libcfs/Makefile.am
+index cd61d27..4997c78 100644
+--- a/libcfs/include/libcfs/Makefile.am
++++ b/libcfs/include/libcfs/Makefile.am
@@ -1,8 +1,8 @@
- SUBDIRS := linux
--if DARWIN
--SUBDIRS += darwin
--endif
--DIST_SUBDIRS := linux darwin winnt
-+#if DARWIN
-+#SUBDIRS += darwin
-+#endif
-+DIST_SUBDIRS := linux
-
- EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
- portals_utils.h types.h user-lock.h user-prim.h user-time.h \
-Index: lustre/lnet/include/lnet/Makefile.am
-===================================================================
---- lustre.orig/lnet/include/lnet/Makefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lnet/include/lnet/Makefile.am 2011-11-16 14:02:32.863538781 +0100
-@@ -1,10 +1,10 @@
- lnetdir=$(includedir)/lnet
-
- SUBDIRS := linux
+ SUBDIRS := linux posix util
-if DARWIN
-SUBDIRS += darwin
-endif
--DIST_SUBDIRS := linux darwin
-+#if DARWIN
-+#SUBDIRS += darwin
-+#endif
-+DIST_SUBDIRS := $(SUBDIRS)
-
- EXTRA_DIST = api.h api-support.h \
- lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
-Index: lustre/lnet/klnds/socklnd/autoMakefile.am
-===================================================================
---- lustre.orig/lnet/klnds/socklnd/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lnet/klnds/socklnd/autoMakefile.am 2011-11-16 14:02:32.867538805 +0100
-@@ -6,21 +6,21 @@
- endif # LINUX
- endif # MODULES
-
--if DARWIN
-+#if DARWIN
-+#
-+# macos_PROGRAMS := ksocklnd
-+#
-+# nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
-+#
-+# ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
-+# ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
-+# ksocklnd_LDADD := $(EXTRA_KLIBS)
-+#
-+# plist_DATA := Info.plist
-+# install_data_hook := fix-kext-ownership
-
-- macos_PROGRAMS := ksocklnd
--
-- nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
--
-- ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
-- ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
-- ksocklnd_LDADD := $(EXTRA_KLIBS)
--
-- plist_DATA := Info.plist
-- install_data_hook := fix-kext-ownership
--
-- EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
--endif # DARWIN
-+# EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
-+#endif # DARWIN
-
- install-data-hook: $(install_data_hook)
-
-Index: lustre/lnet/libcfs/autoMakefile.am
-===================================================================
---- lustre.orig/lnet/libcfs/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lnet/libcfs/autoMakefile.am 2011-11-16 14:02:32.875538844 +0100
+-DIST_SUBDIRS := linux posix util darwin
++# if DARWIN
++# SUBDIRS += darwin
++# endif
++DIST_SUBDIRS := linux posix util
+
+ EXTRA_DIST := curproc.h libcfs_private.h libcfs.h list.h lltrace.h \
+ user-lock.h user-prim.h user-time.h user-mem.h \
+diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
+index fc5f4f1..7995b76 100644
+--- a/libcfs/libcfs/autoMakefile.am
++++ b/libcfs/libcfs/autoMakefile.am
@@ -35,10 +35,10 @@
#
- SUBDIRS := linux
+ SUBDIRS := linux util posix
-if DARWIN
-SUBDIRS += darwin
-endif
--DIST_SUBDIRS := linux darwin
-+#if DARWIN
-+#SUBDIRS += darwin
-+#endif
-+DIST_SUBDIRS := $(SUBDIRS)
+-DIST_SUBDIRS := linux util posix darwin
++# if DARWIN
++# SUBDIRS += darwin
++# endif
++DIST_SUBDIRS := linux util posix
if LIBLUSTRE
noinst_LIBRARIES= libcfs.a
-@@ -53,25 +53,25 @@
+@@ -52,7 +52,7 @@ endif
+ lib_LIBRARIES = libcfsutil.a
+ libcfsutil_a_SOURCES = nidstrings.c util/parser.c \
+ util/l_ioctl.c util/util.c
+-libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS)
++libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS)
+ libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
+
+ if MODULES
+@@ -61,26 +61,26 @@ if LINUX
modulenet_DATA := libcfs$(KMODEXT)
endif
@@ -109,7 +55,8 @@ Index: lustre/lnet/libcfs/autoMakefile.am
- darwin/darwin-tcpip.c darwin/darwin-utils.c \
- darwin/darwin-debug.c darwin/darwin-proc.c \
- darwin/darwin-tracefile.c darwin/darwin-module.c \
-- debug.c module.c tracefile.c nidstrings.c watchdog.c
+- posix/posix-debug.c module.c tracefile.c nidstrings.c watchdog.c \
+- kernel_user_comm.c hash.c
-
-libcfs_CFLAGS := $(EXTRA_KCFLAGS)
-libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -120,33 +67,94 @@ Index: lustre/lnet/libcfs/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif
-+#if DARWIN
-+#macos_PROGRAMS := libcfs
++# if DARWIN
++# macos_PROGRAMS := libcfs
+#
-+#nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
-+# darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
-+# darwin/darwin-tcpip.c darwin/darwin-utils.c \
-+# darwin/darwin-debug.c darwin/darwin-proc.c \
-+# darwin/darwin-tracefile.c darwin/darwin-module.c \
-+# debug.c module.c tracefile.c nidstrings.c watchdog.c
++# nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
++# darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
++# darwin/darwin-tcpip.c darwin/darwin-utils.c \
++# darwin/darwin-debug.c darwin/darwin-proc.c \
++# darwin/darwin-tracefile.c darwin/darwin-module.c \
++# posix/posix-debug.c module.c tracefile.c nidstrings.c watchdog.c \
++# kernel_user_comm.c hash.c
+#
-+#libcfs_CFLAGS := $(EXTRA_KCFLAGS)
-+#libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#libcfs_LDADD := $(EXTRA_KLIBS)
++# libcfs_CFLAGS := $(EXTRA_KCFLAGS)
++# libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++# libcfs_LDADD := $(EXTRA_KLIBS)
+#
-+#plist_DATA := Info.plist
++# plist_DATA := Info.plist
+#
-+#install_data_hook := fix-kext-ownership
++# install_data_hook := fix-kext-ownership
+#
-+#endif
++# endif
endif
-Index: lustre/lnet/lnet/autoMakefile.am
-===================================================================
---- lustre.orig/lnet/lnet/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lnet/lnet/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -18,23 +18,23 @@
+diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am
+index 9b60bbd..b81c7b0 100644
+--- a/lnet/include/lnet/Makefile.am
++++ b/lnet/include/lnet/Makefile.am
+@@ -1,10 +1,10 @@
+ lnetdir=$(includedir)/lnet
+
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
+-DIST_SUBDIRS := linux darwin
++#if DARWIN
++#SUBDIRS += darwin
++#endif
++DIST_SUBDIRS := linux
+
+ EXTRA_DIST = api.h api-support.h \
+ lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
+diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
+index 9f6fca1..4966245 100644
+--- a/lnet/klnds/socklnd/autoMakefile.am
++++ b/lnet/klnds/socklnd/autoMakefile.am
+@@ -8,21 +8,21 @@ endif # MODULES
+
+ EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
+
+-if DARWIN
+-
+- macos_PROGRAMS := ksocklnd
+-
+- nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
+- EXTRA_DIST += socklnd_lib-darwin.c socklnd_lib-darwin.h
+-
+- ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
+- ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
+- ksocklnd_LDADD := $(EXTRA_KLIBS)
+-
+- plist_DATA := Info.plist
+- install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++# if DARWIN
++#
++# macos_PROGRAMS := ksocklnd
++#
++# nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
++# EXTRA_DIST += socklnd_lib-darwin.c socklnd_lib-darwin.h
++#
++# ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
++# ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
++# ksocklnd_LDADD := $(EXTRA_KLIBS)
++#
++# plist_DATA := Info.plist
++# install_data_hook := fix-kext-ownership
++#
++# endif # DARWIN
+
+ EXTRA_DIST += $(plist_DATA)
+ install-data-hook: $(install_data_hook)
+diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am
+index 4f6d14b..db36cc8 100644
+--- a/lnet/lnet/autoMakefile.am
++++ b/lnet/lnet/autoMakefile.am
+@@ -18,23 +18,23 @@ if LINUX
modulenet_DATA = lnet$(KMODEXT)
endif # LINUX
@@ -167,84 +175,112 @@ Index: lustre/lnet/lnet/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif # DARWIN
-+#if DARWIN
-+#macos_PROGRAMS := lnet
++# if DARWIN
++# macos_PROGRAMS := lnet
+#
-+#lnet_SOURCES := api-errno.c api-ni.c config.c
-+#lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
-+#lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
-+#lnet_SOURCES += acceptor.c peer.c
++# lnet_SOURCES := api-errno.c api-ni.c config.c
++# lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
++# lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
++# lnet_SOURCES += acceptor.c peer.c
+#
-+#lnet_CFLAGS := $(EXTRA_KCFLAGS)
-+#lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#lnet_LDADD := $(EXTRA_KLIBS)
++# lnet_CFLAGS := $(EXTRA_KCFLAGS)
++# lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
++# lnet_LDADD := $(EXTRA_KLIBS)
+#
-+#plist_DATA := Info.plist
++# plist_DATA := Info.plist
+#
-+#install_data_hook := fix-kext-ownership
++# install_data_hook := fix-kext-ownership
+#
-+#endif # DARWIN
++# endif # DARWIN
endif # MODULES
-Index: lustre/lustre/lov/autoMakefile.am
-===================================================================
---- lustre.orig/lustre/lov/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lustre/lov/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -46,29 +46,29 @@
+diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am
+index beb94e2..a70af96 100644
+--- a/lustre/lov/autoMakefile.am
++++ b/lustre/lov/autoMakefile.am
+@@ -46,42 +46,42 @@ if LINUX
modulefs_DATA = lov$(KMODEXT)
endif
-if DARWIN
-macos_PROGRAMS := lov
-+#if DARWIN
-+#macos_PROGRAMS := lov
-
+-
-lov_SOURCES := \
- lov_log.c \
-- lov_pool.c \
+- lov_pool.c \
- lov_obd.c \
- lov_pack.c \
- lov_request.c \
- lov_merge.c \
- lov_qos.c \
+- lov_dev.c \
+- lov_object.c \
+- lov_page.c \
+- lov_lock.c \
+- lov_io.c \
+- lovsub_dev.c \
+- lovsub_object.c \
+- lovsub_page.c \
+- lovsub_lock.c \
+- lovsub_io.c \
- lov_offset.c \
- lov_internal.h
-
-lov_CFLAGS := $(EXTRA_KCFLAGS)
-lov_LDFLAGS := $(EXTRA_KLDFLAGS)
-lov_LDADD := $(EXTRA_KLIBS)
-+#lov_SOURCES := \
-+# lov_log.c \
-+# lov_pool.c \
-+# lov_obd.c \
-+# lov_pack.c \
-+# lov_request.c \
-+# lov_merge.c \
-+# lov_qos.c \
-+# lov_offset.c \
-+# lov_internal.h
-+
-+#lov_CFLAGS := $(EXTRA_KCFLAGS)
-+#lov_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#lov_LDADD := $(EXTRA_KLIBS)
-
+-
-plist_DATA := Info.plist
-+#plist_DATA := Info.plist
-
+-
-install_data_hook := fix-kext-ownership
-+#install_data_hook := fix-kext-ownership
-
+-
-endif # DARWIN
-+#endif # DARWIN
++# if DARWIN
++# macos_PROGRAMS := lov
++#
++# lov_SOURCES := \
++# lov_log.c \
++# lov_pool.c \
++# lov_obd.c \
++# lov_pack.c \
++# lov_request.c \
++# lov_merge.c \
++# lov_qos.c \
++# lov_dev.c \
++# lov_object.c \
++# lov_page.c \
++# lov_lock.c \
++# lov_io.c \
++# lovsub_dev.c \
++# lovsub_object.c \
++# lovsub_page.c \
++# lovsub_lock.c \
++# lovsub_io.c \
++# lov_offset.c \
++# lov_internal.h
++#
++# lov_CFLAGS := $(EXTRA_KCFLAGS)
++# lov_LDFLAGS := $(EXTRA_KLDFLAGS)
++# lov_LDADD := $(EXTRA_KLIBS)
++#
++# plist_DATA := Info.plist
++#
++# install_data_hook := fix-kext-ownership
++#
++# endif # DARWIN
endif # MODULES
-Index: lustre/lustre/lvfs/autoMakefile.am
-===================================================================
---- lustre.orig/lustre/lvfs/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lustre/lvfs/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -85,21 +85,21 @@
+ install-data-hook: $(install_data_hook)
+
+-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
++MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
+diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
+index 9fe7838..ab34c56 100644
+--- a/lustre/lvfs/autoMakefile.am
++++ b/lustre/lvfs/autoMakefile.am
+@@ -82,21 +82,21 @@ fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
endif # LINUX
@@ -263,42 +299,58 @@ Index: lustre/lustre/lvfs/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif # DARWIN
-+#if DARWIN
++# if DARWIN
+#
-+#macos_PROGRAMS := lvfs
++# macos_PROGRAMS := lvfs
+#
-+#lvfs_SOURCES := lvfs_darwin.c
++# lvfs_SOURCES := lvfs_darwin.c
+#
-+#lvfs_CFLAGS := $(EXTRA_KCFLAGS)
-+#lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#lvfs_LDADD := $(EXTRA_KLIBS)
++# lvfs_CFLAGS := $(EXTRA_KCFLAGS)
++# lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++# lvfs_LDADD := $(EXTRA_KLIBS)
+#
-+#plist_DATA := Info.plist
++# plist_DATA := Info.plist
+#
-+#install_data_hook := fix-kext-ownership
++# install_data_hook := fix-kext-ownership
+#
-+#endif # DARWIN
++# endif # DARWIN
else # MODULES
-Index: lustre/lustre/obdclass/autoMakefile.am
-===================================================================
---- lustre.orig/lustre/obdclass/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lustre/obdclass/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -1,8 +1,8 @@
+@@ -106,5 +106,5 @@ endif # MODULES
+
+ install-data-hook: $(install_data_hook)
+
+-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
++MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
+ CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources
+diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
+index 9e15f8c..35e7129 100644
+--- a/lustre/obdclass/autoMakefile.am
++++ b/lustre/obdclass/autoMakefile.am
+@@ -1,15 +1,15 @@
SUBDIRS := linux
-if DARWIN
-SUBDIRS += darwin
-endif
-DIST_SUBDIRS := linux darwin
-+#if DARWIN
-+#SUBDIRS += darwin
-+#endif
-+DIST_SUBDIRS := $(SUBDIRS)
++# if DARWIN
++# SUBDIRS += darwin
++# endif
++DIST_SUBDIRS := linux
if LIBLUSTRE
-
-@@ -25,25 +25,25 @@
+ INCLUDES = -I$(SYSIO)/include
+ noinst_LIBRARIES = liblustreclass.a
+-liblustreclass_a_SOURCES = class_obd.c debug.c genops.c statfs_pack.c mea.c uuid.c
++liblustreclass_a_SOURCES = class_obd.c debug.c genops.c statfs_pack.c mea.c uuid.c
+ liblustreclass_a_SOURCES += lustre_handles.c lustre_peer.c lprocfs_status.c
+-liblustreclass_a_SOURCES += obdo.c obd_config.c llog.c llog_obd.c llog_cat.c
++liblustreclass_a_SOURCES += obdo.c obd_config.c llog.c llog_obd.c llog_cat.c
+ liblustreclass_a_SOURCES += llog_lvfs.c llog_swab.c capa.c
+ liblustreclass_a_SOURCES += lu_object.c cl_object.c lu_time.c lu_ref.c
+ liblustreclass_a_SOURCES += cl_page.c cl_lock.c cl_io.c
+@@ -27,26 +27,26 @@ modulefs_DATA = obdclass$(KMODEXT)
noinst_DATA = llog_test$(KMODEXT)
endif # LINUX
@@ -310,7 +362,8 @@ Index: lustre/lustre/obdclass/autoMakefile.am
- class_obd.c genops.c lprocfs_status.c \
- lustre_handles.c lustre_peer.c obd_config.c \
- obdo.c debug.c llog_ioctl.c uuid.c \
-- llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
+- llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c \
+- mea.c lu_object.c dt_object.c lu_ref.c
-
-obdclass_CFLAGS := $(EXTRA_KCFLAGS)
-obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -321,33 +374,43 @@ Index: lustre/lustre/obdclass/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif # DARWIN
-+#if DARWIN
-+#macos_PROGRAMS := obdclass
++# if DARWIN
++# macos_PROGRAMS := obdclass
+#
-+#obdclass_SOURCES := \
-+# darwin/darwin-module.c darwin/darwin-sysctl.c \
-+# class_obd.c genops.c lprocfs_status.c \
-+# lustre_handles.c lustre_peer.c obd_config.c \
-+# obdo.c debug.c llog_ioctl.c uuid.c \
-+# llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
++# obdclass_SOURCES := \
++# darwin/darwin-module.c darwin/darwin-sysctl.c \
++# class_obd.c genops.c lprocfs_status.c \
++# lustre_handles.c lustre_peer.c obd_config.c \
++# obdo.c debug.c llog_ioctl.c uuid.c \
++# llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c \
++# mea.c lu_object.c dt_object.c lu_ref.c
+#
-+#obdclass_CFLAGS := $(EXTRA_KCFLAGS)
-+#obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#obdclass_LDADD := $(EXTRA_KLIBS)
++# obdclass_CFLAGS := $(EXTRA_KCFLAGS)
++# obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
++# obdclass_LDADD := $(EXTRA_KLIBS)
+#
-+#plist_DATA := Info.plist
++# plist_DATA := Info.plist
+#
-+#install_data_hook := fix-kext-ownership
++# install_data_hook := fix-kext-ownership
+#
-+#endif # DARWIN
++# endif # DARWIN
endif # MODULES
-Index: lustre/lustre/obdecho/autoMakefile.am
-===================================================================
---- lustre.orig/lustre/obdecho/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lustre/obdecho/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -46,22 +46,22 @@
+diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/autoMakefile.am
+index 1b6409f..e9f81fc 100644
+--- a/lustre/obdecho/autoMakefile.am
++++ b/lustre/obdecho/autoMakefile.am
+@@ -36,7 +36,7 @@
+
+ if LIBLUSTRE
+ noinst_LIBRARIES = libobdecho.a
+-libobdecho_a_SOURCES = echo_client.c
++libobdecho_a_SOURCES = echo_client.c
+ libobdecho_a_CPPFLAGS = $(LLCPPFLAGS)
+ libobdecho_a_CFLAGS = $(LLCFLAGS)
+ endif
+@@ -46,25 +46,25 @@ if LINUX
modulefs_DATA = obdecho$(KMODEXT)
endif
@@ -367,30 +430,34 @@ Index: lustre/lustre/obdecho/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif # darwin
-+#if DARWIN
-+#macos_PROGRAMS := obdecho
-+#obdecho_SOURCES := \
-+# lproc_echo.c \
-+# echo.c \
-+# echo_client.c
++# if DARWIN
++# macos_PROGRAMS := obdecho
++# obdecho_SOURCES := \
++# lproc_echo.c \
++# echo.c \
++# echo_client.c
+#
-+#obdecho_CFLAGS := $(EXTRA_KCFLAGS)
-+#obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#obdecho_LDADD := $(EXTRA_KLIBS)
++# obdecho_CFLAGS := $(EXTRA_KCFLAGS)
++# obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
++# obdecho_LDADD := $(EXTRA_KLIBS)
+#
-+#plist_DATA := Info.plist
++# plist_DATA := Info.plist
+#
-+#install_data_hook := fix-kext-ownership
++# install_data_hook := fix-kext-ownership
+#
-+#endif # darwin
++# endif # darwin
endif # MODULES
-Index: lustre/lustre/osc/autoMakefile.am
-===================================================================
---- lustre.orig/lustre/osc/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lustre/osc/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -47,22 +47,22 @@
+ install-data-hook: $(install_data_hook)
+
+-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
++MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
+diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/autoMakefile.am
+index 1a94992..2780c45 100644
+--- a/lustre/osc/autoMakefile.am
++++ b/lustre/osc/autoMakefile.am
+@@ -50,31 +50,31 @@ if LINUX
modulefs_DATA = osc$(KMODEXT)
endif
@@ -399,7 +466,13 @@ Index: lustre/lustre/osc/autoMakefile.am
-
-osc_SOURCES := \
- osc_create.c \
-- osc_request.c
+- osc_dev.c \
+- osc_object.c \
+- osc_page.c \
+- osc_lock.c \
+- osc_io.c \
+- osc_request.c \
+- osc_quota.c
-
-osc_CFLAGS := $(EXTRA_KCFLAGS)
-osc_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -410,30 +483,40 @@ Index: lustre/lustre/osc/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif # Darwin
-+#if DARWIN
-+#macos_PROGRAMS := osc
++# if DARWIN
++# macos_PROGRAMS := osc
+#
-+#osc_SOURCES := \
-+# osc_create.c \
-+# osc_request.c
++# osc_SOURCES := \
++# osc_create.c \
++# osc_dev.c \
++# osc_object.c \
++# osc_page.c \
++# osc_lock.c \
++# osc_io.c \
++# osc_request.c \
++# osc_quota.c
+#
-+#osc_CFLAGS := $(EXTRA_KCFLAGS)
-+#osc_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#osc_LDADD := $(EXTRA_KLIBS)
++# osc_CFLAGS := $(EXTRA_KCFLAGS)
++# osc_LDFLAGS := $(EXTRA_KLDFLAGS)
++# osc_LDADD := $(EXTRA_KLIBS)
+#
-+#plist_DATA := Info.plist
++# plist_DATA := Info.plist
+#
-+#install_data_hook := fix-kext-ownership
++# install_data_hook := fix-kext-ownership
+#
-+#endif # Darwin
++# endif # Darwin
endif
-Index: lustre/lustre/ptlrpc/autoMakefile.am
-===================================================================
---- lustre.orig/lustre/ptlrpc/autoMakefile.am 2011-11-16 11:55:25.000000000 +0100
-+++ lustre/lustre/ptlrpc/autoMakefile.am 2011-11-16 14:02:32.883538883 +0100
-@@ -68,39 +68,39 @@
+ install-data-hook: $(install_data_hook)
+
+-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
++MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
+diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am
+index b34cc25..d9d4dff 100644
+--- a/lustre/ptlrpc/autoMakefile.am
++++ b/lustre/ptlrpc/autoMakefile.am
+@@ -69,46 +69,46 @@ if LINUX
modulefs_DATA = ptlrpc$(KMODEXT)
endif #LINUX
@@ -459,6 +542,13 @@ Index: lustre/lustre/ptlrpc/autoMakefile.am
- recov_thread.c \
- service.c \
- wiretest.c \
+- sec.c \
+- sec_bulk.c \
+- sec_gc.c \
+- sec_config.c \
+- sec_lproc.c \
+- sec_null.c \
+- sec_plain.c \
- $(LDLM_COMM_SOURCES)
-
-ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
@@ -470,39 +560,46 @@ Index: lustre/lustre/ptlrpc/autoMakefile.am
-install_data_hook := fix-kext-ownership
-
-endif # DARWIN
-+#if DARWIN
-+#macos_PROGRAMS := ptlrpc
-+#
-+#ptlrpc_SOURCES := \
-+# ptlrpc_module.c \
-+# client.c \
-+# connection.c \
-+# events.c \
-+# import.c \
-+# llog_client.c \
-+# llog_net.c \
-+# llog_server.c \
-+# lproc_ptlrpc.c \
-+# niobuf.c \
-+# pack_generic.c \
-+# pers.c \
-+# pinger.c \
-+# ptlrpcd.c \
-+# recover.c \
-+# recov_thread.c \
-+# service.c \
-+# wiretest.c \
-+# $(LDLM_COMM_SOURCES)
-+#
-+#ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
-+#ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#ptlrpc_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # DARWIN
++# if DARWIN
++# macos_PROGRAMS := ptlrpc
++#
++# ptlrpc_SOURCES := \
++# ptlrpc_module.c \
++# client.c \
++# connection.c \
++# events.c \
++# import.c \
++# llog_client.c \
++# llog_net.c \
++# llog_server.c \
++# lproc_ptlrpc.c \
++# niobuf.c \
++# pack_generic.c \
++# pers.c \
++# pinger.c \
++# ptlrpcd.c \
++# recover.c \
++# recov_thread.c \
++# service.c \
++# wiretest.c \
++# sec.c \
++# sec_bulk.c \
++# sec_gc.c \
++# sec_config.c \
++# sec_lproc.c \
++# sec_null.c \
++# sec_plain.c \
++# $(LDLM_COMM_SOURCES)
++#
++# ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
++# ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
++# ptlrpc_LDADD := $(EXTRA_KLIBS)
++#
++# plist_DATA := Info.plist
++#
++# install_data_hook := fix-kext-ownership
++#
++# endif # DARWIN
endif # MODULES
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list