* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/, sci-libs/linux-gpib-modules/files/
@ 2020-05-09 11:02 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2020-05-09 11:02 UTC (permalink / raw
To: gentoo-commits
commit: e08567fabca773b6aabda32093368d65a92f54c4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 11:01:47 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 9 11:02:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08567fa
sci-libs/linux-gpib-modules: Remove old
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.2.0_rc1-reallydie.patch | 15 ----
.../linux-gpib-modules-4.2.0.ebuild | 88 ----------------------
sci-libs/linux-gpib-modules/metadata.xml | 3 -
4 files changed, 107 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index f0c93807e78..0d85cdfe9ee 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,3 +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
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.2.0_rc1-reallydie.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
deleted file mode 100644
index cba29eece37..00000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
deleted file mode 100644
index 6a02d364193..00000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
+++ /dev/null
@@ -1,88 +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 autotools 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="isa pcmcia debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- !<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
-)
-
-S=${WORKDIR}/linux-gpib-kernel-${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_unpack() {
- default
- unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_prepare() {
- default
- 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}" \
- DEPMOD="/bin/true" \
- 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
index b53300ac1ed..0781b9a96b9 100644
--- a/sci-libs/linux-gpib-modules/metadata.xml
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -9,9 +9,6 @@
<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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/, sci-libs/linux-gpib-modules/files/
@ 2022-08-02 10:26 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2022-08-02 10:26 UTC (permalink / raw
To: gentoo-commits
commit: ae706e6aa468e81c88198f805c9a441b42f3d838
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 10:25:22 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 10:25:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae706e6a
sci-libs/linux-gpib-modules: Fix build if modules dir does not exist yet
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../files/linux-gpib-modules-4.3.4-depmod.patch | 21 +++++++++++++++++++++
.../linux-gpib-modules-4.3.4-r1.ebuild | 3 +++
2 files changed, 24 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
new file mode 100644
index 000000000000..e858b974324c
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
@@ -0,0 +1,21 @@
+Depmod fails here since we're still in DESTDIR and the actual target path may
+not exist...
+
+
+diff -ruN linux-gpib-kernel-4.3.4.orig/Makefile linux-gpib-kernel-4.3.4/Makefile
+--- linux-gpib-kernel-4.3.4.orig/Makefile 2020-12-29 10:42:34.000000000 +0100
++++ linux-gpib-kernel-4.3.4/Makefile 2022-08-02 12:21:38.097344102 +0200
+@@ -20,13 +20,9 @@
+ M="$(GPIB_SRCDIR)/drivers/gpib" \
+ GPIB_TOP_DIR=$(GPIB_SRCDIR)
+
+-#We run depmod explicitly because the depmod.sh script run
+-#by modules_install fails on Debian due to it failing to find
+-#the System.map file.
+ install:
+ $(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\
+ M="$(GPIB_SRCDIR)/drivers/gpib" \
+ GPIB_TOP_DIR=$(GPIB_SRCDIR) \
+ INSTALL_MOD_DIR=gpib
+- /sbin/depmod -A
+
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
index deba2dcfbbd1..40897bc634f4 100644
--- 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
@@ -25,6 +25,9 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
# https://sourceforge.net/p/linux-gpib/code/1998/
"${FILESDIR}/${P}-kernel-5.17.patch"
+
+ # don't fix debian bugs if they break gentoo
+ "${FILESDIR}/${P}-depmod.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/, sci-libs/linux-gpib-modules/files/
@ 2025-02-16 11:08 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2025-02-16 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 4ff05bebdf2bc770e37d139d2f378851367bf000
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 11:08:17 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 11:08:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff05beb
sci-libs/linux-gpib-modules: drop 4.3.5-r3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 -
.../linux-gpib-modules-4.3.4-kernel-6.4.patch | 27 ----------
.../linux-gpib-modules-4.3.5-r3.ebuild | 62 ----------------------
3 files changed, 90 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index a03e19c7378c..6d2b8be9a89a 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1 @@
-DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76
DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35
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
deleted file mode 100644
index 90112106584d..000000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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-r3.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
deleted file mode 100644
index 4306cc4b7fe7..000000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/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=(
- # 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
-
-src_unpack() {
- default
- unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
- MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" )
- use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' )
-}
-
-src_compile() {
- # The individual modules don't have separate targets so we can't use
- # modlist here.
- emake "${MODULES_MAKEARGS[@]}"
-}
-
-src_install() {
- emake \
- "${MODULES_MAKEARGS[@]}" \
- DESTDIR="${ED}" \
- INSTALL_MOD_PATH="${ED}" \
- docdir="${ED}/usr/share/doc/${PF}/html" \
- install
-
- modules_post_process
-
- dodoc ChangeLog AUTHORS README* NEWS
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-16 11:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-02 10:26 [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/, sci-libs/linux-gpib-modules/files/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2025-02-16 11:08 Andreas K. Hüttel
2020-05-09 11:02 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox