diff options
author | Stefan Briesenick <sbriesen@gentoo.org> | 2008-07-14 23:04:19 +0000 |
---|---|---|
committer | Stefan Briesenick <sbriesen@gentoo.org> | 2008-07-14 23:04:19 +0000 |
commit | 3d43e272504d923a7da9eaab30857ea31aaef2cf (patch) | |
tree | f6825dd6c9730135cfba807272ef2001c5ef59e7 /sys-apps/pcfclock | |
parent | whitespace (diff) | |
download | historical-3d43e272504d923a7da9eaab30857ea31aaef2cf.tar.gz historical-3d43e272504d923a7da9eaab30857ea31aaef2cf.tar.bz2 historical-3d43e272504d923a7da9eaab30857ea31aaef2cf.zip |
added kernel 2.6.26 patches, solving bug #231809.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r5 i686
Diffstat (limited to 'sys-apps/pcfclock')
-rw-r--r-- | sys-apps/pcfclock/ChangeLog | 11 | ||||
-rw-r--r-- | sys-apps/pcfclock/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/pcfclock/files/pcfclock-0.44-kernel-2.6.26.diff | 106 | ||||
-rw-r--r-- | sys-apps/pcfclock/pcfclock-0.44-r3.ebuild | 6 | ||||
-rw-r--r-- | sys-apps/pcfclock/pcfclock-0.44-r4.ebuild | 54 |
5 files changed, 176 insertions, 7 deletions
diff --git a/sys-apps/pcfclock/ChangeLog b/sys-apps/pcfclock/ChangeLog index 3665face0a93..34382c98da3a 100644 --- a/sys-apps/pcfclock/ChangeLog +++ b/sys-apps/pcfclock/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/pcfclock -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/ChangeLog,v 1.7 2007/01/08 20:29:10 sbriesen Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/ChangeLog,v 1.8 2008/07/14 23:04:18 sbriesen Exp $ + +*pcfclock-0.44-r4 (14 Jul 2008) + + 14 Jul 2008; Stefan Briesenick <sbriesen@gentoo.org> + +files/pcfclock-0.44-kernel-2.6.26.diff, pcfclock-0.44-r3.ebuild, + +pcfclock-0.44-r4.ebuild: + added kernel 2.6.26 patches, solving bug #231809. *pcfclock-0.44-r3 (08 Jan 2007) diff --git a/sys-apps/pcfclock/Manifest b/sys-apps/pcfclock/Manifest index 5b7f368df37d..2ed9cce32253 100644 --- a/sys-apps/pcfclock/Manifest +++ b/sys-apps/pcfclock/Manifest @@ -1,7 +1,9 @@ AUX pcfclock-0.44-kernel-2.6.18.diff 3917 RMD160 0893c91db18386bdb52ebe825a40b732a32a1233 SHA1 c8ea6af864e8e702288169f8acf858edfd3b1f6c SHA256 041fb0653615e525d8595ba903bd5013dadd8f594338aeed430c1ed6e04383b4 +AUX pcfclock-0.44-kernel-2.6.26.diff 4357 RMD160 c36bdc55678722deec25bc5c2a0376928ae5f256 SHA1 295ac159345ef970daff921847ea13cd14e77bc0 SHA256 d8a3f7dbe53c3b037cfa4267b1f7c0f55f0162d983fb3c974a93e25140140156 AUX pcfclock-0.44-udev.patch 3147 RMD160 6ecb84fdc7e7b4695266690b37cd9b4289e33230 SHA1 e0524f315d235beb49ea6800155a01c6d3bbe73b SHA256 12f1900f72e18cfab6ea82c106178e9ee5021bc51d53d3cada203917de6bc5ca DIST pcfclock-0.44.tar.gz 89914 RMD160 e6bf6bafcf985d3742767118abc83c0fbf81252f SHA1 6ec6660429fa5be81cb8b686a0b929b076209061 SHA256 1285c9536ad04c74bbdd92e22fd6a6661feeb3c9175eccb9b1e02c2f06adbda8 EBUILD pcfclock-0.44-r2.ebuild 1436 RMD160 c5b9d4ab5b1d5b46f0d033bedcc6305720a9ceb5 SHA1 7fb64a9015ac0b78be93b212a418a0ac00bb94c3 SHA256 8ab211e96536f0a67b894fcd34258839d8c9f248374c262ed900418c56d76049 -EBUILD pcfclock-0.44-r3.ebuild 1445 RMD160 792b5524d4f3147904af011ff6b38a8a1050d367 SHA1 5ba065e14d5ac21259d7fa9fa09593411503f531 SHA256 b21cf1f64b23fc702c1602020fa8a93c522ed6325e2ee23f95a32f7d8c4c0070 -MISC ChangeLog 1446 RMD160 ce3d00e070a849226c716f9de9190c565a2f206d SHA1 67319385f415b2397008a96fedce05b5fdb25969 SHA256 4792c2753ad9268ce3270dbe5ff7dfe7c8fca551eea708399d762bb3d54a0d68 +EBUILD pcfclock-0.44-r3.ebuild 1447 RMD160 174aace02a2cfd042c0d50d99010bfee22d92fe9 SHA1 69888babb9d6509fd53cfaa0bbc0c94f1d1cbe0d SHA256 cba458668503fc3fb9fde0d43bea77138600e2cf9662c01eb6b5a6ba0c481e29 +EBUILD pcfclock-0.44-r4.ebuild 1447 RMD160 4d834e82ce901a906533827ebf2bb7d8772f688f SHA1 67f261258b9c2cb90dbff97f1fa2e530a519f26a SHA256 fd7afb36d3561b5386da3a2efb90344a954771968601e3f035686e140589ab01 +MISC ChangeLog 1683 RMD160 d8e2a5d2eaf82bd684a60a9ed9375e4f2126704e SHA1 9541e3b0ce33761fdf3f172cd081f80dafb6d529 SHA256 4d3dfb3b8a36f2a0ac34ff3fc4ce76ed8956c71ddba25f4a3cfe122cd94f79a0 MISC metadata.xml 643 RMD160 e390969f9a48f9e31c200e372c52aa5ab5595575 SHA1 b908bc35e779b4cb38025b24e66a1810f27ab72c SHA256 e4dc68c9a436c2229a171d320d03a94b0f4a355e174d3308d0ce0f71657d219b diff --git a/sys-apps/pcfclock/files/pcfclock-0.44-kernel-2.6.26.diff b/sys-apps/pcfclock/files/pcfclock-0.44-kernel-2.6.26.diff new file mode 100644 index 000000000000..90406a7599ee --- /dev/null +++ b/sys-apps/pcfclock/files/pcfclock-0.44-kernel-2.6.26.diff @@ -0,0 +1,106 @@ +diff -Naur pcfclock-0.44.orig/linux/pcfclock.c pcfclock-0.44/linux/pcfclock.c +--- pcfclock-0.44.orig/linux/pcfclock.c 2004-05-17 18:26:12.000000000 +0200 ++++ pcfclock-0.44/linux/pcfclock.c 2008-07-15 00:56:21.000000000 +0200 +@@ -49,13 +49,18 @@ + #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> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + #include <linux/device.h> + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++#include <linux/moduleparam.h> ++#endif + + #include <asm/uaccess.h> + #include <asm/semaphore.h> +@@ -93,6 +98,32 @@ + + static struct pcfclock_struct pcfclock_table[PCFCLOCK_NO]; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++# define CLASS_CREATE(owner, name) class_create(owner, name) ++# define CLASS_DESTROY(class) class_destroy(class) ++# define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) device_create(class, device, dev, fmt, rest) ++# define CLASS_DEVICE_DESTROY(class, dev) device_destroy(class, dev) ++static struct class *pcfclock_class; ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++# define CLASS_CREATE(owner, name) class_create(owner, name) ++# define CLASS_DESTROY(class) class_destroy(class) ++# define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, NULL, dev, device, fmt, rest) ++# define CLASS_DEVICE_DESTROY(class, dev) class_device_destroy(class, dev) ++static struct class *pcfclock_class; ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) ++# define CLASS_CREATE(owner, name) class_create(owner, name) ++# define CLASS_DESTROY(class) class_destroy(class) ++# define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, dev, device, fmt, rest) ++# define CLASS_DEVICE_DESTROY(class, dev) class_device_destroy(class, dev) ++static struct class *pcfclock_class; ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++# define CLASS_CREATE(owner, name) class_simple_create(owner, name) ++# define CLASS_DESTROY(class) class_simple_destroy(class) ++# define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_simple_device_add(class, dev, device, fmt, rest) ++# define CLASS_DEVICE_DESTROY(class, dev) class_simple_device_remove(dev) ++static struct class_simple *pcfclock_class; ++#endif ++ + /* + * The radio clock transmits data only to the PC when requested. While the + * time signal is received for the first time no communication between the PC +@@ -401,7 +432,11 @@ + static int parport_nr[PCFCLOCK_NO] = {[0 ... PCFCLOCK_NO - 1] = PCFCLOCK_PARPORT_UNSPEC }; + static char *parport[PCFCLOCK_NO] = { NULL, }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) ++module_param_array(parport, charp, NULL, 0); ++#else + MODULE_PARM(parport, "1-" __MODULE_STRING(PCFCLOCK_NO) "s"); ++#endif + + #ifndef MODULE + static int __init +@@ -442,7 +477,10 @@ + return 1; + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++ CLASS_DEVICE_CREATE(pcfclock_class, MKDEV(PCFCLOCK_MAJOR, n), NULL, "pcfclock%d", n); ++# 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, +@@ -509,7 +547,10 @@ + printk(KERN_ERR "pcfclock: unable to get major %d\n", PCFCLOCK_MAJOR); + return -EIO; + } ++ pcfclock_class = CLASS_CREATE(THIS_MODULE, "pcfclock"); ++# 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); +@@ -563,10 +604,16 @@ + for (n = 0; n < PCFCLOCK_NO; n++) { + if (pcfclock_table[n].dev != NULL) { + parport_unregister_device(pcfclock_table[n].dev); ++ CLASS_DEVICE_DESTROY(pcfclock_class, MKDEV(PCFCLOCK_MAJOR, n)); ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) + devfs_remove("pcfclocks/%d", n); ++# endif + } + } ++ CLASS_DESTROY(pcfclock_class); ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) + devfs_remove("pcfclocks"); ++# endif + #else + devfs_unregister(devfs_handle); + devfs_unregister_chrdev(PCFCLOCK_MAJOR, "pcfclock"); diff --git a/sys-apps/pcfclock/pcfclock-0.44-r3.ebuild b/sys-apps/pcfclock/pcfclock-0.44-r3.ebuild index 23d993971c88..2af37154ed40 100644 --- a/sys-apps/pcfclock/pcfclock-0.44-r3.ebuild +++ b/sys-apps/pcfclock/pcfclock-0.44-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/pcfclock-0.44-r3.ebuild,v 1.1 2007/01/08 20:29:10 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/pcfclock-0.44-r3.ebuild,v 1.2 2008/07/14 23:04:18 sbriesen Exp $ inherit eutils linux-mod @@ -46,7 +46,7 @@ src_install() { dodoc AUTHORS ChangeLog NEWS README THANKS # Add configuration for udev - if [ -e ${ROOT}dev/.udev ]; then + if [ -e "${ROOT}dev/.udev" ]; then dodir /etc/udev/rules.d echo 'KERNEL=="pcfclock*", NAME="%k", MODE="0444"' \ > "${D}/etc/udev/rules.d/55-${PN}.rules" diff --git a/sys-apps/pcfclock/pcfclock-0.44-r4.ebuild b/sys-apps/pcfclock/pcfclock-0.44-r4.ebuild new file mode 100644 index 000000000000..0d740ba0cc3f --- /dev/null +++ b/sys-apps/pcfclock/pcfclock-0.44-r4.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/pcfclock-0.44-r4.ebuild,v 1.1 2008/07/14 23:04:18 sbriesen Exp $ + +inherit eutils linux-mod + +DESCRIPTION="driver for the parallel port radio clock sold by Conrad Electronic" +HOMEPAGE="http://www-stud.ims.uni-stuttgart.de/~voegelas/pcf.html" +SRC_URI="http://www-stud.ims.uni-stuttgart.de/~voegelas/pcfclock/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc" +IUSE="" + +DEPEND="virtual/linux-sources" + +pkg_setup() { + CONFIG_CHECK="PARPORT" + linux-mod_pkg_setup + BUILD_TARGETS="all" + ECONF_PARAMS="--with-linux=${KERNEL_DIR}" + MODULE_NAMES="pcfclock(::${S}/linux)" + MODULESD_PCFCLOCK_ENABLED="yes" + MODULESD_PCFCLOCK_EXAMPLES=( "pcfclock parport=0,none,none" ) + MODULESD_PCFCLOCK_ALIASES=( + "char-major-181 pcfclock" + "/dev/pcfclock0 char-major-181" + "/dev/pcfclock1 char-major-181" + "/dev/pcfclock2 char-major-181" + ) +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-kernel-2.6.26.diff" + convert_to_m "linux/Makefile.in" +} + +src_install() { + linux-mod_src_install + dosbin pcfdate/pcfdate + doman {linux,pcfdate}/*.[48] + dodoc AUTHORS ChangeLog NEWS README THANKS + + # Add configuration for udev + if [ -e "${ROOT}dev/.udev" ]; then + dodir /etc/udev/rules.d + echo 'KERNEL=="pcfclock*", NAME="%k", MODE="0444"' \ + > "${D}/etc/udev/rules.d/55-${PN}.rules" + fi +} |