SPECS: kernel-fs-gfs.spec - up to 2.00.00 - use new macros for ker...
zbyniu
zbyniu at pld-linux.org
Tue Apr 3 00:38:39 CEST 2007
Author: zbyniu Date: Mon Apr 2 22:38:39 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 2.00.00
- use new macros for kernel modules
- removed smp package
---- Files affected:
SPECS:
kernel-fs-gfs.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SPECS/kernel-fs-gfs.spec
diff -u SPECS/kernel-fs-gfs.spec:1.15 SPECS/kernel-fs-gfs.spec:1.16
--- SPECS/kernel-fs-gfs.spec:1.15 Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-fs-gfs.spec Tue Apr 3 00:38:34 2007
@@ -3,29 +3,26 @@
# Condtional build:
%bcond_without kernel # don't build kernel modules
%bcond_without dist_kernel # without distribution kernel
-%bcond_without smp # without smp packages
%bcond_with verbose # verbose build (V=1)
#
%define _rel 0.3
Summary: Shared-disk cluster file system
Summary(pl.UTF-8): System plików dla klastrów z współdzieloną przestrzenią dyskową
Name: kernel%{_alt_kernel}-fs-gfs
-Version: 1.03.00
+Version: 2.00.00
Release: %{_rel}@%{_kernel_ver_str}
Epoch: 0
License: GPL v2
Group: Base/Kernel
Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5: 8eea23df70d2007c4fb8c234cfea49cf
+# Source0-md5: 2ef3f4ba9d3c87b50adfc9b406171085
URL: http://sources.redhat.com/cluster/gfs/
-BuildRequires: kernel%{_alt_kernel}-cluster-cman-devel
-BuildRequires: kernel%{_alt_kernel}-cluster-dlm-devel
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.308
+BuildRequires: rpmbuild(macros) >= 1.379
%endif
BuildRequires: perl-base
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
Requires(post,postun): /sbin/depmod
%{?with_dist_kernel:Requires(postun): kernel%{_alt_kernel}}
Buildroot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,36 +48,6 @@
zmiany wykonywane w systemie plików na jednej maszynie pokazują się
natychmiast na wszystkich innych maszynach w klastrze.
-%package -n kernel%{_alt_kernel}-smp-fs-gfs
-Summary: Shared-disk cluster file system
-Summary(pl.UTF-8): System plików dla klastrów z współdzieloną przestrzenią dyskową
-Release: %{_rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun): /sbin/depmod
-%{?with_dist_kernel:Requires(postun): kernel%{_alt_kernel}-smp}
-
-%description -n kernel%{_alt_kernel}-smp-fs-gfs
-GFS (Global File System) is a cluster file system. It allows a cluster
-of computers to simultaneously use a block device that is shared
-between them (with FC, iSCSI, NBD, etc...). GFS reads and writes to
-the block device like a local filesystem, but also uses a lock module
-to allow the computers coordinate their I/O so filesystem consistency
-is maintained. One of the nifty features of GFS is perfect consistency
--- changes made to the filesystem on one machine show up immediately
-on all other machines in the cluster.
-
-%description -n kernel%{_alt_kernel}-smp-fs-gfs -l pl.UTF-8
-GFS (Global File System - globalny system plików) to system plików dla
-klastrów. Pozwala klastrowi komputerów jednocześnie używać urządzenia
-blokowego współdzielonego pomiędzy nimi (poprzez FC, iSCSI, NBD itp.).
-GFS odczytuje i zapisuje urządzenie blokowe podobnie do lokalnego
-systemu plików, ale używa także modułu do blokad, aby umożliwić
-komputerom koordynowanie ich operacji wejścia/wyjścia tak, by utrzymać
-spójność systemu plików. Jedną z cech GFS-a jest doskonała spójność -
-zmiany wykonywane w systemie plików na jednej maszynie pokazują się
-natychmiast na wszystkich innych maszynach w klastrze.
-
%package -n kernel%{_alt_kernel}-fs-gfs-devel
Summary: Shared-disk cluster file system - headers
Summary(pl.UTF-8): System plików dla klastrów z współdzieloną przestrzenią dyskową - pliki nagłówkowe
@@ -97,74 +64,23 @@
%prep
%setup -q -n cluster-%{version}
+cat > gfs-kernel/src/gfs/Makefile << EOF
+obj-m := gfs.o
+gfs-objs := acl.o bits.o bmap.o daemon.o dio.o dir.o eaops.o eattr.o file.o \
+ glock.o glops.o inode.o ioctl.o lm.o log.o lops.o lvb.o main.o \
+ mount.o ondisk.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
+ ops_fstype.o ops_inode.o ops_super.o ops_vm.o page.o proc.o quota.o \
+ recovery.o rgrp.o super.o sys.o trans.o unlinked.o util.o
+
+%{?debug:CFLAGS += -DCONFIG_MODULE_NAME_DEBUG=1}
+EOF
+
%build
cd gfs-kernel
./configure \
--kernel_src=%{_kernelsrcdir}
%if %{with kernel}
-cd src
-ln -s . harness/linux
-
-ln -s ../harness nolock/linux
-
-ln -s ../harness dlm/linux
-ln -s %{_includedir}/cluster dlm/cluster
-
-ln -s ../harness gulm/linux
-
-ln -s . gfs/linux
-ln -s ../harness/lm_interface.h gfs/lm_interface.h
-
-ln -s %{_includedir}/cluster gfs/cluster
-
-for dir in harness nolock dlm gulm gfs; do
- cd $dir
- for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- rm -rf o
- install -d o/include/linux
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-%if %{with dist_kernel}
- %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
- install -d o/include/config
- touch o/include/config/MARKER
- ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
- %{__make} -C %{_kernelsrcdir} clean \
- USING_KBUILD=yes \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- USING_KBUILD=yes \
- CC="%{__cc}" CPP="%{__cpp}" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
-
- case "$dir" in
- harness|nolock|dlm|gulm)
- mv lock_${dir}.ko lock_${dir}-$cfg.ko
- ;;
- gfs)
- mv gfs.ko gfs-$cfg.ko
- ;;
- *)
- exit 1
- ;;
- esac
- done
- cd -
-done
-cd -
+%build_kernel_modules -C src/gfs -m gfs
%endif
%install
@@ -172,56 +88,12 @@
cd gfs-kernel
%if %{with kernel}
-# DLM
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs/gfs_locking/lock_dlm
-install src/dlm/lock_dlm-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/gfs_locking/lock_dlm/lock_dlm.ko
-%if %{with smp} && %{with dist_kernel}
-install src/dlm/lock_dlm-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/gfs_locking/lock_dlm/lock_dlm.ko
-%endif
-
-# GFS
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs/gfs
-install src/gfs/gfs-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/gfs/gfs.ko
-%if %{with smp} && %{with dist_kernel}
-install src/gfs/gfs-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/gfs/gfs.ko
-%endif
-
-# GULM
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs/gfs_locking/lock_gulm
-install src/gulm/lock_gulm-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/gfs_locking/lock_gulm/lock_gulm.ko
-%if %{with smp} && %{with dist_kernel}
-install src/gulm/lock_gulm-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/gfs_locking/lock_gulm/lock_gulm.ko
-%endif
-
-# HARNESS
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs/gfs_locking/lock_harness
-install src/harness/lock_harness-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/gfs_locking/lock_harness/lock_harness.ko
-%if %{with smp} && %{with dist_kernel}
-install src/harness/lock_harness-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/gfs_locking/lock_harness/lock_harness.ko
-%endif
-
-# NOLOCK
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs/gfs_locking/lock_nolock
-install src/nolock/lock_nolock-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/gfs_locking/lock_nolock/lock_nolock.ko
-%if %{with smp} && %{with dist_kernel}
-install src/nolock/lock_nolock-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/gfs_locking/lock_nolock/lock_nolock.ko
-%endif
+%install_kernel_modules -m src/gfs/gfs -d fs
%endif
install -d $RPM_BUILD_ROOT%{_includedir}/cluster
install src/gfs/gfs_ondisk.h src/gfs/gfs_ioctl.h \
- src/harness/lm_interface.h \
- $RPM_BUILD_ROOT%{_includedir}/cluster
+ $RPM_BUILD_ROOT%{_includedir}/cluster
%clean
rm -rf $RPM_BUILD_ROOT
@@ -232,22 +104,10 @@
%postun
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-fs-gfs
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-fs-gfs
-%depmod %{_kernel_ver}smp
-
%if %{with kernel}
%files
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/fs/*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-fs-gfs
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/fs/*
-%endif
+/lib/modules/%{_kernel_ver}/fs/*
%endif
%files -n kernel%{_alt_kernel}-fs-gfs-devel
@@ -260,6 +120,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2007/04/02 22:38:34 zbyniu
+- up to 2.00.00
+- use new macros for kernel modules
+- removed smp package
+
Revision 1.15 2007/02/13 08:06:37 glen
- tabs in preamble
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-fs-gfs.spec?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list