Date: Wednesday, December 2, 2020 @ 11:51:18 Author: arodseth Revision: 769144
archrelease: copy trunk to community-x86_64 Added: hwinfo/repos/community-x86_64/PKGBUILD (from rev 769143, hwinfo/trunk/PKGBUILD) hwinfo/repos/community-x86_64/custom_ioctl.patch (from rev 769143, hwinfo/trunk/custom_ioctl.patch) Deleted: hwinfo/repos/community-x86_64/PKGBUILD hwinfo/repos/community-x86_64/custom_ioctl.patch --------------------+ PKGBUILD | 79 +++++++++++++++++++++++++-------------------------- custom_ioctl.patch | 32 ++++++++++---------- 2 files changed, 55 insertions(+), 56 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-12-02 11:51:12 UTC (rev 769143) +++ PKGBUILD 2020-12-02 11:51:18 UTC (rev 769144) @@ -1,40 +0,0 @@ -# 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.70 -pkgrel=2 -pkgdesc='Hardware detection tool from openSUSE' -arch=(x86_64) -url='https://github.com/openSUSE/hwinfo' -license=(GPL2) -depends=(libx86emu perl-xml-parser perl-xml-writer) -makedepends=(flex git sysfsutils) -options=(!emptydirs) -source=("$pkgname-$pkgver.tgz::https://github.com/openSUSE/$pkgname/archive/$pkgver.tar.gz" - custom_ioctl.patch) -sha512sums=('d0b97e630cab8959322abcc97fa940e78df805d33239b79e9bbdc8f3d2509dea3b37c4c6c9351d61519e57b337332186177bdb96a046fac3faaafd112642b7c5' - '88134fb6a08b86841c6b560afc9b8bb009c45bda1674437ef1b36f3d67ea37056717567252a314812dc30f174f0ad2be8768fba23469df42afbf5ebdd4666a3c') - -prepare() { - cd $pkgname-$pkgver - patch -p0 -i ../custom_ioctl.patch - echo 'touch changelog' > git2log -} - -build() { - make -C $pkgname-$pkgver -j1 \ - CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \ - HWINFO_VERSION="$pkgver" \ - LIBDIR=/usr/lib -} - -package() { - make -C $pkgname-$pkgver LIBDIR=/usr/lib DESTDIR="$pkgdir" install - mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" -} - -# getver: github.com/openSUSE/hwinfo/releases -# vim: ts=2 sw=2 et: Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 769143, hwinfo/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-02 11:51:18 UTC (rev 769144) @@ -0,0 +1,39 @@ +# 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.71 +pkgrel=1 +pkgdesc='Hardware detection tool from openSUSE' +arch=(x86_64) +url='https://github.com/openSUSE/hwinfo' +license=(GPL2) +depends=(libx86emu perl-xml-parser perl-xml-writer) +makedepends=(flex git sysfsutils) +options=(!emptydirs) +source=("$pkgname-$pkgver.tgz::https://github.com/openSUSE/$pkgname/archive/$pkgver.tar.gz" + custom_ioctl.patch) +sha512sums=('4257ee66c01ef77264d5bb99ecb35a719c1f1be0a43fb4d11923278bf7931efcce8652abcd7a13c0efe74caf3259bef3e7d2f8d882818537c87ec7647f353ad4' + '88134fb6a08b86841c6b560afc9b8bb009c45bda1674437ef1b36f3d67ea37056717567252a314812dc30f174f0ad2be8768fba23469df42afbf5ebdd4666a3c') + +prepare() { + cd $pkgname-$pkgver + patch -p0 -i ../custom_ioctl.patch + echo 'touch changelog' > git2log +} + +build() { + make -C $pkgname-$pkgver -j1 \ + CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \ + HWINFO_VERSION="$pkgver" \ + LIBDIR=/usr/lib +} + +package() { + make -C $pkgname-$pkgver LIBDIR=/usr/lib DESTDIR="$pkgdir" install + mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" +} + +# getver: github.com/openSUSE/hwinfo/releases Deleted: custom_ioctl.patch =================================================================== --- custom_ioctl.patch 2020-12-02 11:51:12 UTC (rev 769143) +++ custom_ioctl.patch 2020-12-02 11:51:18 UTC (rev 769144) @@ -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 769143, hwinfo/trunk/custom_ioctl.patch) =================================================================== --- custom_ioctl.patch (rev 0) +++ custom_ioctl.patch 2020-12-02 11:51:18 UTC (rev 769144) @@ -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) + ;