diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /sci-libs/linux-gpib-modules/files | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'sci-libs/linux-gpib-modules/files')
-rw-r--r-- | sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch | 15 | ||||
-rw-r--r-- | sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch | 50 |
2 files changed, 50 insertions, 15 deletions
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 cba29eece374..000000000000 --- 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/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 000000000000..88aa18081574 --- /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) + { |