Accepting request 389505 from home:wanghaisu:branches:network:ha-clustering:Factory

Add drbd-buildcompare and using specific version number.

OBS-URL: https://build.opensuse.org/request/show/389505
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=32

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm">
+  <service name="tar_scm" mode="disabled">
     <param name="url">git://git.linbit.com/drbd-9.0.git</param>
     <param name="scm">git</param>
     <param name="filename">drbd</param>
@@ -13,12 +13,12 @@
     <param name="revision">86e443973082570aeb651848db89e0c7b995c306</param>
   </service>
 
-  <service name="recompress">
+  <service name="recompress" mode="disabled">
     <param name="file">*drbd*.tar</param>
     <param name="compression">bz2</param>
   </service>
 
-  <service name="set_version">
+  <service name="set_version" mode="disabled">
     <param name="basename">drbd</param>
   </service>
 </services>

_service:recompress:tar_scm:drbd-9.0.1+git.86e4439.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35e160ffffed266f54e50db947cf103a544261b7a416cb1b55aa346ea04bf90b
-size 282912

_service:set_version:drbd.spec

@@ -1,113 +0,0 @@
-#
-# spec file for package drbd
-#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-# needssslcertforbuild
-
-%ifarch x86_64
-%define buildrt 0
-%endif
-
-Name:           drbd
-Version:        9.0.1+git.86e4439
-Release:        0
-Summary:        DRBD driver for Linux
-License:        GPL-2.0
-Group:          Productivity/Clustering/HA
-Url:            http://drbd.linbit.com/
-Source:         %{name}-%{version}.tar.bz2
-Source1:        preamble
-#In kernel is: kernel/drivers/block/drbd/drbd.ko
-Source2:        Module.supported
-Source3:        drbd_git_revision
-Patch0:         kernel-4.5-compat.patch
-BuildRequires:  kernel-source
-BuildRequires:  kernel-syms
-BuildRequires:  module-init-tools
-
-%if 0%{?buildrt} == 1
-BuildRequires:  kernel-source-rt
-BuildRequires:  kernel-syms-rt
-%endif
-
-Requires:       drbd-utils >= 8.9.6
-Supplements:    drbd-utils >= 8.9.6
-Obsoletes:      drbd-kmp < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    i586 s390
-
-%kernel_module_package -n drbd -p %_sourcedir/preamble
-
-%description
-Drbd is a distributed replicated block device. It mirrors a block
-device over the network to another machine. Think of it as networked
-raid 1. It is a building block for setting up clusters.
-
-%package KMP
-Summary:        Kernel driver for DRBD
-Group:          Productivity/Clustering/HA
-
-%description KMP
-This module is the kernel-dependent driver for DRBD.  This is split out so
-that multiple kernel driver versions can be installed, one for each
-installed kernel.
-
-%prep
-%setup -q -n drbd-%{version}
-%patch0 -p1
-
-mkdir source
-cp -a drbd/. source/. || :
-cp $RPM_SOURCE_DIR/drbd_git_revision source/.drbd_git_revision
-
-%build
-rm -rf obj
-mkdir obj
-ln -s ../scripts obj/
-
-export CONFIG_BLK_DEV_DRBD=m
-export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
-
-for flavor in %flavors_to_build; do
-    rm -rf $flavor
-    cp -r source $flavor
-    cp %_sourcedir/Module.supported $flavor
-    export DRBDSRC="$PWD/obj/$flavor"
-    make -C %{kernel_source $flavor} modules M=$PWD/$flavor
-done
-
-%install
-export INSTALL_MOD_PATH=%{buildroot}
-export INSTALL_MOD_DIR=updates
-for flavor in %{flavors_to_build}; do
-    make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor
-done
-
-mkdir -p %{buildroot}/%{_sbindir}
-%{__ln_s} -f %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
-rm -f drbd.conf
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root)
-%doc COPYING
-%doc ChangeLog
-%{_sbindir}/rc%{name}
-
-%changelog

drbd-9.0.1+git.86e4439.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6332f7aaed6766936f72c5b4f219411d86353c76d6354b43e656326e568b057c
+size 282662

drbd-buildcompare.patch

@@ -0,0 +1,10 @@
+diff -Naur drbd-9.0.1+git.86e4439.orig/drbd/Kbuild drbd-9.0.1+git.86e4439/drbd/Kbuild
+--- drbd-9.0.1+git.86e4439.orig/drbd/Kbuild	2016-04-13 21:42:44.957501769 +0800
++++ drbd-9.0.1+git.86e4439/drbd/Kbuild	2016-04-13 21:43:05.622500374 +0800
+@@ -133,5 +133,5 @@
+ 		echo >&2 "Your DRBD source tree is broken. Unpack again.";      \
+ 		exit 1;								\
+ 	fi ;									\
+-	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
++	echo -e "\t\t\" build by $$USER\";\n}";	\
+ 	mv -f $@.new $@

drbd.changes

@@ -4,6 +4,12 @@ Fri Apr  8 14:44:21 UTC 2016 - nwang@suse.com
 - Compat with kernel 4.5 
 - Add patch kernel-4.5-compat.patch
 
+-------------------------------------------------------------------
+Mon Mar  7 14:23:53 UTC 2016 - olaf@aepfle.de
+
+- Remove timstamp from binaries
+  Add patch drbd-buildcompare.patch
+
 -------------------------------------------------------------------
 Mon Mar  7 08:42:41 UTC 2016 - nwang@suse.com
 

drbd.spec

@@ -23,7 +23,7 @@
 %endif
 
 Name:           drbd
-Version:        @VERSION@
+Version:        9.0.1+git.86e4439
 Release:        0
 Summary:        DRBD driver for Linux
 License:        GPL-2.0
@@ -35,6 +35,7 @@ Source1:        preamble
 Source2:        Module.supported
 Source3:        drbd_git_revision
 Patch0:         kernel-4.5-compat.patch
+Patch1:         drbd-buildcompare.patch
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
 BuildRequires:  module-init-tools
@@ -69,6 +70,7 @@ installed kernel.
 %prep
 %setup -q -n drbd-%{version}
 %patch0 -p1
+%patch1 -p1
 
 mkdir source
 cp -a drbd/. source/. || :