From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- sci-libs/linux-gpib-modules/Manifest | 2 + .../linux-gpib-modules-4.3.4-kernel-5.17.patch | 24 ++++++++ .../linux-gpib-modules-4.3.4-r1.ebuild | 69 ++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch create mode 100644 sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild (limited to 'sci-libs/linux-gpib-modules') diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest index aac42b2558db..930e192e293b 100644 --- a/sci-libs/linux-gpib-modules/Manifest +++ b/sci-libs/linux-gpib-modules/Manifest @@ -1,5 +1,7 @@ +AUX linux-gpib-modules-4.3.4-kernel-5.17.patch 853 BLAKE2B 501282329fdf34d2bb0ccbed9f8bb865711d505ba2a444d659fc97deffae27d179cad522239efd4c63767705e45881c6fb6e1d2f6815085204215bbcbd89606b SHA512 275c693b35885f4913345de26ca17c88deecd3e8513e73787342808fb4ed021dbfc88e6233b5f04cd6b892e43a601a24de27fd656ba6085b3027acbe96c7bc55 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5 EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c +EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1334 BLAKE2B 592bf2c852575e7da96bd8a5ba2af12be7443287930c73f09cc8627071da1f9c88e7bd9f90bb3093a3c83030a88d37daef19da0fd2975585d55530c38f7badcb SHA512 d21bfe260d126a3e846da56d183ed21e6f84a406f3b547c9a6b997f22d689b609da4abc07f23b71d9861fd7698ad5b94e043517b181952fa4663da2e41605992 EBUILD linux-gpib-modules-4.3.4.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4 diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch new file mode 100644 index 000000000000..894c33466627 --- /dev/null +++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch @@ -0,0 +1,24 @@ +diff --git a/drivers/gpib/eastwood/fluke_gpib.c b/drivers/gpib/eastwood/fluke_gpib.c +index daebaaa..7edece1 100644 +--- a/drivers/gpib/eastwood/fluke_gpib.c ++++ b/drivers/gpib/eastwood/fluke_gpib.c +@@ -910,7 +910,6 @@ static int fluke_config_dma(gpib_board_t *board, int output) + config.src_maxburst = 1; + config.dst_maxburst = 1; + config.device_fc = true; +- config.slave_id = 0; + + if(output) + { +diff --git a/drivers/gpib/fmh_gpib/fmh_gpib.c b/drivers/gpib/fmh_gpib/fmh_gpib.c +index c4ef7d2..d245278 100644 +--- a/drivers/gpib/fmh_gpib/fmh_gpib.c ++++ b/drivers/gpib/fmh_gpib/fmh_gpib.c +@@ -926,7 +926,6 @@ static int fmh_gpib_config_dma(gpib_board_t *board, int output) + fmh_gpib_private_t *e_priv = board->private_data; + struct dma_slave_config config; + config.device_fc = true; +- config.slave_id = 0; + + if(e_priv->dma_burst_length < 1) + { diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild new file mode 100644 index 000000000000..3c48db034bcd --- /dev/null +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info linux-mod + +DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware" +HOMEPAGE="https://linux-gpib.sourceforge.io/" +SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz" +S="${WORKDIR}/linux-gpib-kernel-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug" + +COMMONDEPEND="" +RDEPEND="${COMMONDEPEND} + acct-group/gpib +" +DEPEND="${COMMONDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # https://sourceforge.net/p/linux-gpib/code/1998/ + "${FILESDIR}/${P}-kernel-5.17.patch" +) + +pkg_setup() { + linux-mod_pkg_setup + + if kernel_is -lt 2 6 8; then + die "Kernel versions older than 2.6.8 are not supported." + fi +} + +src_unpack() { + default + unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz" +} + +src_configure() { + set_arch_to_kernel + + my_gpib_makeopts='' + use debug && my_gpib_makeopts+='GPIB-DEBUG=1 ' + + my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} " +} + +src_compile() { + set_arch_to_kernel + emake \ + ${my_gpib_makeopts} +} + +src_install() { + set_arch_to_kernel + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + DEPMOD="/bin/true" \ + docdir="${ED}/usr/share/doc/${PF}/html" \ + ${my_gpib_makeopts} \ + install + + dodoc ChangeLog AUTHORS README* NEWS +} -- cgit v1.2.3