[DRBD-cvs] drbd by phil; Lars Ellenberg's last minute patch befor...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Sun, 8 Feb 2004 20:40:02 +0100 (CET)
DRBD CVS committal
Author : phil
Module : drbd
Dir : drbd
Modified Files:
Makefile README drbd.spec.in
Added Files:
Makefile.SuSE-9.0
Log Message:
Lars Ellenberg's last minute patch before 0.6.11 depatures.
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- Makefile 6 Feb 2004 08:50:14 -0000 1.28
+++ Makefile 8 Feb 2004 19:39:57 -0000 1.29
@@ -29,7 +29,7 @@
clean:
@ set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
- rm -f *~ .filelist INSTALL.html INSTALL.pod
+ rm -f *~ .filelist INSTALL.html INSTALL.pod pod2htm*
rm -rf dist
uninstall:
@@ -70,7 +70,7 @@
cd scripts; ln -sf drbd datadisk
rm -f drbd-$(REL_VERSION)
ln -s . drbd-$(REL_VERSION)
- tar --owner=0 --group=0 -czvf drbd-$(REL_VERSION).tar.gz -T .filelist
+ tar --owner=0 --group=0 -czf drbd-$(REL_VERSION).tar.gz -T .filelist
rm drbd-$(REL_VERSION)
ifeq ($(FORCE),)
@@ -100,7 +100,7 @@
-e "s/^\(Packager:\).*/\1 $(USER)@$(HOSTNAME)/;" < drbd.spec.in \
> dist/SPECS/drbd.spec ; \
fi
- $(RPMBUILD) -ba \
+ $(RPMBUILD) -ba ${RPMOPTIONS}\
--define "_topdir $(PWD)/dist" \
--define "buildroot $(PWD)/dist/install" \
--define "kernelversion $(KVER)" \
@@ -114,11 +114,11 @@
INSTALL.html: INSTALL.pod
-pod2html --title "Howto Build and Install DRBD" \
- < INSTALL.pod > INSTALL.html ; rm -f pod2htm[di].x~~
+ < INSTALL.pod > INSTALL.html ; rm -f pod2htm*
# -w3m -T text/html -dump < INSTALL.html > INSTALL.txt
INSTALL.pod: INSTALL
- -perl -pe 'BEGIN { print "=pod\n\n"; }; \
+ -@perl -pe 'BEGIN { print "=pod\n\n"; }; \
s/^= +(.*?) +=$$/=head1 $$1/; \
s/^== +(.*?) +==$$/=head2 $$1/; \
if(s/^ +([^#]*)$$/$$1/ or /^\S/) { \
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- README 16 Dec 2003 16:32:08 -0000 1.11
+++ README 8 Feb 2004 19:39:57 -0000 1.12
@@ -7,11 +7,12 @@
Unfortunately my time does not allow me to maintain this README besides
the software.
-Please refer to the web pages
+Please refer to the web pages at
http://www.drbd.org/
to find maintained information.
Reference documentation is included in the documentation directory.
+Please have a look at INSTALL or INSTALL.html, too.
DEBUGING:
@@ -26,11 +27,8 @@
BUILD RPMS:
It should be enough to just say: make rpm.
-If it complains about missing /etc/rc.d/init.d/drbd,
-then you are on slackware, suse, or whatever, and the default
-init.d is somewhere else. You then need to edit the %files section
-in the drbd.spec file, and put the correct path there.
-this is probably /etc/rc.d/ on slackware, and /etc/init.d/ on suse.
+If not, you probably need to add some packages,
+or edit the drbd.spec(.in) file.
After make rpm there should be distributable rpms in dist/*/*/drbd-*.*.rpm
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd.spec.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- drbd.spec.in 6 Feb 2004 08:50:14 -0000 1.2
+++ drbd.spec.in 8 Feb 2004 19:39:57 -0000 1.3
@@ -4,11 +4,18 @@
%{!?kernelversion: %{expand: %%define kernelversion %(uname -r)}}
%{!?kdir: %{expand: %%define kdir /lib/modules/%(uname -r)/build}}
-%define kversion %(echo %{kernelversion} | sed -e s/smp// -)
-%define krelver %(echo %{kversion} | tr -s '-' '_')
-%if %(echo %{kernelversion} | grep -c smp)
- %{expand:%%define ksmp -smp}
-%endif
+#
+# this results in strange names for e.g. smp4G, psmp,
+# -smp-lge or whatnot.
+#--
+# %define kversion %(echo %{kernelversion} | sed -e s/smp// -)
+# %define krelver %(echo %{kversion} | tr -s '-' '_')
+# %if %(echo %{kernelversion} | grep -c smp)
+# %{expand:%%define ksmp -smp}
+# %endif
+#--
+# so I choose to have it thus:
+%define krelver %(echo %{kernelversion} | tr -s '-' '_')
Name: drbd
Summary: Distributed Redundant Block Device driver for Linux
@@ -36,14 +43,18 @@
Philipp Reisner <philipp.reisner@linbit.com> - Primary Author
Lars Ellenberg <l.g.e@web.de>
-%package -n kernel%{?ksmp}-module-drbd
+#%package -n kernel%{?ksmp}-module-drbd
+# I choose to have the kernelversion as part of the package name!
+# drbd is prepended...
+%package km-%{krelver}
Summary: Kernel driver for DRBD.
-Release: %{release}_%{krelver}
+#Release: %{release}_%{krelver}
Group: System Environment/Kernel
Requires: %{name} = %{version}, /sbin/depmod
-%{?ksmp:Provides: kernel-module-drbd = %{version}-%{release}_%{krelver}}
+#%{?ksmp:Provides: kernel-module-drbd = %{version}-%{release}_%{krelver}}
-%description -n kernel%{?ksmp}-module-drbd
+#%description -n kernel%{?ksmp}-module-drbd
+%description km-%{krelver}
This module is the kernel-dependant driver for DRBD. This is split out so
that multiple kernel driver versions can be installed, one for each
installed kernel.
@@ -61,10 +72,11 @@
echo krelver=%{krelver}
mkdir -p %{buildroot}
-make clean
+skip_doc="%{?skip_make_doc:DB2MAN= DB2HTML= DB2PS= DB2PDF=}"
+make clean $skip_doc
# note: MANDIR is not used anywhere in the makefiles
# maybe this should be changed
-make PREFIX=%{buildroot}/ MANDIR=%{_mandir} KDIR=%{kdir} all
+make all PREFIX=%{buildroot}/ MANDIR=%{_mandir} KDIR=%{kdir} $skip_doc
# sanity check
test %{kernelversion} = $(<drbd/.kernelrelease)
@@ -74,9 +86,9 @@
cd documentation
mv HOWTO HOWTO.orig
mkdir HOWTO
-cp -p HOWTO.orig/*.html HOWTO/
+find HOWTO.orig/ -name "*.html" -exec cp -p '{}' HOWTO \;
cd ../drbd
-mv kernel.config.gz k-config-%{kernelversion}.gz
+mv .kernel.config.gz k-config-%{kernelversion}.gz
FILELIST="%{_builddir}/%{name}-%{version}/file.list"
cd %{buildroot}
@@ -136,7 +148,8 @@
%doc COPYING
%doc README
-%files -n kernel%{?ksmp}-module-drbd
+#%files -n kernel%{?ksmp}-module-drbd
+%files km-%{krelver}
%defattr(-,root,root)
/lib/modules/%{kernelversion}/
%doc drbd/k-config-%{kernelversion}.gz
@@ -147,7 +160,12 @@
chkconfig --add drbd
%preun
-service drbd stop
+if type -p service ; then
+ service drbd stop
+fi
+if type -p rcdrbd ; then
+ rcdrbd stop
+fi
lsmod | grep drbd > /dev/null 2>&1
if [ $? -eq 0 ]; then
@@ -158,14 +176,29 @@
chkconfig --del drbd
fi
-%post -n kernel%{?ksmp}-module-drbd
+#%post -n kernel%{?ksmp}-module-drbd
+%post km-%{krelver}
/sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
-%postun -n kernel%{?ksmp}-module-drbd
+#%postun -n kernel%{?ksmp}-module-drbd
+%postun km-%{krelver}
/sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
%changelog
-* Wed Feb 4 2004 Lars Ellenberg <Lars.Ellenberg@linbit.com> [0.6.10-3]
+* Fri Feb 6 2004 Lars Ellenberg <Lars.Ellenberg@linbit.com> [0.6.11]
+- fix for timeout when asender is dead
+- fix for blocking bottom halves or bdflush and the like in
+ low memory situations
+- included register_ioctl32_conversion for sparc64,ppc64,x86_64
+- improved documentation
+- improved build system
+- added Makefile-SuSE-9.0, which I use to generate all rpms for
+ the shipped SuSE kernels
+- because "kernel-module-drbd-0.6.10+cvs-3_2.4.21-166_p.i586.rpm"
+ looks too weird, I choose to have the kernel part named like
+ "drbd-km-2.4.21-166-psmp-0.6.10+cvs-3"
+
+* Wed Feb 4 2004 Lars Ellenberg <Lars.Ellenberg@linbit.com>
- merged Sean Reifschneiders changes with my own changes which already
where in cvs