Hello community, here is the log from the commit of package pcfclock for openSUSE:Factory checked in at 2015-03-27 09:40:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcfclock (Old) and /work/SRC/openSUSE:Factory/.pcfclock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcfclock" Changes: -------- --- /work/SRC/openSUSE:Factory/pcfclock/pcfclock.changes 2012-10-09 13:58:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcfclock.new/pcfclock.changes 2015-03-27 09:40:25.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 27 01:18:00 CET 2015 - [email protected] + +- added patch pcfclock-linux-3.19.patch + fix build with kernel 3.19 + use file_inode to get inode from file pointer +- fix build on 11.4 (skip installing tmpfile config) + +------------------------------------------------------------------- New: ---- pcfclock-linux-3.19.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcfclock.spec ++++++ --- /var/tmp/diff_new_pack.4upp8N/_old 2015-03-27 09:40:25.000000000 +0100 +++ /var/tmp/diff_new_pack.4upp8N/_new 2015-03-27 09:40:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pcfclock # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Patch1: pcfclock-module_param.patch Patch2: pcfclock-no_devfs.patch Patch3: pcfclock-include.patch +Patch4: pcfclock-linux-3.19.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: module-init-tools @@ -69,6 +70,7 @@ %patch1 %patch2 %patch3 +%patch4 mkdir source mkdir obj cp -a linux/pcfclock.c %{SOURCE1} \ @@ -98,8 +100,10 @@ done mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d echo "alias char-major-181 pcfclock" > %{buildroot}%{_sysconfdir}/modprobe.d/50-pcfclock.conf +%if 0%{?suse_version} > 1140 mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/tmpfiles.d/ +%endif %post # Create devices nodes at installation time @@ -112,7 +116,9 @@ %{_mandir}/man8/pcfdate.8.gz %{_sbindir}/pcfdate %{_sysconfdir}/modprobe.d/50-pcfclock.conf +%if 0%{?suse_version} > 1140 /usr/lib/tmpfiles.d/pcfclock.conf +%endif %clean rm -rf %{buildroot} ++++++ pcfclock-linux-3.19.patch ++++++ --- linux/pcfclock.c +++ linux/pcfclock.c @@ -269,7 +269,11 @@ int rc; int try; char buf1[18], buf2[18]; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) unsigned int minor = iminor(filp->f_dentry->d_inode); +#else + unsigned int minor = iminor(file_inode(filp)); +#endif struct pcfclock_struct *pcfclock = &pcfclock_table[minor]; struct pcfclock_status *status = (struct pcfclock_status *) &filp->private_data; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
