packages: drbd/drbd.spec - updated 8.3.8.1 - drop kernel build stuff - it i...
adamg
adamg at pld-linux.org
Sat Oct 2 13:53:03 CEST 2010
Author: adamg Date: Sat Oct 2 11:53:03 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated 8.3.8.1
- drop kernel build stuff - it is maintained in mainline since 2.6.33
- cleanups
---- Files affected:
packages/drbd:
drbd.spec (1.133 -> 1.134)
---- Diffs:
================================================================
Index: packages/drbd/drbd.spec
diff -u packages/drbd/drbd.spec:1.133 packages/drbd/drbd.spec:1.134
--- packages/drbd/drbd.spec:1.133 Mon Feb 15 10:40:19 2010
+++ packages/drbd/drbd.spec Sat Oct 2 13:52:58 2010
@@ -6,44 +6,19 @@
# /etc/xen/scripts/block-drbd
# /usr/lib/ocf/resource.d/linbit/drbd
#
-# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
-%bcond_without kernel # don't build kernel modules
-%bcond_without userspace # don't build userspace module
-%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
-#
-%ifarch sparc
-%undefine with_smp
-%endif
-
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine with_userspace
-%endif
-%define rel 2
-%define pname drbd
Summary: drbd is a block device designed to build high availibility clusters
Summary(pl.UTF-8): drbd jest urządzeniem blokowym dla klastrów o wysokiej niezawodności
-Name: %{pname}%{_alt_kernel}
-Version: 8.3.7
-Release: %{rel}
+Name: drbd
+Version: 8.3.8.1
+Release: 1
License: GPL
Group: Base/Kernel
-Source0: http://oss.linbit.com/drbd/8.3/%{pname}-%{version}.tar.gz
-# Source0-md5: 3b37c028b18bf2c8f5414396f681cf17
+Source0: http://oss.linbit.com/drbd/8.3/%{name}-%{version}.tar.gz
+# Source0-md5: 551dae488006af86a33eab1eba407f48
URL: http://www.drbd.org/
-%if %{with userspace}
BuildRequires: bison
BuildRequires: flex
-%endif
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
BuildRequires: rpmbuild(macros) >= 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,25 +59,6 @@
%description -n drbdsetup -l pl.UTF-8
Narzędzie konfiguracyjne i skrypty startowe dla DRBD.
-%package -n kernel%{_alt_kernel}-block-drbd
-Summary: Kernel module with drbd - a block device designed to build high availibility clusters
-Summary(pl.UTF-8): Moduł jądra do drbd - urządzenia blokowego dla klastrów o wysokiej niezawodności
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
-Requires(post,postun): /sbin/depmod
-Requires: drbdsetup
-
-%description -n kernel%{_alt_kernel}-block-drbd
-drbd is a block device which is designed to build high availability
-clusters. This is done by mirroring a whole block device via (a
-dedicated) network. You could see it as a network RAID1.
-
-%description -n kernel%{_alt_kernel}-block-drbd -l pl.UTF-8
-drbd jest urządzeniem blokowym zaprojektowanym dla klastrów o wysokiej
-niezawodności. drbd działa jako mirroring całego urządzenia blokowego
-przez (dedykowaną) sieć. Może być widoczny jako sieciowy RAID1.
-
%package -n bash-completion-drbd
Summary: bash-completion for drbd
Summary(pl.UTF-8): Bashowe uzupełnianie poleceń dla drbd
@@ -128,36 +84,21 @@
Reguły udev dla modułu jądra Linuksa dla drbd.
%prep
-%setup -q -n %{pname}-%{version}
+%setup -q
%build
%configure
-%if %{with userspace}
%{__make} tools \
KVER=dummy \
CC="%{__cc}" \
OPTCFLAGS="%{rpmcflags}" \
LDFLAGS="%{rpmldflags}"
-%endif
-
-%if %{with kernel}
-cd drbd
-sed -i -e 's#$(CONFIG_BLK_DEV_DRBD)#m#g' Makefile-2.6
-ln -sf Makefile-2.6 Makefile
-# kernel module(s)
-%build_kernel_modules -m drbd
-%endif
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{5,8},%{_sysconfdir}} \
$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
-%if %{with kernel}
-%install_kernel_modules -m drbd/drbd -d kernel/drivers/block
-%endif
-
-%if %{with userspace}
%{__make} install -C scripts \
DRBD_ENABLE_UDEV=1 \
DESTDIR=$RPM_BUILD_ROOT
@@ -168,17 +109,10 @@
install documentation/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
install documentation/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n kernel%{_alt_kernel}-block-drbd
-%depmod %{_kernel_ver}
-
-%postun -n kernel%{_alt_kernel}-block-drbd
-%depmod %{_kernel_ver}
-
%pre -n drbdsetup
%groupadd -g 60 haclient
@@ -197,8 +131,6 @@
%groupremove haclient
fi
-
-%if %{with userspace}
%files -n drbdsetup
%defattr(644,root,root,755)
%attr(755,root,root) /sbin/drbdadm
@@ -207,7 +139,9 @@
%attr(754,root,root) /etc/rc.d/init.d/drbd
%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbddisk
%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbdupper
+%dir %{_sysconfdir}/drbd.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.d/global_common.conf
%{_mandir}/man[58]/*
%dir /usr/lib/drbd
%attr(755,root,root) /usr/lib/drbd/*
@@ -220,14 +154,6 @@
%files -n drbd-udev
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/65-drbd.rules
-%endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-block-drbd
-%defattr(644,root,root,755)
-%doc ChangeLog README
-/lib/modules/%{_kernel_ver}/kernel/drivers/block/drbd.ko*
-%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -235,6 +161,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.134 2010/10/02 11:52:58 adamg
+- updated 8.3.8.1
+- drop kernel build stuff - it is maintained in mainline since 2.6.33
+- cleanups
+
Revision 1.133 2010/02/15 09:40:19 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drbd/drbd.spec?r1=1.133&r2=1.134&f=u
More information about the pld-cvs-commit
mailing list