Hello community, here is the log from the commit of package pcfclock.2549 for openSUSE:13.1:Update checked in at 2014-02-11 14:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/pcfclock.2549 (Old) and /work/SRC/openSUSE:13.1:Update/.pcfclock.2549.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcfclock.2549" Changes: -------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:13.1:Update/.pcfclock.2549.new/pcfclock.changes 2014-02-11 14:40:05.000000000 +0100 @@ -0,0 +1,61 @@ +------------------------------------------------------------------- +Mon Oct 8 13:15:53 UTC 2012 - a...@suse.de + +- Run through spec-cleaner. +- Use tmpfiles.d instead of /lib/udev/devices for device creation. + +------------------------------------------------------------------- +Mon Mar 9 21:32:41 CET 2009 - mma...@suse.cz + +- renamed modprobe config to /etc/modprobe.d/50-pcfclock.conf + (required by new module-init-tools). + +------------------------------------------------------------------- +Fri Aug 22 01:25:51 CEST 2008 - r...@suse.de + +- fix build with 2.6.27 + +------------------------------------------------------------------- +Wed Oct 24 01:08:45 CEST 2007 - r...@suse.de + +- revert last change, instead +- add alias char-major-181 pcfclock to /etc/modprobe.d/pcfclock +- add device nodes to /lib/udev/devices + +------------------------------------------------------------------- +Fri Oct 19 15:31:06 CEST 2007 - r...@suse.de + +- add udev rule to create device nodes (#335108,#276510) + +------------------------------------------------------------------- +Fri May 11 12:31:58 CEST 2007 - r...@suse.de + +- fix build with current kernel sources +- use optflags for pcfdate + +------------------------------------------------------------------- +Wed Apr 4 22:10:04 CEST 2007 - lr...@suse.de + +- added module-init-tools to BuildRequires + +------------------------------------------------------------------- +Mon Aug 21 16:29:13 CEST 2006 - r...@suse.de + +- devfs has been removed from 2.6.18, make kernel driver compile + +------------------------------------------------------------------- +Mon Apr 10 18:48:27 CEST 2006 - agr...@suse.de + +- Add preamble `Enhances: kernel-$flavor' workaround to KMP + sub-packages (156513). + +------------------------------------------------------------------- +Mon Apr 3 00:52:19 CEST 2006 - r...@suse.de + +- change MODULE_PARM to module_param + +------------------------------------------------------------------- +Thu Feb 23 00:14:10 CET 2006 - r...@suse.de + +- created package with KMP (version 0.44) + New: ---- Makefile pcfclock-0.44.tar.gz pcfclock-include.patch pcfclock-module_param.patch pcfclock-no_devfs.patch pcfclock-nomodule.patch pcfclock.changes pcfclock.conf pcfclock.spec preamble ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcfclock.spec ++++++ # # spec file for package pcfclock # # Copyright (c) 2012 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 # 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/ # Name: pcfclock Version: 0.44 Release: 0 Summary: Pcfclock kernel driver License: GPL-2.0+ Group: System/Kernel Url: http://www-stud.ims.uni-stuttgart.de/~voegelas/pcf.html Source: pcfclock-%{version}.tar.gz Source1: Makefile Source2: preamble Source3: pcfclock.conf Patch0: pcfclock-nomodule.patch Patch1: pcfclock-module_param.patch Patch2: pcfclock-no_devfs.patch Patch3: pcfclock-include.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: module-init-tools Requires: pcfclock-kmp # systemd-tmpfiles Requires(post): systemd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x %suse_kernel_module_package -p %_sourcedir/preamble kdump um xen xenpae iseries64 %description The pcfclock(4) driver for GNU/Linux supports the parallel port radio clock sold by Conrad Electronic under order number 967602. The radio clock, which is put between your parallel port and your printer, receives the legal German time, i.e. CET or CEST, from the DCF77 transmitter and uses it to set its internal quartz clock. The DCF77 transmitter is located near to Frankfurt/Main and covers a radius of more than 1500 kilometers. %package KMP Summary: Pcfclock kernel driver Group: System/Kernel %description KMP The pcfclock(4) driver for GNU/Linux supports the parallel port radio clock sold by Conrad Electronic under order number 967602. The radio clock, which is put between your parallel port and your printer, receives the legal German time, i.e. CET or CEST, from the DCF77 transmitter and uses it to set its internal quartz clock. The DCF77 transmitter is located near to Frankfurt/Main and covers a radius of more than 1500 kilometers. %prep %setup -q %patch0 %patch1 %patch2 %patch3 mkdir source mkdir obj cp -a linux/pcfclock.c %{SOURCE1} \ source %build CFLAGS=$RPM_OPT_FLAGS \ ./configure --prefix=/usr --mandir=%{_mandir} --without-linux make for flavor in %flavors_to_build; do rm -rf obj/$flavor cp -r source obj/$flavor make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ M=$PWD/obj/$flavor done %install %make_install # install manpage make -C linux install DESTDIR=%{buildroot} # install kernel modules export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates for flavor in %flavors_to_build; do make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ M=$PWD/obj/$flavor done mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d echo "alias char-major-181 pcfclock" > %{buildroot}%{_sysconfdir}/modprobe.d/50-pcfclock.conf mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/tmpfiles.d/ %post # Create devices nodes at installation time systemd-tmpfiles --create /usr/lib/tmpfiles.d/pcfclock.conf %files %defattr(-,root,root) %doc README %{_mandir}/man4/pcfclock.4.gz %{_mandir}/man8/pcfdate.8.gz %{_sbindir}/pcfdate %{_sysconfdir}/modprobe.d/50-pcfclock.conf /usr/lib/tmpfiles.d/pcfclock.conf %clean rm -rf %{buildroot} %changelog ++++++ Makefile ++++++ obj-m := pcfclock.o # Where to install the modules MOD_DIR := misc .PHONY: modules install clean modules_add install : modules_add modules modules_add clean: $(MAKE) -C $(KERNEL_SOURCE) $@ SUBDIRS=$(CURDIR) ++++++ pcfclock-include.patch ++++++ --- linux/pcfclock.c +++ linux/pcfclock.c @@ -60,7 +60,7 @@ #endif #include <asm/uaccess.h> -#include <asm/semaphore.h> +#include <linux/semaphore.h> /* Major device number */ #define PCFCLOCK_MAJOR 181 ++++++ pcfclock-module_param.patch ++++++ --- linux/pcfclock.c +++ linux/pcfclock.c @@ -400,8 +400,7 @@ static int parport_nr[PCFCLOCK_NO] = {[0 ... PCFCLOCK_NO - 1] = PCFCLOCK_PARPORT_UNSPEC }; static char *parport[PCFCLOCK_NO] = { NULL, }; - -MODULE_PARM(parport, "1-" __MODULE_STRING(PCFCLOCK_NO) "s"); +module_param_array(parport,charp,NULL,0); #ifndef MODULE static int __init ++++++ pcfclock-no_devfs.patch ++++++ --- linux/pcfclock.c +++ linux/pcfclock.c @@ -49,7 +49,9 @@ #include <linux/major.h> #include <linux/fs.h> #include <linux/sched.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #include <linux/devfs_fs_kernel.h> +#endif #include <linux/string.h> #include <linux/delay.h> #include <linux/parport.h> @@ -441,7 +443,9 @@ return 1; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) devfs_mk_cdev(MKDEV(PCFCLOCK_MAJOR, n), S_IFCHR | S_IRUGO, "pcfclocks/%d", n); +#endif #else sprintf(name, "%d", n); devfs_register(devfs_handle, name, DEVFS_FL_DEFAULT, PCFCLOCK_MAJOR, n, S_IFCHR | S_IRUGO, @@ -508,7 +512,9 @@ printk(KERN_ERR "pcfclock: unable to get major %d\n", PCFCLOCK_MAJOR); return -EIO; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) devfs_mk_dir("pcfclocks"); +#endif #else if (devfs_register_chrdev(PCFCLOCK_MAJOR, "pcfclock", &pcfclock_fops)) { printk(KERN_ERR "pcfclock: unable to get major %d\n", PCFCLOCK_MAJOR); @@ -562,10 +568,14 @@ for (n = 0; n < PCFCLOCK_NO; n++) { if (pcfclock_table[n].dev != NULL) { parport_unregister_device(pcfclock_table[n].dev); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) devfs_remove("pcfclocks/%d", n); +#endif } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) devfs_remove("pcfclocks"); +#endif #else devfs_unregister(devfs_handle); devfs_unregister_chrdev(PCFCLOCK_MAJOR, "pcfclock"); ++++++ pcfclock-nomodule.patch ++++++ --- linux/Makefile.in +++ linux/Makefile.in @@ -22,7 +22,7 @@ VM1 := k endif -all: modules +all: modules: pcfclock.$(VM1)o @@ -35,7 +35,7 @@ check: -install: install-exec install-data +install: install-data install-exec: pcfclock.$(VM1)o $(mkdir_p) $(DESTDIR)$(moddir) ++++++ pcfclock.conf ++++++ # Static device nodes for pcfclock # See tmpfiles.d(5) for details #Type Path Mode UID GID Age Argument c /dev/pcfclock0 0444 root root - 181:0 c /dev/pcfclock1 0444 root root - 181:1 c /dev/pcfclock2 0444 root root - 181:2 ++++++ preamble ++++++ Enhances: kernel-%1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
