Date: Wednesday, August 10, 2016 @ 21:58:50 Author: arodseth Revision: 186367
archrelease: copy trunk to community-x86_64, community-i686 Added: hwinfo/repos/community-i686/PKGBUILD (from rev 186366, hwinfo/trunk/PKGBUILD) hwinfo/repos/community-i686/custom_ioctl.patch (from rev 186366, hwinfo/trunk/custom_ioctl.patch) hwinfo/repos/community-x86_64/PKGBUILD (from rev 186366, hwinfo/trunk/PKGBUILD) hwinfo/repos/community-x86_64/custom_ioctl.patch (from rev 186366, hwinfo/trunk/custom_ioctl.patch) Deleted: hwinfo/repos/community-i686/PKGBUILD hwinfo/repos/community-i686/custom_ioctl.patch hwinfo/repos/community-x86_64/PKGBUILD hwinfo/repos/community-x86_64/custom_ioctl.patch -------------------------------------+ /PKGBUILD | 84 ++++++++++++++++++++++++++++++++++ /custom_ioctl.patch | 32 ++++++++++++ community-i686/PKGBUILD | 45 ------------------ community-i686/custom_ioctl.patch | 16 ------ community-x86_64/PKGBUILD | 45 ------------------ community-x86_64/custom_ioctl.patch | 16 ------ 6 files changed, 116 insertions(+), 122 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-08-10 21:58:36 UTC (rev 186366) +++ community-i686/PKGBUILD 2016-08-10 21:58:50 UTC (rev 186367) @@ -1,45 +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.23_1.2 -_fn="$pkgname-${pkgver/_/-}.src.rpm" -pkgrel=1 -pkgdesc='Hardware detection tool from openSUSE' -arch=('x86_64' 'i686') -url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' -license=('GPL2') -depends=('libx86emu' 'bash' 'perl') -makedepends=('sysfsutils' 'rpmextract' 'flex' 'git') -options=('!emptydirs') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$_fn" - 'custom_ioctl.patch') -sha256sums=('361ca284d1912f3d1aecdf22737db1c949addb1e48d0f3f3fc3376e95fb7b8ac' - '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') - -prepare() { - # Wish upstream could just provide a normal $pkgname-$pkgver.tar.gz... - rpmextract.sh "$_fn" - tar Jxf "${_fn%-*.*}.tar.xz" - - # Patching - cd "${_fn%-*.*}" - patch -p0 -i ../custom_ioctl.patch -} - -build() { - make -C "${_fn%-*.*}" -j1 \ - CFLAGS+="-fPIC -I$srcdir/${_fn%-*.*}/src/hd" \ - LIBDIR=/usr/lib -} - -package() { - make -C "${_fn%-*.*}" LIBDIR=/usr/lib DESTDIR="$pkgdir" install - mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" -} - -# getver: -u 4 https://tracker.debian.org/pkg/hwinfo -# vim:set ts=2 sw=2 et: Copied: hwinfo/repos/community-i686/PKGBUILD (from rev 186366, hwinfo/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-08-10 21:58:50 UTC (rev 186367) @@ -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.30 +pkgrel=1 +pkgdesc='Hardware detection tool from openSUSE' +arch=('x86_64' 'i686') +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=('67e60ccb03d6c007ca1ad3754ae09511d211856d61e4a739516764d006de5824' + '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: community-i686/custom_ioctl.patch =================================================================== --- community-i686/custom_ioctl.patch 2016-08-10 21:58:36 UTC (rev 186366) +++ community-i686/custom_ioctl.patch 2016-08-10 21:58:50 UTC (rev 186367) @@ -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-i686/custom_ioctl.patch (from rev 186366, hwinfo/trunk/custom_ioctl.patch) =================================================================== --- community-i686/custom_ioctl.patch (rev 0) +++ community-i686/custom_ioctl.patch 2016-08-10 21:58:50 UTC (rev 186367) @@ -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) + ; Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-08-10 21:58:36 UTC (rev 186366) +++ community-x86_64/PKGBUILD 2016-08-10 21:58:50 UTC (rev 186367) @@ -1,45 +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.23_1.2 -_fn="$pkgname-${pkgver/_/-}.src.rpm" -pkgrel=1 -pkgdesc='Hardware detection tool from openSUSE' -arch=('x86_64' 'i686') -url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' -license=('GPL2') -depends=('libx86emu' 'bash' 'perl') -makedepends=('sysfsutils' 'rpmextract' 'flex' 'git') -options=('!emptydirs') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$_fn" - 'custom_ioctl.patch') -sha256sums=('361ca284d1912f3d1aecdf22737db1c949addb1e48d0f3f3fc3376e95fb7b8ac' - '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') - -prepare() { - # Wish upstream could just provide a normal $pkgname-$pkgver.tar.gz... - rpmextract.sh "$_fn" - tar Jxf "${_fn%-*.*}.tar.xz" - - # Patching - cd "${_fn%-*.*}" - patch -p0 -i ../custom_ioctl.patch -} - -build() { - make -C "${_fn%-*.*}" -j1 \ - CFLAGS+="-fPIC -I$srcdir/${_fn%-*.*}/src/hd" \ - LIBDIR=/usr/lib -} - -package() { - make -C "${_fn%-*.*}" LIBDIR=/usr/lib DESTDIR="$pkgdir" install - mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" -} - -# getver: -u 4 https://tracker.debian.org/pkg/hwinfo -# vim:set ts=2 sw=2 et: Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 186366, hwinfo/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-08-10 21:58:50 UTC (rev 186367) @@ -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.30 +pkgrel=1 +pkgdesc='Hardware detection tool from openSUSE' +arch=('x86_64' 'i686') +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=('67e60ccb03d6c007ca1ad3754ae09511d211856d61e4a739516764d006de5824' + '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: community-x86_64/custom_ioctl.patch =================================================================== --- community-x86_64/custom_ioctl.patch 2016-08-10 21:58:36 UTC (rev 186366) +++ community-x86_64/custom_ioctl.patch 2016-08-10 21:58:50 UTC (rev 186367) @@ -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 186366, hwinfo/trunk/custom_ioctl.patch) =================================================================== --- community-x86_64/custom_ioctl.patch (rev 0) +++ community-x86_64/custom_ioctl.patch 2016-08-10 21:58:50 UTC (rev 186367) @@ -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) + ;