[arch-commits] Commit in hwinfo/repos/community-x86_64 (4 files)

[Alexander Rødseth]

    Date: Tuesday, November 16, 2021 @ 10:28:49
  Author: arodseth
Revision: 1048737

archrelease: copy trunk to community-x86_64

Added:
  hwinfo/repos/community-x86_64/PKGBUILD
    (from rev 1048736, hwinfo/trunk/PKGBUILD)
  hwinfo/repos/community-x86_64/custom_ioctl.patch
    (from rev 1048736, hwinfo/trunk/custom_ioctl.patch)
Deleted:
  hwinfo/repos/community-x86_64/PKGBUILD
  hwinfo/repos/community-x86_64/custom_ioctl.patch

--------------------+
 PKGBUILD           |   84 ++++++++++++++++++++++++---------------------------
 custom_ioctl.patch |   32 +++++++++----------
 2 files changed, 57 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-16 10:28:38 UTC (rev 1048736)
+++ PKGBUILD	2021-11-16 10:28:49 UTC (rev 1048737)
@@ -1,43 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Gergely Imreh <imrehg at gmail.com>
-# Contributor: champus
-# Contributor: madeye
-# Contributor: ranguvar
-# Contributor: ninja_pt
-
-pkgname=hwinfo
-pkgver=21.77
-pkgrel=3
-pkgdesc='Hardware detection tool from openSUSE'
-arch=(x86_64)
-url='https://github.com/openSUSE/hwinfo'
-license=(GPL2)
-depends=('libx86emu=3.4' perl-xml-parser perl-xml-writer)
-makedepends=(flex git sysfsutils)
-options=(!emptydirs)
-source=(custom_ioctl.patch
-        "git+$url#commit=56023b0b8b8de22944efb9e1e05e6962b1698d55") # tag: 21.77
-b2sums=('f54d3b7332a887d60ea259c4d00b258c9ea5a00de3a7103f750e5794e4d52f2dff9047ef2b0685cc5a76cbe2b6acaf7e08e559083332cd033193681da24e5ec3'
-        'SKIP')
-
-prepare() {
-  cd $pkgname
-  patch -p0 -i ../custom_ioctl.patch
-  echo touch changelog > git2log
-}
-
-build() {
-  make -C $pkgname -j1 \
-    CFLAGS+="-fPIC -I$srcdir/$pkgname/src/hd -w" \
-    HWINFO_VERSION="$pkgver" \
-    LIBDIR=/usr/lib
-}
-
-package() {
-  make -C $pkgname DESTDIR="$pkgdir" LIBDIR=/usr/lib install
-  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
-  rmdir "$pkgdir/sbin"
-}
-
-# getver: github.com/openSUSE/hwinfo/releases

Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 1048736, hwinfo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-16 10:28:49 UTC (rev 1048737)
@@ -0,0 +1,41 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Gergely Imreh <imrehg at gmail.com>
+# Contributor: champus
+# Contributor: madeye
+# Contributor: ranguvar
+# Contributor: ninja_pt
+
+pkgname=hwinfo
+pkgver=21.78
+pkgrel=1
+pkgdesc='Hardware detection tool from openSUSE'
+arch=(x86_64)
+url='https://github.com/openSUSE/hwinfo'
+license=(GPL2)
+depends=('libx86emu=3.4' perl-xml-parser perl-xml-writer)
+makedepends=(flex git sysfsutils)
+options=(!emptydirs)
+source=(custom_ioctl.patch
+        "git+$url#commit=ea5711f8b7952f3d279445e5cf1c8aa54b99be33") # tag: 21.78
+b2sums=('f54d3b7332a887d60ea259c4d00b258c9ea5a00de3a7103f750e5794e4d52f2dff9047ef2b0685cc5a76cbe2b6acaf7e08e559083332cd033193681da24e5ec3'
+        'SKIP')
+
+prepare() {
+  cd $pkgname
+  patch -p0 -i ../custom_ioctl.patch
+  echo touch changelog > git2log
+}
+
+build() {
+  make -C $pkgname -j1 \
+    CFLAGS+="-fPIC -I$srcdir/$pkgname/src/hd -w" \
+    HWINFO_VERSION="$pkgver" \
+    LIBDIR=/usr/lib
+}
+
+package() {
+  make -C $pkgname DESTDIR="$pkgdir" LIBDIR=/usr/lib install
+  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
+  rmdir "$pkgdir/sbin"
+}

Deleted: custom_ioctl.patch
===================================================================
--- custom_ioctl.patch	2021-11-16 10:28:38 UTC (rev 1048736)
+++ custom_ioctl.patch	2021-11-16 10:28:49 UTC (rev 1048737)
@@ -1,16 +0,0 @@
---- 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 @@
-   }
- 
-   if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
-+    /* Removing since TIOCGDEV is not supported by the mainline kernel
-     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);
-     }
-+    */
- 
-     if (0)
- 	    ;

Copied: hwinfo/repos/community-x86_64/custom_ioctl.patch (from rev 1048736, hwinfo/trunk/custom_ioctl.patch)
===================================================================
--- custom_ioctl.patch	                        (rev 0)
+++ custom_ioctl.patch	2021-11-16 10:28:49 UTC (rev 1048737)
@@ -0,0 +1,16 @@
+--- 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 @@
+   }
+ 
+   if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
++    /* Removing since TIOCGDEV is not supported by the mainline kernel
+     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);
+     }
++    */
+ 
+     if (0)
+ 	    ;