[arch-commits] Commit in hwinfo/trunk (PKGBUILD custom_ioctl.patch)

[Antonio Rojas]

    Date: Saturday, June 11, 2022 @ 08:28:08
  Author: arojas
Revision: 1232178

Update to 21.81

Modified:
  hwinfo/trunk/PKGBUILD
  hwinfo/trunk/custom_ioctl.patch

--------------------+
 PKGBUILD           |   10 +++++-----
 custom_ioctl.patch |   14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-11 08:10:57 UTC (rev 1232177)
+++ PKGBUILD	2022-06-11 08:28:08 UTC (rev 1232178)
@@ -7,8 +7,8 @@
 # Contributor: ninja_pt
 
 pkgname=hwinfo
-pkgver=21.80
-pkgrel=2
+pkgver=21.81
+pkgrel=1
 pkgdesc='Hardware detection tool from openSUSE'
 arch=(x86_64)
 url='https://github.com/openSUSE/hwinfo'
@@ -17,13 +17,13 @@
 makedepends=(flex git sysfsutils)
 options=(!emptydirs)
 source=(custom_ioctl.patch
-        "git+$url#commit=f0c3415c6356432f0ed08eac1fc7b1d316b41603") # tag: 21.80
-b2sums=('f54d3b7332a887d60ea259c4d00b258c9ea5a00de3a7103f750e5794e4d52f2dff9047ef2b0685cc5a76cbe2b6acaf7e08e559083332cd033193681da24e5ec3'
+        "git+$url#commit=3d7add656d689e53329b390f4ef898a269e2a288") # tag: 21.80
+b2sums=('2b1bd3b53bbfc1e545e1a70ffd6cca08f704639a104928b2c02ccca3e82000f07a470fbdf129566ece6dfb2b98fdad0e82f18cc5c2016ebfeed043b4edb295b4'
         'SKIP')
 
 prepare() {
   cd $pkgname
-  patch -p0 -i ../custom_ioctl.patch
+  patch -p1 -i ../custom_ioctl.patch
   echo touch changelog > git2log
 }
 

Modified: custom_ioctl.patch
===================================================================
--- custom_ioctl.patch	2022-06-11 08:10:57 UTC (rev 1232177)
+++ custom_ioctl.patch	2022-06-11 08:28:08 UTC (rev 1232178)
@@ -1,6 +1,8 @@
---- src/hd/kbd.c.old	2010-03-15 23:37:52.000000000 +0800
-+++ src/hd/kbd.c	2010-03-22 10:50:58.000000000 +0800
-@@ -146,11 +146,13 @@
+diff --git a/src/hd/kbd.c b/src/hd/kbd.c
+index fa08817..184ac08 100644
+--- a/src/hd/kbd.c
++++ b/src/hd/kbd.c
+@@ -134,6 +134,7 @@ void add_serial_console(hd_data_t *hd_data)
    }
  
    if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
@@ -8,9 +10,11 @@
      if(ioctl(fd, TIOCGDEV, &u) != -1) {
        tty_major = (u >> 8) & 0xfff;
        tty_minor = (u & 0xff) | ((u >> 12) & 0xfff00);
-       ADD2LOG(DEV_CONSOLE ": major %u, minor %u\n", tty_major, tty_minor);
+@@ -152,6 +153,7 @@ void add_serial_console(hd_data_t *hd_data)
+       free_mem(dev_link);
+       free_mem(dev_name);
      }
 +    */
  
-     if (0)
+     if (dev)
  	    ;