diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-block/rts_pstor | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sys-block/rts_pstor')
-rw-r--r-- | sys-block/rts_pstor/Manifest | 5 | ||||
-rw-r--r-- | sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch | 7 | ||||
-rw-r--r-- | sys-block/rts_pstor/metadata.xml | 3 | ||||
-rw-r--r-- | sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild | 16 |
4 files changed, 20 insertions, 11 deletions
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest index febfd9a3b073..1d2eee95dc59 100644 --- a/sys-block/rts_pstor/Manifest +++ b/sys-block/rts_pstor/Manifest @@ -1,5 +1,6 @@ AUX fix-compile-kernel-5.0.0.patch 716 BLAKE2B ecb1bbdaf80d7e801f6e316308f559f29b4f0a5a431dc74aea82fd771e4ba31945ed77b5041398c0bee144f7912e89c91b55f29158e866dbde3687c50425c1c0 SHA512 5eeb472b97ca4742358e6002afc3d7839b1d25d0e08e72badf0447b0d951b2950c195a9120288b377a45ea118af754b5418a7ff251b463df457a1c201cc5d107 +AUX rts_pstor-makefile-kernel-5.1.patch 204 BLAKE2B e5b84e6e1c08ecbb4ee88f51ab8d485b50604660bd09198a443f0e15e45e2f766a036fb7f81b3a5f8cf3e0c508070d216ac5532a646dff88ef1816a1b6b8be5b SHA512 440b431326f10f9becf7ef118e58e1b708fb109f6b58e5a06aad1581a33503e08078d186cd5298de09b27b62f885a140daa2245bf50e7b801fbb09a934fa27d8 AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311 -EBUILD rts_pstor-1.10_p20160103.ebuild 1388 BLAKE2B d4b8ed4a1a796283a275ebc152f5ab24423cf2739194853684f0797f355815003ed5b2a31b4c63c347fd8a41255dc866d15d8debd7f8d596c55c7126f7627a29 SHA512 7281a71816d36acf67f2a70275a49956b8f555c61eb411576caee572a3e7c18c5ab2da2d54cf0fd5fa27f55ed54b2373a282ef82e5a8a8f62c52f473dacfad6e -MISC metadata.xml 433 BLAKE2B 68ad81664e636facb6f248effc7c3ef58ea0c3cc86cc306b0862113665a296bcffe4df996861367eb98e26589c6124282a75d193fe1b84e90cbce12819b9279f SHA512 ef139e88440c4ad838b50a762373588a832dd4230596034399cb1b2fbb246a1fe957c8af86d98d80918fa747f2a0abad960af8a5144acbcd808dc956a833515b +EBUILD rts_pstor-1.10_p20160103.ebuild 1655 BLAKE2B bf8cf45663b501a08f6a7ef6d7eb4035fb516f56ac53ca1c7b4b8b9002bcb516735f377a31e8766d08c976618ae688b201cf083b80c43b1854b74936ec239d0f SHA512 fd57a275c389f35a327ae3de379dc1d52bc65c148c88f9321226cff015321953a8e1dec53d09e7733d02a73537d8d45ea6d086fa15eb05f25714956564e32294 +MISC metadata.xml 338 BLAKE2B 518a4272f88da61f60f7ec2269dda5108abc8346f08e497d2bc8fd7d65700cb0e5e0bebbfb3503e44dc033452045c335c1d2c5e52dd8222d9467b578dfb79b09 SHA512 8de518f5f270304254bd185f4057700a117d05d151a981a887835c9f1af77fcaeb4c4cee3a9779e20ca28500779b16b3c09c4bdc619dc4d39e114d6b698e2ebe diff --git a/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch b/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch new file mode 100644 index 000000000000..ff527e8a530a --- /dev/null +++ b/sys-block/rts_pstor/files/rts_pstor-makefile-kernel-5.1.patch @@ -0,0 +1,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -36,3 +36,3 @@ + cp -f ./define.release ./define.h +- make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules ++ +make -C $(KERNELDIR) M=$(PWD) modules + debug: diff --git a/sys-block/rts_pstor/metadata.xml b/sys-block/rts_pstor/metadata.xml index ab7993355b87..429074c44a31 100644 --- a/sys-block/rts_pstor/metadata.xml +++ b/sys-block/rts_pstor/metadata.xml @@ -8,7 +8,4 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <longdescription lang="en"> - PCI-E RTS5209 card reader driver for Linux. - </longdescription> </pkgmetadata> diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild index e9b31fc3584d..aebf0d373c10 100644 --- a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild +++ b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,10 +16,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" DEPEND="virtual/linux-sources" -PATCHES=( - "${FILESDIR}/rts_pstor-makefile.patch" - "${FILESDIR}/fix-compile-kernel-5.0.0.patch" -) S="${WORKDIR}/RTS5209-linux-driver-${GIT_COMMIT}" MODULE_NAMES="rts_pstor(misc/drivers/scsi)" @@ -29,8 +25,16 @@ MODULESD_RTS_PSTOR_ADDITIONS=( ) BUILD_TARGETS="default" BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" -CONFIG_CHECK="~!MISC_RTSX_PCI" +CONFIG_CHECK="~!MISC_RTSX_PCI !FORTIFY_SOURCE" ERROR_MISC_RTSX_PCI="CONFIG_MISC_RTSX_PCI: The in-kernel driver rtsx_pci is configured, which may have the same functionality than this driver. To make sure that your kernel loads only rts_pstor, the rtsx_pci module will be blacklisted." +ERROR_FORTIFY_SOURCE="CONFIG_FORTIFY_SOURCE: this module is known to fail compiling when the hardening option CONFIG_FORTIFY_SOURCE is set" + +src_prepare() { + default + + eapply "${FILESDIR}/fix-compile-kernel-5.0.0.patch" + kernel_is le 5 0 && eapply "${FILESDIR}/rts_pstor-makefile.patch" || eapply "${FILESDIR}/rts_pstor-makefile-kernel-5.1.patch" +} pkg_postinst() { elog "This driver is based on code published by Realtek. There is a driver in the kernel named rtsx_pci which" |