The following commit has been merged in the master branch: commit cc071ebf28974553e2944f2d75efa2616e23a738 Author: Patrick Winnertz <win...@debian.org> Date: Tue Jun 2 11:39:20 2009 +0200
Updated 00list and no-darwin.dpatch to work with 1.8.0 Signed-off-by: Patrick Winnertz <win...@debian.org> diff --git a/debian/patches/00list b/debian/patches/00list index 4318389..2475e1e 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -10,8 +10,6 @@ no-darwin.dpatch remove-set_tunables.dpatch libsysio.dpatch bug12769-ql-fix.dpatch -patchless_support_2.6.26.dpatch -#server_support_2.6.27.dpatch # Debian patches bash_completion.dpatch lustre_manpage.dpatch diff --git a/debian/patches/no-darwin.dpatch b/debian/patches/no-darwin.dpatch index 146bb4c..433bf7b 100755 --- a/debian/patches/no-darwin.dpatch +++ b/debian/patches/no-darwin.dpatch @@ -6,21 +6,21 @@ ## DP: Remove darwin subdirs from autoMakefile.am files @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 +diff -urNad lustre~/autoMakefile.am lustre/autoMakefile.am +--- lustre~/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 @@ -3,7 +3,7 @@ - SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre - RPM_SUBDIRS := @LDISKFS_SUBDIR@ + SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre + RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_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 +diff -urNad lustre~/lnet/include/libcfs/Makefile.am lustre/lnet/include/libcfs/Makefile.am +--- lustre~/lnet/include/libcfs/Makefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lnet/include/libcfs/Makefile.am 2009-06-02 11:36:40.000000000 +0200 @@ -1,7 +1,7 @@ SUBDIRS := linux -if DARWIN @@ -32,9 +32,9 @@ diff -urNad lustre-1.6.4.2~/lnet/include/libcfs/Makefile.am lustre-1.6.4.2/lnet/ 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 +diff -urNad lustre~/lnet/include/lnet/Makefile.am lustre/lnet/include/lnet/Makefile.am +--- lustre~/lnet/include/lnet/Makefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lnet/include/lnet/Makefile.am 2009-06-02 11:36:40.000000000 +0200 @@ -1,9 +1,9 @@ lnetdir=$(includedir)/lnet @@ -48,9 +48,9 @@ diff -urNad lustre-1.6.4.2~/lnet/include/lnet/Makefile.am lustre-1.6.4.2/lnet/in 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 +diff -urNad lustre~/lnet/klnds/socklnd/autoMakefile.am lustre/lnet/klnds/socklnd/autoMakefile.am +--- lustre~/lnet/klnds/socklnd/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lnet/klnds/socklnd/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 @@ -8,23 +8,23 @@ DIST_SOURCES := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h @@ -91,11 +91,11 @@ diff -urNad lustre-1.6.4.2~/lnet/klnds/socklnd/autoMakefile.am lustre-1.6.4.2/ln 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 +diff -urNad lustre~/lnet/libcfs/autoMakefile.am lustre/lnet/libcfs/autoMakefile.am +--- lustre~/lnet/libcfs/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lnet/libcfs/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 +@@ -35,9 +35,9 @@ + # SUBDIRS := linux -if DARWIN @@ -107,7 +107,7 @@ diff -urNad lustre-1.6.4.2~/lnet/libcfs/autoMakefile.am lustre-1.6.4.2/lnet/libc DIST_SUBDIRS := $(SUBDIRS) if LIBLUSTRE -@@ -22,25 +22,25 @@ +@@ -53,25 +53,25 @@ modulenet_DATA := libcfs$(KMODEXT) endif @@ -152,9 +152,9 @@ diff -urNad lustre-1.6.4.2~/lnet/libcfs/autoMakefile.am lustre-1.6.4.2/lnet/libc 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 +diff -urNad lustre~/lnet/lnet/autoMakefile.am lustre/lnet/lnet/autoMakefile.am +--- lustre~/lnet/lnet/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lnet/lnet/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 @@ -18,23 +18,23 @@ modulenet_DATA = lnet$(KMODEXT) endif # LINUX @@ -196,18 +196,21 @@ diff -urNad lustre-1.6.4.2~/lnet/lnet/autoMakefile.am lustre-1.6.4.2/lnet/lnet/a 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 @@ +diff -urNad lustre~/lustre/lov/autoMakefile.am lustre/lustre/lov/autoMakefile.am +--- lustre~/lustre/lov/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lustre/lov/autoMakefile.am 2009-06-02 11:37:25.000000000 +0200 +@@ -46,29 +46,29 @@ modulefs_DATA = lov$(KMODEXT) endif -if DARWIN -macos_PROGRAMS := lov -- ++#if DARWIN ++#macos_PROGRAMS := lov + -lov_SOURCES := \ - lov_log.c \ +- lov_pool.c \ - lov_obd.c \ - lov_pack.c \ - lov_request.c \ @@ -215,21 +218,9 @@ diff -urNad lustre-1.6.4.2~/lustre/lov/autoMakefile.am lustre-1.6.4.2/lustre/lov - 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_pool.c \ +# lov_obd.c \ +# lov_pack.c \ +# lov_request.c \ @@ -237,23 +228,111 @@ diff -urNad lustre-1.6.4.2~/lustre/lov/autoMakefile.am lustre-1.6.4.2/lustre/lov +# lov_qos.c \ +# lov_offset.c \ +# lov_internal.h -+# + +-lov_CFLAGS := $(EXTRA_KCFLAGS) +-lov_LDFLAGS := $(EXTRA_KLDFLAGS) +-lov_LDADD := $(EXTRA_KLIBS) +#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 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 @@ +diff -urNad lustre~/lustre/lov/autoMakefile.am~ lustre/lustre/lov/autoMakefile.am~ +--- lustre~/lustre/lov/autoMakefile.am~ 1970-01-01 01:00:00.000000000 +0100 ++++ lustre/lustre/lov/autoMakefile.am~ 2009-06-02 11:36:40.000000000 +0200 +@@ -0,0 +1,78 @@ ++# ++# GPL HEADER START ++# ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License version 2 only, ++# as published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License version 2 for more details (a copy is included ++# in the LICENSE file that accompanied this code). ++# ++# You should have received a copy of the GNU General Public License ++# version 2 along with this program; If not, see ++# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf ++# ++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++# CA 95054 USA or visit www.sun.com if you need additional information or ++# have any questions. ++# ++# GPL HEADER END ++# ++ ++# ++# Copyright 2008 Sun Microsystems, Inc. All rights reserved ++# Use is subject to license terms. ++# ++ ++# ++# This file is part of Lustre, http://www.lustre.org/ ++# Lustre is a trademark of Sun Microsystems, Inc. ++# ++ ++if LIBLUSTRE ++noinst_LIBRARIES = liblov.a ++liblov_a_SOURCES = lov_log.c lov_pool.c lov_obd.c lov_pack.c lov_request.c lov_offset.c lov_qos.c lov_merge.c lov_ea.c lov_internal.h ++liblov_a_CPPFLAGS = $(LLCPPFLAGS) ++liblov_a_CFLAGS = $(LLCFLAGS) ++endif ++ ++if MODULES ++if LINUX ++modulefs_DATA = lov$(KMODEXT) ++endif ++ ++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_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 ++ ++install-data-hook: $(install_data_hook) ++ ++DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h ++MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ +diff -urNad lustre~/lustre/lvfs/autoMakefile.am lustre/lustre/lvfs/autoMakefile.am +--- lustre~/lustre/lvfs/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lustre/lvfs/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 +@@ -80,21 +80,21 @@ endif # LINUX @@ -290,9 +369,9 @@ diff -urNad lustre-1.6.4.2~/lustre/lvfs/autoMakefile.am lustre-1.6.4.2/lustre/lv 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 +diff -urNad lustre~/lustre/obdclass/autoMakefile.am lustre/lustre/obdclass/autoMakefile.am +--- lustre~/lustre/obdclass/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lustre/obdclass/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 @@ -1,7 +1,7 @@ SUBDIRS := linux -if DARWIN @@ -349,10 +428,10 @@ diff -urNad lustre-1.6.4.2~/lustre/obdclass/autoMakefile.am lustre-1.6.4.2/lustr 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 @@ +diff -urNad lustre~/lustre/obdecho/autoMakefile.am lustre/lustre/obdecho/autoMakefile.am +--- lustre~/lustre/obdecho/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lustre/obdecho/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 +@@ -46,22 +46,22 @@ modulefs_DATA = obdecho$(KMODEXT) endif @@ -391,10 +470,10 @@ diff -urNad lustre-1.6.4.2~/lustre/obdecho/autoMakefile.am lustre-1.6.4.2/lustre 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 @@ +diff -urNad lustre~/lustre/osc/autoMakefile.am lustre/lustre/osc/autoMakefile.am +--- lustre~/lustre/osc/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lustre/osc/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 +@@ -47,22 +47,22 @@ modulefs_DATA = osc$(KMODEXT) endif @@ -433,10 +512,10 @@ diff -urNad lustre-1.6.4.2~/lustre/osc/autoMakefile.am lustre-1.6.4.2/lustre/osc 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 @@ +diff -urNad lustre~/lustre/ptlrpc/autoMakefile.am lustre/lustre/ptlrpc/autoMakefile.am +--- lustre~/lustre/ptlrpc/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200 ++++ lustre/lustre/ptlrpc/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200 +@@ -68,39 +68,39 @@ modulefs_DATA = ptlrpc$(KMODEXT) endif #LINUX -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit