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

[Felix Yan]

    Date: Wednesday, December 25, 2019 @ 23:15:39
  Author: felixonmars
Revision: 541413

archrelease: copy trunk to community-x86_64

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

--------------------+
 PKGBUILD           |   80 +++++++++++++++++++++++++--------------------------
 custom_ioctl.patch |   32 ++++++++++----------
 2 files changed, 56 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-25 23:15:26 UTC (rev 541412)
+++ PKGBUILD	2019-12-25 23:15:39 UTC (rev 541413)
@@ -1,40 +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, madeye, ranguvar and ninja_pt
-
-pkgname=hwinfo
-pkgver=21.60
-pkgrel=2
-pkgdesc='Hardware detection tool from openSUSE'
-arch=('x86_64')
-url='https://github.com/openSUSE/hwinfo'
-license=('GPL2')
-depends=('libx86emu' 'perl')
-makedepends=('flex' 'git' 'sysfsutils')
-options=('!emptydirs')
-source=("https://github.com/openSUSE/$pkgname/archive/$pkgver.tar.gz"
-        'custom_ioctl.patch')
-sha256sums=('7d07ecd799a6c0e25d1dcd5ec7cbba1f1a4f2c69938593900a38bfd32a7d083a'
-            '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -p0 -i ../custom_ioctl.patch
-  echo 'touch changelog' > git2log
-}
-
-build() {
-  make -C "$pkgname-$pkgver" -j1 \
-    HWINFO_VERSION="$pkgver" \
-    CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \
-    LIBDIR=/usr/lib
-}
-
-package() {
-  make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install
-  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
-}
-
-# getver: https://github.com/openSUSE/hwinfo/releases
-# vim: ts=2 sw=2 et:

Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 541412, hwinfo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-25 23:15:39 UTC (rev 541413)
@@ -0,0 +1,40 @@
+# 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, madeye, ranguvar and ninja_pt
+
+pkgname=hwinfo
+pkgver=21.61
+pkgrel=1
+pkgdesc='Hardware detection tool from openSUSE'
+arch=('x86_64')
+url='https://github.com/openSUSE/hwinfo'
+license=('GPL2')
+depends=('libx86emu' 'perl')
+makedepends=('flex' 'git' 'sysfsutils')
+options=('!emptydirs')
+source=("https://github.com/openSUSE/$pkgname/archive/$pkgver.tar.gz"
+        'custom_ioctl.patch')
+sha256sums=('dacd5d6f058cf0f39948f96e9265054d9ccea735a6098cec6aceb22365d097b4'
+            '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p0 -i ../custom_ioctl.patch
+  echo 'touch changelog' > git2log
+}
+
+build() {
+  make -C "$pkgname-$pkgver" -j1 \
+    HWINFO_VERSION="$pkgver" \
+    CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \
+    LIBDIR=/usr/lib
+}
+
+package() {
+  make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install
+  mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
+}
+
+# getver: https://github.com/openSUSE/hwinfo/releases
+# vim: ts=2 sw=2 et:

Deleted: custom_ioctl.patch
===================================================================
--- custom_ioctl.patch	2019-12-25 23:15:26 UTC (rev 541412)
+++ custom_ioctl.patch	2019-12-25 23:15:39 UTC (rev 541413)
@@ -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 541412, hwinfo/trunk/custom_ioctl.patch)
===================================================================
--- custom_ioctl.patch	                        (rev 0)
+++ custom_ioctl.patch	2019-12-25 23:15:39 UTC (rev 541413)
@@ -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)
+ 	    ;