* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
@ 2018-10-13 16:14 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2018-10-13 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 9330c661a3112fde869c39145ae4793db74ccf28
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 16:09:56 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 16:13:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9330c661
sci-libs/linux-gpib-modules: New package, split out of sci-libs/linux-gpib
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
sci-libs/linux-gpib-modules/Manifest | 1 +
...inux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch | 10 +++
.../linux-gpib-modules-4.2.0_rc1-reallydie.patch | 15 ++++
.../linux-gpib-modules-4.2.0_rc1.ebuild | 83 ++++++++++++++++++++++
sci-libs/linux-gpib-modules/metadata.xml | 18 +++++
5 files changed, 127 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
new file mode 100644
index 00000000000..de0878b97c2
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -0,0 +1 @@
+DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
new file mode 100644
index 00000000000..c3a9764924c
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
@@ -0,0 +1,10 @@
+--- linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.000000000 +0100
++++ linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2017-05-02 00:59:04.509950834 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/file.h>
+ #include <linux/timer.h>
+ #include <linux/delay.h>
++#include <linux/sched/signal.h>
+ #include <asm/uaccess.h>
+
+ #include "gpibP.h"
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
new file mode 100644
index 00000000000..cba29eece37
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
@@ -0,0 +1,15 @@
+diff -ruN linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am
+--- linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am 2018-10-02 11:32:11.000000000 +0200
++++ linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am 2018-10-09 12:03:21.272433209 +0200
+@@ -14,10 +14,8 @@
+
+ -include $(top_srcdir)/util/linux_flags/flags
+
+-#ignore errors from kernel's make modules in all-local, to avoid failure of make install
+-#on nfs filesystem with root_squash
+ all-local:
+- -$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
++ $(MAKE) -C $(LINUX_SRCDIR) V=1 modules\
+ CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/compat/include" \
+ CONFIG_GPIB_ISA="$(ENABLE_ISA)" \
+ SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
new file mode 100644
index 00000000000..749c802706e
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod autotools toolchain-funcs
+
+MY_PN=${PN/modules/kernel}
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
+)
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+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
+
+ # https://sourceforge.net/p/linux-gpib/bugs/43/
+ if use pcmcia && kernel_is -ge 2 6 38; then
+ die "pcmcia support is broken on kernels newer 2.6.38"
+ fi
+}
+
+src_prepare () {
+ default
+ kernel_is ge 4 11 0 && eapply "${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
+ eautoreconf
+}
+
+src_configure() {
+ set_arch_to_kernel
+ econf \
+ $(use_enable isa) \
+ $(use_enable pcmcia) \
+ $(use_enable debug driver-debug) \
+ --with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${D}" \
+ INSTALL_MOD_PATH="${D}" \
+ docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${D}" \
+ INSTALL_MOD_PATH="${D}" \
+ docdir=/usr/share/doc/${PF}/html install
+
+ dodoc ChangeLog AUTHORS README* NEWS
+}
+
+pkg_preinst () {
+ linux-mod_pkg_preinst
+ enewgroup gpib
+}
+
+pkg_postinst () {
+ linux-mod_pkg_postinst
+}
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
new file mode 100644
index 00000000000..b53300ac1ed
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dilfridge@gentoo.org</email>
+ <name>Andreas K. Huettel</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci-electronics@gentoo.org</email>
+ <name>Gentoo Electronics Project</name>
+ </maintainer>
+ <use>
+ <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">linux-gpib</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
@ 2020-04-18 14:42 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2020-04-18 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 93d5c4ae1b82360f01e2278c83728c1d2be7774e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 14:15:37 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 14:42:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d5c4ae
sci-libs/linux-gpib-modules: Version bump
Bug: https://bugs.gentoo.org/704294
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../files/linux-gpib-modules-4.3.0-kernel53.patch | 37 ++++++++++
.../linux-gpib-modules-4.3.0.ebuild | 79 ++++++++++++++++++++++
3 files changed, 117 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 994c2964211..aa8f8447c49 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1 +1,2 @@
DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
+DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
new file mode 100644
index 00000000000..e650ccb5ed1
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
@@ -0,0 +1,37 @@
+Index: linux-gpib-kernel/compat/include/linux/device.h
+===================================================================
+--- linux-gpib-kernel/compat/include/linux/device.h (revision 1867)
++++ linux-gpib-kernel/compat/include/linux/device.h (revision 1868)
+@@ -144,4 +144,10 @@
+
+ #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
++#define DRIVER_FIND_DEVICE_DATA_TYPE void *
++#else
++#define DRIVER_FIND_DEVICE_DATA_TYPE const void *
++#endif
++
+ #endif // __COMPAT_LINUX_DEVICE_H_
+Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1867)
++++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1868)
+@@ -982,7 +982,7 @@
+ }
+
+ /* Match callback for driver_find_device */
+-static int fmh_gpib_device_match(struct device *dev, void *data)
++static int fmh_gpib_device_match(struct device *dev, DRIVER_FIND_DEVICE_DATA_TYPE data)
+ {
+ const gpib_board_config_t *config = data;
+
+@@ -1014,7 +1014,7 @@
+ struct platform_device *pdev;
+
+ board->dev = driver_find_device(&fmh_gpib_platform_driver.driver,
+- NULL, (void*)config, &fmh_gpib_device_match);
++ NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config, &fmh_gpib_device_match);
+ if(board->dev == NULL)
+ {
+ printk("No matching fmh_gpib_core device was found, attach failed.");
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
new file mode 100644
index 00000000000..957aefc659a
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod toolchain-funcs
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ !<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.3.0-kernel53.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 '
+}
+
+src_compile() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${D}" \
+ INSTALL_MOD_PATH="${D}" \
+ docdir=/usr/share/doc/${PF}/html \
+ ${my_gpib_makeopts}
+}
+
+src_install() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${D}" \
+ INSTALL_MOD_PATH="${D}" \
+ DEPMOD="/bin/true" \
+ docdir=/usr/share/doc/${PF}/html \
+ ${my_gpib_makeopts} \
+ install
+
+ dodoc ChangeLog AUTHORS README* NEWS
+}
+
+pkg_preinst() {
+ linux-mod_pkg_preinst
+ enewgroup gpib
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
@ 2020-05-09 11:02 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2020-05-09 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 088ef797f93b95e5ea1690d7bdd8c38f8f033419
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 10:58:22 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 9 11:02:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088ef797
sci-libs/linux-gpib-modules: Version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.3.2-returntype.patch | 50 +++++++++++++++
.../linux-gpib-modules-4.3.2.ebuild | 73 ++++++++++++++++++++++
3 files changed, 124 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index aa8f8447c49..f0c93807e78 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1,3 @@
DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
+DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
new file mode 100644
index 00000000000..88aa1808157
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
@@ -0,0 +1,50 @@
+https://sourceforge.net/p/linux-gpib/code/1901/
+
+Index: linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c (revision 1900)
++++ linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c (revision 1901)
+@@ -114,15 +114,15 @@
+ fluke_private_t *priv = board->private_data;
+ return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
+ }
+-void fluke_primary_address(gpib_board_t *board, unsigned int address)
++int fluke_primary_address(gpib_board_t *board, unsigned int address)
+ {
+ fluke_private_t *priv = board->private_data;
+- nec7210_primary_address(board, &priv->nec7210_priv, address);
++ return nec7210_primary_address(board, &priv->nec7210_priv, address);
+ }
+-void fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
++int fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
+ {
+ fluke_private_t *priv = board->private_data;
+- nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
++ return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
+ }
+ int fluke_parallel_poll(gpib_board_t *board, uint8_t *result)
+ {
+Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1900)
++++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1901)
+@@ -100,15 +100,15 @@
+ fmh_gpib_private_t *priv = board->private_data;
+ return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
+ }
+-void fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
++int fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
+ {
+ fmh_gpib_private_t *priv = board->private_data;
+- nec7210_primary_address(board, &priv->nec7210_priv, address);
++ return nec7210_primary_address(board, &priv->nec7210_priv, address);
+ }
+-void fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
++int fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
+ {
+ fmh_gpib_private_t *priv = board->private_data;
+- nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
++ return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
+ }
+ int fmh_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
+ {
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
new file mode 100644
index 00000000000..031ea676682
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod toolchain-funcs
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ acct-group/gpib
+ !<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
+PATCHES=(
+ "${FILESDIR}/${P}-returntype.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 \
+ DESTDIR="${D}" \
+ INSTALL_MOD_PATH="${D}" \
+ docdir=/usr/share/doc/${PF}/html \
+ ${my_gpib_makeopts}
+}
+
+src_install() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${D}" \
+ INSTALL_MOD_PATH="${D}" \
+ DEPMOD="/bin/true" \
+ docdir=/usr/share/doc/${PF}/html \
+ ${my_gpib_makeopts} \
+ install
+
+ dodoc ChangeLog AUTHORS README* NEWS
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
@ 2021-02-18 18:57 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
commit: c7254ac90be24880f937be977c833a27b4f99bac
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 18 18:56:13 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 18:56:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7254ac9
sci-libs/linux-gpib-modules: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 2 -
.../files/linux-gpib-modules-4.3.0-kernel53.patch | 37 -----------
.../linux-gpib-modules-4.3.2-returntype.patch | 50 ---------------
.../linux-gpib-modules-4.3.0-r1.ebuild | 73 ----------------------
.../linux-gpib-modules-4.3.2-r1.ebuild | 73 ----------------------
5 files changed, 235 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 86d2b29a7d8..fe28a9e7253 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,4 +1,2 @@
-DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
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
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
deleted file mode 100644
index e650ccb5ed1..00000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: linux-gpib-kernel/compat/include/linux/device.h
-===================================================================
---- linux-gpib-kernel/compat/include/linux/device.h (revision 1867)
-+++ linux-gpib-kernel/compat/include/linux/device.h (revision 1868)
-@@ -144,4 +144,10 @@
-
- #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
-+#define DRIVER_FIND_DEVICE_DATA_TYPE void *
-+#else
-+#define DRIVER_FIND_DEVICE_DATA_TYPE const void *
-+#endif
-+
- #endif // __COMPAT_LINUX_DEVICE_H_
-Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
-===================================================================
---- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1867)
-+++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1868)
-@@ -982,7 +982,7 @@
- }
-
- /* Match callback for driver_find_device */
--static int fmh_gpib_device_match(struct device *dev, void *data)
-+static int fmh_gpib_device_match(struct device *dev, DRIVER_FIND_DEVICE_DATA_TYPE data)
- {
- const gpib_board_config_t *config = data;
-
-@@ -1014,7 +1014,7 @@
- struct platform_device *pdev;
-
- board->dev = driver_find_device(&fmh_gpib_platform_driver.driver,
-- NULL, (void*)config, &fmh_gpib_device_match);
-+ NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config, &fmh_gpib_device_match);
- if(board->dev == NULL)
- {
- printk("No matching fmh_gpib_core device was found, attach failed.");
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
deleted file mode 100644
index 88aa1808157..00000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://sourceforge.net/p/linux-gpib/code/1901/
-
-Index: linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c
-===================================================================
---- linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c (revision 1900)
-+++ linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c (revision 1901)
-@@ -114,15 +114,15 @@
- fluke_private_t *priv = board->private_data;
- return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
- }
--void fluke_primary_address(gpib_board_t *board, unsigned int address)
-+int fluke_primary_address(gpib_board_t *board, unsigned int address)
- {
- fluke_private_t *priv = board->private_data;
-- nec7210_primary_address(board, &priv->nec7210_priv, address);
-+ return nec7210_primary_address(board, &priv->nec7210_priv, address);
- }
--void fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
-+int fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
- {
- fluke_private_t *priv = board->private_data;
-- nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
-+ return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
- }
- int fluke_parallel_poll(gpib_board_t *board, uint8_t *result)
- {
-Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
-===================================================================
---- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1900)
-+++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1901)
-@@ -100,15 +100,15 @@
- fmh_gpib_private_t *priv = board->private_data;
- return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
- }
--void fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
-+int fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
- {
- fmh_gpib_private_t *priv = board->private_data;
-- nec7210_primary_address(board, &priv->nec7210_priv, address);
-+ return nec7210_primary_address(board, &priv->nec7210_priv, address);
- }
--void fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
-+int fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
- {
- fmh_gpib_private_t *priv = board->private_data;
-- nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
-+ return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
- }
- int fmh_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
- {
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
deleted file mode 100644
index 388a9a97a8c..00000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- acct-group/gpib
- !<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.3.0-kernel53.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 \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts}
-}
-
-src_install() {
- set_arch_to_kernel
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- DEPMOD="/bin/true" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts} \
- install
-
- dodoc ChangeLog AUTHORS README* NEWS
-}
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
deleted file mode 100644
index 031ea676682..00000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- acct-group/gpib
- !<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-PATCHES=(
- "${FILESDIR}/${P}-returntype.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 \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts}
-}
-
-src_install() {
- set_arch_to_kernel
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- DEPMOD="/bin/true" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts} \
- install
-
- dodoc ChangeLog AUTHORS README* NEWS
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
@ 2022-04-24 15:42 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2022-04-24 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 7afec29ff20bdae5831a4ea0ac264a323114c221
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 15:41:34 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 15:41:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7afec29f
sci-libs/linux-gpib-modules: update EAPI 6 -> 8
and fix build with kernel 5.17.X
Bug: https://bugs.gentoo.org/836110
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../linux-gpib-modules-4.3.4-kernel-5.17.patch | 24 ++++++++
.../linux-gpib-modules-4.3.4-r1.ebuild | 69 ++++++++++++++++++++++
2 files changed, 93 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
@ 2023-07-12 12:04 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2023-07-12 12:04 UTC (permalink / raw
To: gentoo-commits
commit: cf2e4eb2cad25a7b4647faebe6509c1033b49ba8
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 12:02:13 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 12:04:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2e4eb2
sci-libs/linux-gpib-modules: add small patch for kernel 6.4
Closes: https://bugs.gentoo.org/910230
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../linux-gpib-modules-4.3.4-kernel-6.4.patch | 27 ++++++++++++++++++++++
...2.ebuild => linux-gpib-modules-4.3.5-r3.ebuild} | 2 ++
2 files changed, 29 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch
new file mode 100644
index 000000000000..90112106584d
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch
@@ -0,0 +1,27 @@
+--- linux-gpib-kernel/compat/include/linux/device.h (revision 2052)
++++ linux-gpib-kernel/compat/include/linux/device.h (revision 2053)
+@@ -47,6 +47,13 @@
+ * for kernel versions prior to 2.6.26, so the 'drvdata' parameter of
+ * CLASS_DEVICE_CREATE() is pretty useless.
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
++#define CLASS_CREATE(owner, name) \
++ class_create(owner, name)
++#else
++#define CLASS_CREATE(owner, name) \
++ class_create(name)
++#endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ #include <pcmcia/cs_types.h>
+--- linux-gpib-kernel/drivers/gpib/sys/osinit.c (revision 2052)
++++ linux-gpib-kernel/drivers/gpib/sys/osinit.c (revision 2053)
+@@ -207,7 +207,7 @@
+ printk( "gpib: can't get major %d\n", GPIB_CODE );
+ return -EIO;
+ }
+- gpib_class = class_create(THIS_MODULE, "gpib_common");
++ gpib_class = CLASS_CREATE(THIS_MODULE, "gpib_common");
+ if(IS_ERR(gpib_class))
+ {
+ printk("gpib: failed to create gpib class\n");
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
similarity index 92%
rename from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
rename to sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
index 7be607ff4d47..0736e0159f4d 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
@@ -25,6 +25,8 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
# don't fix debian bugs if they break gentoo
"${FILESDIR}/${PN}-4.3.4-depmod.patch"
+ # https://sourceforge.net/p/linux-gpib/code/2053/
+ "${FILESDIR}/${PN}-4.3.4-kernel-6.4.patch"
)
MODULES_KERNEL_MIN=2.6.8
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-12 12:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-13 16:14 [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2020-04-18 14:42 Andreas K. Hüttel
2020-05-09 11:02 Andreas K. Hüttel
2021-02-18 18:57 David Seifert
2022-04-24 15:42 Andrew Ammerlaan
2023-07-12 12:04 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox