Date: Thursday, January 4, 2018 @ 11:43:54 Author: arodseth Revision: 278631
archrelease: copy trunk to community-x86_64 Added: hwinfo/repos/community-x86_64/PKGBUILD (from rev 278630, hwinfo/trunk/PKGBUILD) hwinfo/repos/community-x86_64/custom_ioctl.patch (from rev 278630, 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, 58 insertions(+), 58 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-04 11:41:03 UTC (rev 278630) +++ PKGBUILD 2018-01-04 11:43:54 UTC (rev 278631) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> -# Contributor: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Gergely Imreh <imr...@gmail.com> -# Contributor: champus, madeye, ranguvar and ninja_pt - -pkgname=hwinfo -pkgver=21.50 -pkgrel=1 -pkgdesc='Hardware detection tool from openSUSE' -arch=('x86_64') -url='https://github.com/openSUSE/hwinfo' -license=('GPL2') -depends=('libx86emu' 'bash' 'perl') -makedepends=('sysfsutils' 'flex' 'git') -options=('!emptydirs') -source=("https://github.com/openSUSE/$pkgname/archive/$pkgver.tar.gz" - 'custom_ioctl.patch') -sha256sums=('e1008aab25e8da2a4f21d48b0ea9fdba5f1182b95a7f4e8905d4fc16229b0fad' - '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') - -prepare() { - # Patching - 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:set ts=2 sw=2 et: Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 278630, hwinfo/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-04 11:43:54 UTC (rev 278631) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Gergely Imreh <imr...@gmail.com> +# Contributor: champus, madeye, ranguvar and ninja_pt + +pkgname=hwinfo +pkgver=21.50 +pkgrel=1 +pkgdesc='Hardware detection tool from openSUSE' +arch=('x86_64') +url='https://github.com/openSUSE/hwinfo' +license=('GPL2') +depends=('libx86emu' 'bash' 'perl') +makedepends=('sysfsutils' 'flex' 'git') +options=('!emptydirs') +source=("https://github.com/openSUSE/$pkgname/archive/$pkgver.tar.gz" + 'custom_ioctl.patch') +sha256sums=('e1008aab25e8da2a4f21d48b0ea9fdba5f1182b95a7f4e8905d4fc16229b0fad' + '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') + +prepare() { + # Patching + 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:set ts=2 sw=2 et: Deleted: custom_ioctl.patch =================================================================== --- custom_ioctl.patch 2018-01-04 11:41:03 UTC (rev 278630) +++ custom_ioctl.patch 2018-01-04 11:43:54 UTC (rev 278631) @@ -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 278630, hwinfo/trunk/custom_ioctl.patch) =================================================================== --- custom_ioctl.patch (rev 0) +++ custom_ioctl.patch 2018-01-04 11:43:54 UTC (rev 278631) @@ -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) + ;