Skip to content

Commit

Permalink
sys-block/rts_pstor: fix compile with kernel >5.1
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/702490
Closes: https://bugs.gentoo.org/702492
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
Closes: #14818
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
  • Loading branch information
madmartin authored and juippis committed Mar 9, 2020
1 parent 81b2e9f commit fd2beb1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
7 changes: 7 additions & 0 deletions 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:
16 changes: 10 additions & 6 deletions 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
Expand All @@ -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)"
Expand All @@ -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"
Expand Down

0 comments on commit fd2beb1

Please sign in to comment.