From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- sys-block/rts_pstor/Manifest | 5 -- .../rts_pstor/files/rts_pstor-linux-3.10.patch | 53 ---------------------- .../rts_pstor/files/rts_pstor-linux-3.8.patch | 29 ------------ sys-block/rts_pstor/files/rts_pstor-vmalloc.patch | 44 ------------------ sys-block/rts_pstor/rts_pstor-1.10-r5.ebuild | 38 ---------------- 5 files changed, 169 deletions(-) delete mode 100644 sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch delete mode 100644 sys-block/rts_pstor/files/rts_pstor-linux-3.8.patch delete mode 100644 sys-block/rts_pstor/files/rts_pstor-vmalloc.patch delete mode 100644 sys-block/rts_pstor/rts_pstor-1.10-r5.ebuild (limited to 'sys-block/rts_pstor') diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest index a585bcabe668..7d1480cadce2 100644 --- a/sys-block/rts_pstor/Manifest +++ b/sys-block/rts_pstor/Manifest @@ -1,9 +1,4 @@ -AUX rts_pstor-linux-3.10.patch 1268 BLAKE2B 110165baca81dce2c176cf26852665f666826cdf6d962086d69a59f954e0f800ec555e951cc6829890fa88353f782c04db74b3c9326f2fb6495d26114d38861e SHA512 51eb565d7498e7f8a3805b2142dae013224ee9161bf988a9f34b11fa2dd57499a4bd603e7cff1e9960e92a235f023bc89ff97c28fb8fc586a9598683388183b3 -AUX rts_pstor-linux-3.8.patch 829 BLAKE2B 8cdd7c26c905156cd1cdd8e1a4c2ab5c1a0c82d77cf46cb158f226d3dd7f0f7bcaafaa52b6c70ac500a624beb8fbe2cdfa353c3046ee3f1c5d82ee2e586d50ff SHA512 8ee281925ebbd45d857614a8bcd5d0f92ba8df3e360646d0ffb5288765638e93dde7e92996b55f8c11bcdc2b7e12ae22230a1ea394eb6b2a5c00913570075753 AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca -AUX rts_pstor-vmalloc.patch 1403 BLAKE2B 3421a93ef3af630538aa22dbbbfaaddf5629f6a647a60c48d3fa66584021e8b84da105ac20590ee73335ffdaf130de7700fad84ae0a56f5c218e376f8c24b2bb SHA512 4d6f73129b3df94ff9de5e486811a9a771988b0fd4b1452f703c513921750a99b81a1c4bb66e761a021f5da7614f7dde430ebd8fd0593da08500ebfdbc7fdd8c -DIST rts_pstor-1.10.tar.bz2 79549 BLAKE2B 6ed1a31c46920f30b16c3cd4bda9978bffe40c2f88fdd2d63ef128d3a4ce22a6850846e4f5f1bf55200ed03a227a61bfcaefec4abdf598a43c8a7d8ca2991280 SHA512 26d29ccda55672adab8b96a8318e240d0c9d50ebf614853284cf218058c5788cc83b818ce118ac313c0ce6a67aef8ad13d93ed26212db7e05db51b8a7860b48d DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311 -EBUILD rts_pstor-1.10-r5.ebuild 1050 BLAKE2B 812cd16868a170c297e8b76f5e0f58c68665b7108f8cd8c1c2a1892d436583eced16475372c4af521672045ca39629f02ac7c270cd5df68c43f644c07082cc99 SHA512 d625c0e31adfbfb4761f61a21f5075b5d029eb32011e04cb75cad13d84bdb87fa86e1fa2dd426dd82c18d6379b4f4d2928b9e3c9584b5ddce33f409fa5fcb072 EBUILD rts_pstor-1.10_p20160103.ebuild 1342 BLAKE2B b649f3ac801ab6fb1711fc13c8660a3ced1aba39d29c362487d9b1dd8b2efea8af04900ce1fdeef44c9a82f44f99e25228cb6a4643ba27396ae35f0877fdf111 SHA512 e6d936d860a7934e20cfc6fc85a3602649d98683d83c4b2fd303dcee084d0ad4e006377d0e1ff279a5a1411c030f72510fd5a6664cb7bf2486a2c26a7c757bf8 MISC metadata.xml 433 BLAKE2B 68ad81664e636facb6f248effc7c3ef58ea0c3cc86cc306b0862113665a296bcffe4df996861367eb98e26589c6124282a75d193fe1b84e90cbce12819b9279f SHA512 ef139e88440c4ad838b50a762373588a832dd4230596034399cb1b2fbb246a1fe957c8af86d98d80918fa747f2a0abad960af8a5144acbcd808dc956a833515b diff --git a/sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch b/sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch deleted file mode 100644 index 0070549b88d8..000000000000 --- a/sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- rts_pstor.a/rtsx.c 2013-07-03 05:39:26.316723407 +0530 -+++ rts_pstor.b/rtsx.c 2013-07-03 05:28:28.584882761 +0530 -@@ -135,38 +135,18 @@ - - - #undef SPRINTF --#define SPRINTF(args...) \ -- do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0) -+#define SPRINTF(args...) seq_printf(m, ##args) - --static int proc_info (struct Scsi_Host *host, char *buffer, -- char **start, off_t offset, int length, int inout) -+static int show_info(struct seq_file *m, struct Scsi_Host *host) - { -- char *pos = buffer; -- -- -- if (inout) -- return length; -- - - SPRINTF(" Host scsi%d: %s\n", host->host_no, CR_DRIVER_NAME); -- - - SPRINTF(" Vendor: Realtek Corp.\n"); - SPRINTF(" Product: PCIE Card Reader\n"); - SPRINTF(" Version: %s\n", DRIVER_VERSION); - SPRINTF(" Build: %s\n", DRIVER_MAKE_TIME); -- -- /* -- * Calculate start of next buffer, and return value. -- */ -- *start = buffer + offset; -- -- if ((pos - buffer) < offset) -- return (0); -- else if ((pos - buffer - offset) < length) -- return (pos - buffer - offset); -- else -- return (length); -+ return 0; - } - - -@@ -272,7 +252,7 @@ - - .name = CR_DRIVER_NAME, - .proc_name = CR_DRIVER_NAME, -- .proc_info = proc_info, -+ .show_info = show_info, - .info = host_info, - - diff --git a/sys-block/rts_pstor/files/rts_pstor-linux-3.8.patch b/sys-block/rts_pstor/files/rts_pstor-linux-3.8.patch deleted file mode 100644 index 797b1088f31b..000000000000 --- a/sys-block/rts_pstor/files/rts_pstor-linux-3.8.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- rts_pstor.a/rtsx.c 2011-01-11 14:41:07.000000000 +0530 -+++ rts_pstor.b/rtsx.c 2013-05-29 00:39:11.319267655 +0530 -@@ -913,7 +913,7 @@ - chip->s3_pwr_off_delay = 1000; - } - --static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) -+static int rtsx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) - { - struct Scsi_Host *host; - struct rtsx_dev *dev; -@@ -1077,7 +1077,7 @@ - } - - --static void __devexit rtsx_remove(struct pci_dev *pci) -+static void rtsx_remove(struct pci_dev *pci) - { - struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci); - -@@ -1104,7 +1104,7 @@ - .name = CR_DRIVER_NAME, - .id_table = rtsx_ids, - .probe = rtsx_probe, -- .remove = __devexit_p(rtsx_remove), -+ .remove = rtsx_remove, - #ifdef CONFIG_PM - .suspend = rtsx_suspend, - .resume = rtsx_resume, diff --git a/sys-block/rts_pstor/files/rts_pstor-vmalloc.patch b/sys-block/rts_pstor/files/rts_pstor-vmalloc.patch deleted file mode 100644 index 3b3f4beb885d..000000000000 --- a/sys-block/rts_pstor/files/rts_pstor-vmalloc.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur rts_pstor.a/ms.c rts_pstor.b/ms.c ---- rts_pstor.a/ms.c 2011-01-11 04:11:07.000000000 -0500 -+++ rts_pstor.b/ms.c 2015-09-17 01:28:41.816067799 -0400 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "rtsx.h" - #include "rtsx_transport.h" -diff -Naur rts_pstor.a/rtsx_chip.c rts_pstor.b/rtsx_chip.c ---- rts_pstor.a/rtsx_chip.c 2011-01-11 04:11:07.000000000 -0500 -+++ rts_pstor.b/rtsx_chip.c 2015-09-17 01:28:13.680536901 -0400 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "rtsx.h" - #include "rtsx_transport.h" -diff -Naur rts_pstor.a/rtsx_scsi.c rts_pstor.b/rtsx_scsi.c ---- rts_pstor.a/rtsx_scsi.c 2011-01-11 04:11:07.000000000 -0500 -+++ rts_pstor.b/rtsx_scsi.c 2015-09-17 01:28:42.688053259 -0400 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "rtsx.h" - #include "rtsx_transport.h" -diff -Naur rts_pstor.a/xd.c rts_pstor.b/xd.c ---- rts_pstor.a/xd.c 2011-01-11 04:11:07.000000000 -0500 -+++ rts_pstor.b/xd.c 2015-09-17 01:28:42.689053242 -0400 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "rtsx.h" - #include "rtsx_transport.h" diff --git a/sys-block/rts_pstor/rts_pstor-1.10-r5.ebuild b/sys-block/rts_pstor/rts_pstor-1.10-r5.ebuild deleted file mode 100644 index 82466767b794..000000000000 --- a/sys-block/rts_pstor/rts_pstor-1.10-r5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit linux-mod - -DESCRIPTION="PCIE RTS5209 card reader driver for Linux" -HOMEPAGE="http://www.realtek.com.tw/Downloads/downloadsView.aspx?PNid=15&PFid=25&Level=4&Conn=3&DownTypeID=3" -SRC_URI="https://dev.gentoo.org/~vikraman/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}" - -MODULE_NAMES="rts_pstor(misc/drivers/scsi)" -BUILD_TARGETS="default" - -src_prepare() { - sed -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' \ - -i Makefile || die "Sed failed!" - ([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 8 ])) \ - && epatch "${FILESDIR}/${PN}-linux-3.8.patch" - ([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 10 ])) \ - && epatch "${FILESDIR}/${PN}-linux-3.10.patch" - epatch "${FILESDIR}/${PN}-vmalloc.patch" -} - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" -} -- cgit v1.2.3