[Pkg-lustre-svn-commit] r434 - in /trunk/debian/patches: 00list autogen.sh.dpatch no-darwin.dpatch
goswin-guest at users.alioth.debian.org
goswin-guest at users.alioth.debian.org
Wed Feb 13 11:38:08 UTC 2008
Author: goswin-guest
Date: Wed Feb 13 11:38:08 2008
New Revision: 434
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=434
Log:
Add missing autogen.sh scripts.
Fix automake errors by removing darwin support.
Added:
trunk/debian/patches/no-darwin.dpatch (with props)
Modified:
trunk/debian/patches/00list
trunk/debian/patches/autogen.sh.dpatch
Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=434&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Feb 13 11:38:08 2008
@@ -8,6 +8,7 @@
no_default_debugging.dpatch
no-m64.dpatch
autogen.sh.dpatch
+no-darwin.dpatch
remove-set_tunables.dpatch
libsysio.dpatch
remove-fiemaph.dpatch
Modified: trunk/debian/patches/autogen.sh.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/autogen.sh.dpatch?rev=434&op=diff
==============================================================================
--- trunk/debian/patches/autogen.sh.dpatch (original)
+++ trunk/debian/patches/autogen.sh.dpatch Wed Feb 13 11:38:08 2008
@@ -1,14 +1,20 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## autogen.dpatch by Goswin von Brederlow <brederlo at informatik.uni-tuebingen.de>
+## autogen.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: autogen.sh script from lustre upstream
+## DP: autogen.sh script from lustre upstream cvs for 1.6.4.2
@DPATCH@
diff -urNad lustre-1.6.4.2~/autogen.sh lustre-1.6.4.2/autogen.sh
--- lustre-1.6.4.2~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/autogen.sh 2008-02-13 11:21:09.670947511 +0100
-@@ -0,0 +1,140 @@
++++ lustre-1.6.4.2/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,2 @@
++#!/bin/sh
++exec bash build/autogen.sh $@
+diff -urNad lustre-1.6.4.2~/build/autogen.sh lustre-1.6.4.2/build/autogen.sh
+--- lustre-1.6.4.2~/build/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/build/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# taken from gnome-common/macros2/autogen.sh
@@ -89,10 +95,18 @@
+}
+
+echo "Checking for a complete tree..."
-+# required directories
-+for dir in build lnet lustre ; do
++if [ -d kernel_patches ] ; then
++ # This is ldiskfs
++ REQUIRED_DIRS="build"
++ CONFIGURE_DIRS=""
++else
++ REQUIRED_DIRS="build lnet lustre"
++ OPTIONAL_DIRS="snmp portals"
++ CONFIGURE_DIRS="libsysio ldiskfs"
++fi
++
++for dir in $REQUIRED_DIRS ; do
+ if [ ! -d "$dir" ] ; then
-+ pwd
+ cat >&2 <<EOF
+Your tree seems to be missing $dir.
+Please read README.lustrecvs for details.
@@ -101,8 +115,8 @@
+ fi
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
+done
-+# some are optional
-+for dir in snmp portals; do
++# optional directories for Lustre
++for dir in $OPTIONAL_DIRS; do
+ if [ -d "$dir" ] ; then
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
+ fi
@@ -112,46 +126,32 @@
+check_version autoconf autoconf "2.57"
+
+echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS
++aclocal-1.7 $ACLOCAL_FLAGS || exit 1
+echo "Running autoheader..."
-+autoheader
++autoheader || exit 1
+echo "Running automake-1.7..."
-+automake-1.7 -a -c
++automake-1.7 -a -c || exit 1
+echo "Running autoconf..."
-+autoconf
-+
-+pushd ldiskfs >/dev/null
-+echo "Running ldiskfs aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS
-+echo "Running ldiskfs autoheader..."
-+autoheader
-+echo "Running ldiskfs automake-1.7..."
-+automake-1.7 -a -c
-+echo "Running ldiskfs autoconf..."
-+autoconf
-+popd >/dev/null
-+
-+#if [ -d libsysio ] ; then
-+# pushd libsysio >/dev/null
-+# echo "Running autogen for libsysio..."
-+# sh autogen.sh
-+# popd >/dev/null
-+#fi
-+
-+pushd libsysio >/dev/null
-+echo "Running libsysio aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS
-+echo "Running libsysio autoheader..."
-+autoheader
-+echo "Running libsysio automake-1.7..."
-+automake-1.7 -a -c
-+echo "Running libsysio autoconf..."
-+autoconf
-+popd >/dev/null
-+
-diff -urNad lustre-1.6.4.2~/autogen.sh~ lustre-1.6.4.2/autogen.sh~
---- lustre-1.6.4.2~/autogen.sh~ 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/autogen.sh~ 2008-02-13 11:20:25.000000000 +0100
++autoconf || exit 1
++
++# Run autogen.sh in these directories
++for dir in $CONFIGURE_DIRS; do
++ if [ -d $dir ] ; then
++ pushd $dir >/dev/null
++ echo "Running autogen for $dir..."
++ sh autogen.sh || exit $?
++ popd >/dev/null
++ fi
++done
+diff -urNad lustre-1.6.4.2~/ldiskfs/autogen.sh lustre-1.6.4.2/ldiskfs/autogen.sh
+--- lustre-1.6.4.2~/ldiskfs/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/ldiskfs/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,2 @@
++#!/bin/bash
++exec bash build/autogen.sh $@
+diff -urNad lustre-1.6.4.2~/ldiskfs/build/autogen.sh lustre-1.6.4.2/ldiskfs/build/autogen.sh
+--- lustre-1.6.4.2~/ldiskfs/build/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/ldiskfs/build/autogen.sh 2008-02-13 12:31:33.000000000 +0100
@@ -0,0 +1,128 @@
+#!/bin/bash
+
@@ -233,10 +233,18 @@
+}
+
+echo "Checking for a complete tree..."
-+# required directories
-+for dir in build lnet lustre ; do
++if [ -d kernel_patches ] ; then
++ # This is ldiskfs
++ REQUIRED_DIRS="build"
++ CONFIGURE_DIRS=""
++else
++ REQUIRED_DIRS="build lnet lustre"
++ OPTIONAL_DIRS="snmp portals"
++ CONFIGURE_DIRS="libsysio ldiskfs"
++fi
++
++for dir in $REQUIRED_DIRS ; do
+ if [ ! -d "$dir" ] ; then
-+ pwd
+ cat >&2 <<EOF
+Your tree seems to be missing $dir.
+Please read README.lustrecvs for details.
@@ -245,8 +253,8 @@
+ fi
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
+done
-+# some are optional
-+for dir in snmp portals; do
++# optional directories for Lustre
++for dir in $OPTIONAL_DIRS; do
+ if [ -d "$dir" ] ; then
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
+ fi
@@ -256,28 +264,29 @@
+check_version autoconf autoconf "2.57"
+
+echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS
++aclocal-1.7 $ACLOCAL_FLAGS || exit 1
+echo "Running autoheader..."
-+autoheader
++autoheader || exit 1
+echo "Running automake-1.7..."
-+automake-1.7 -a -c
++automake-1.7 -a -c || exit 1
+echo "Running autoconf..."
-+autoconf
-+
-+pushd ldiskfs >/dev/null
-+echo "Running ldiskfs aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS
-+echo "Running ldiskfs autoheader..."
-+autoheader
-+echo "Running ldiskfs automake-1.7..."
-+automake-1.7 -a -c
-+echo "Running ldiskfs autoconf..."
-+autoconf
-+popd >/dev/null
-+
-+if [ -d libsysio ] ; then
-+ pushd libsysio >/dev/null
-+ echo "Running autogen for libsysio..."
-+ sh autogen.sh
-+ popd >/dev/null
-+fi
++autoconf || exit 1
++
++# Run autogen.sh in these directories
++for dir in $CONFIGURE_DIRS; do
++ if [ -d $dir ] ; then
++ pushd $dir >/dev/null
++ echo "Running autogen for $dir..."
++ sh autogen.sh || exit $?
++ popd >/dev/null
++ fi
++done
+diff -urNad lustre-1.6.4.2~/libsysio/autogen.sh lustre-1.6.4.2/libsysio/autogen.sh
+--- lustre-1.6.4.2~/libsysio/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/libsysio/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,5 @@
++#!/bin/sh
++
++aclocal &&
++automake --add-missing --copy &&
++${AUTOCONF:-autoconf}
Added: trunk/debian/patches/no-darwin.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/no-darwin.dpatch?rev=434&op=file
==============================================================================
--- trunk/debian/patches/no-darwin.dpatch (added)
+++ trunk/debian/patches/no-darwin.dpatch Wed Feb 13 11:38:08 2008
@@ -1,0 +1,511 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-darwin.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove faulty 'if DARWIN' blocks from autoMakefile.am files
+## DP: Remove darwin subdirs from autoMakefile.am files
+
+ at DPATCH@
+diff -urNad lustre-1.6.4.2~/autoMakefile.am lustre-1.6.4.2/autoMakefile.am
+--- lustre-1.6.4.2~/autoMakefile.am 2007-11-29 17:07:35.000000000 +0100
++++ lustre-1.6.4.2/autoMakefile.am 2008-02-13 12:21:35.404819056 +0100
+@@ -3,7 +3,7 @@
+ SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
+ RPM_SUBDIRS := @LDISKFS_SUBDIR@
+ if LDISKFS_ENABLED
+-EXTRA_SOURCES := @SYMVERFILE@
++#EXTRA_SOURCES := @SYMVERFILE@
+ endif
+
+ include build/autoMakefile.am.toplevel
+diff -urNad lustre-1.6.4.2~/lnet/include/libcfs/Makefile.am lustre-1.6.4.2/lnet/include/libcfs/Makefile.am
+--- lustre-1.6.4.2~/lnet/include/libcfs/Makefile.am 2007-09-28 23:46:33.000000000 +0200
++++ lustre-1.6.4.2/lnet/include/libcfs/Makefile.am 2008-02-13 12:20:52.799318804 +0100
+@@ -1,7 +1,7 @@
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+
+ EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
+diff -urNad lustre-1.6.4.2~/lnet/include/lnet/Makefile.am lustre-1.6.4.2/lnet/include/lnet/Makefile.am
+--- lustre-1.6.4.2~/lnet/include/lnet/Makefile.am 2007-06-22 08:47:49.000000000 +0200
++++ lustre-1.6.4.2/lnet/include/lnet/Makefile.am 2008-02-13 12:20:52.799318804 +0100
+@@ -1,9 +1,9 @@
+ lnetdir=$(includedir)/lnet
+
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+
+ EXTRA_DIST = api.h api-support.h \
+diff -urNad lustre-1.6.4.2~/lnet/klnds/socklnd/autoMakefile.am lustre-1.6.4.2/lnet/klnds/socklnd/autoMakefile.am
+--- lustre-1.6.4.2~/lnet/klnds/socklnd/autoMakefile.am 2007-02-10 01:04:51.000000000 +0100
++++ lustre-1.6.4.2/lnet/klnds/socklnd/autoMakefile.am 2008-02-13 12:23:08.278650532 +0100
+@@ -8,23 +8,23 @@
+
+ DIST_SOURCES := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
+
+-if DARWIN
+-
+- macos_PROGRAMS := ksocklnd
+-
+- nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_modparams.c socklnd_lib-darwin.c
+- DIST_SOURCES += 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_modparams.c socklnd_lib-darwin.c
++# DIST_SOURCES += 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
++#
++# EXTRA_DIST := $(plist_DATA)
++#endif # DARWIN
+
+-EXTRA_DIST := $(plist_DATA)
+ install-data-hook: $(install_data_hook)
+
+ MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ socklnd_lib.c
+diff -urNad lustre-1.6.4.2~/lnet/libcfs/autoMakefile.am lustre-1.6.4.2/lnet/libcfs/autoMakefile.am
+--- lustre-1.6.4.2~/lnet/libcfs/autoMakefile.am 2007-09-28 23:46:34.000000000 +0200
++++ lustre-1.6.4.2/lnet/libcfs/autoMakefile.am 2008-02-13 12:20:52.800318651 +0100
+@@ -4,9 +4,9 @@
+ # See the file COPYING in this distribution
+
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+
+ if LIBLUSTRE
+@@ -22,25 +22,25 @@
+ modulenet_DATA := libcfs$(KMODEXT)
+ endif
+
+-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
+-
+-libcfs_CFLAGS := $(EXTRA_KCFLAGS)
+-libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
+-libcfs_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif
++#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
++#
++#libcfs_CFLAGS := $(EXTRA_KCFLAGS)
++#libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++#libcfs_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif
+
+ endif
+
+diff -urNad lustre-1.6.4.2~/lnet/lnet/autoMakefile.am lustre-1.6.4.2/lnet/lnet/autoMakefile.am
+--- lustre-1.6.4.2~/lnet/lnet/autoMakefile.am 2007-02-10 01:05:00.000000000 +0100
++++ lustre-1.6.4.2/lnet/lnet/autoMakefile.am 2008-02-13 12:20:52.800318651 +0100
+@@ -18,23 +18,23 @@
+ modulenet_DATA = lnet$(KMODEXT)
+ endif # LINUX
+
+-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_CFLAGS := $(EXTRA_KCFLAGS)
+-lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lnet_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#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_CFLAGS := $(EXTRA_KCFLAGS)
++#lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lnet_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ endif # MODULES
+
+diff -urNad lustre-1.6.4.2~/lustre/lov/autoMakefile.am lustre-1.6.4.2/lustre/lov/autoMakefile.am
+--- lustre-1.6.4.2~/lustre/lov/autoMakefile.am 2007-02-10 07:32:08.000000000 +0100
++++ lustre-1.6.4.2/lustre/lov/autoMakefile.am 2008-02-13 12:20:52.801318499 +0100
+@@ -15,28 +15,28 @@
+ modulefs_DATA = lov$(KMODEXT)
+ endif
+
+-if DARWIN
+-macos_PROGRAMS := lov
+-
+-lov_SOURCES := \
+- lov_log.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
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := lov
++#
++#lov_SOURCES := \
++# lov_log.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
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ endif # MODULES
+
+diff -urNad lustre-1.6.4.2~/lustre/lvfs/autoMakefile.am lustre-1.6.4.2/lustre/lvfs/autoMakefile.am
+--- lustre-1.6.4.2~/lustre/lvfs/autoMakefile.am 2007-07-26 08:46:08.000000000 +0200
++++ lustre-1.6.4.2/lustre/lvfs/autoMakefile.am 2008-02-13 12:20:52.801318499 +0100
+@@ -48,21 +48,21 @@
+
+ endif # LINUX
+
+-if DARWIN
+-
+-macos_PROGRAMS := lvfs
+-
+-lvfs_SOURCES := lvfs_darwin.c
+-
+-lvfs_CFLAGS := $(EXTRA_KCFLAGS)
+-lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lvfs_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#
++#macos_PROGRAMS := lvfs
++#
++#lvfs_SOURCES := lvfs_darwin.c
++#
++#lvfs_CFLAGS := $(EXTRA_KCFLAGS)
++#lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lvfs_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ else # MODULES
+
+diff -urNad lustre-1.6.4.2~/lustre/obdclass/autoMakefile.am lustre-1.6.4.2/lustre/obdclass/autoMakefile.am
+--- lustre-1.6.4.2~/lustre/obdclass/autoMakefile.am 2007-07-26 08:24:11.000000000 +0200
++++ lustre-1.6.4.2/lustre/obdclass/autoMakefile.am 2008-02-13 12:20:52.801318499 +0100
+@@ -1,7 +1,7 @@
+ SUBDIRS := linux
+-if DARWIN
+-SUBDIRS += darwin
+-endif
++#if DARWIN
++#SUBDIRS += darwin
++#endif
+ DIST_SUBDIRS := $(SUBDIRS)
+
+ if LIBLUSTRE
+@@ -25,25 +25,25 @@
+ noinst_DATA = llog_test$(KMODEXT)
+ endif # LINUX
+
+-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_CFLAGS := $(EXTRA_KCFLAGS)
+-obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
+-obdclass_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#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_CFLAGS := $(EXTRA_KCFLAGS)
++#obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
++#obdclass_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ endif # MODULES
+
+diff -urNad lustre-1.6.4.2~/lustre/obdecho/autoMakefile.am lustre-1.6.4.2/lustre/obdecho/autoMakefile.am
+--- lustre-1.6.4.2~/lustre/obdecho/autoMakefile.am 2007-02-10 07:32:38.000000000 +0100
++++ lustre-1.6.4.2/lustre/obdecho/autoMakefile.am 2008-02-13 12:20:52.802318346 +0100
+@@ -15,22 +15,22 @@
+ modulefs_DATA = obdecho$(KMODEXT)
+ endif
+
+-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)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # darwin
++#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)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # darwin
+
+ endif # MODULES
+
+diff -urNad lustre-1.6.4.2~/lustre/osc/autoMakefile.am lustre-1.6.4.2/lustre/osc/autoMakefile.am
+--- lustre-1.6.4.2~/lustre/osc/autoMakefile.am 2007-02-10 07:32:45.000000000 +0100
++++ lustre-1.6.4.2/lustre/osc/autoMakefile.am 2008-02-13 12:20:52.802318346 +0100
+@@ -16,22 +16,22 @@
+ modulefs_DATA = osc$(KMODEXT)
+ endif
+
+-if DARWIN
+-macos_PROGRAMS := osc
+-
+-osc_SOURCES := \
+- osc_create.c \
+- osc_request.c
+-
+-osc_CFLAGS := $(EXTRA_KCFLAGS)
+-osc_LDFLAGS := $(EXTRA_KLDFLAGS)
+-osc_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # Darwin
++#if DARWIN
++#macos_PROGRAMS := osc
++#
++#osc_SOURCES := \
++# osc_create.c \
++# osc_request.c
++#
++#osc_CFLAGS := $(EXTRA_KCFLAGS)
++#osc_LDFLAGS := $(EXTRA_KLDFLAGS)
++#osc_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # Darwin
+
+ endif
+
+diff -urNad lustre-1.6.4.2~/lustre/ptlrpc/autoMakefile.am lustre-1.6.4.2/lustre/ptlrpc/autoMakefile.am
+--- lustre-1.6.4.2~/lustre/ptlrpc/autoMakefile.am 2007-09-07 11:32:23.000000000 +0200
++++ lustre-1.6.4.2/lustre/ptlrpc/autoMakefile.am 2008-02-13 12:20:52.802318346 +0100
+@@ -36,39 +36,39 @@
+ modulefs_DATA = ptlrpc$(KMODEXT)
+ endif #LINUX
+
+-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 \
++# $(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
+
Propchange: trunk/debian/patches/no-darwin.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-lustre-svn-commit
mailing list