Date: Saturday, May 9, 2015 @ 17:25:24 Author: arodseth Revision: 133095
archrelease: copy trunk to community-x86_64, community-i686 Added: hwinfo/repos/community-i686/PKGBUILD (from rev 133094, hwinfo/trunk/PKGBUILD) hwinfo/repos/community-i686/custom_ioctl.patch (from rev 133094, hwinfo/trunk/custom_ioctl.patch) hwinfo/repos/community-x86_64/PKGBUILD (from rev 133094, hwinfo/trunk/PKGBUILD) hwinfo/repos/community-x86_64/custom_ioctl.patch (from rev 133094, 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 | 94 ++++++++++++++++++++++++++++++++++ /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, 126 insertions(+), 122 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-05-09 15:25:07 UTC (rev 133094) +++ community-i686/PKGBUILD 2015-05-09 15:25:24 UTC (rev 133095) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Alexander Rødseth <rods...@gmail.com> -# Contributor: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Gergely Imreh <imrehgATgmailDOTcom> -# Contributor: champus, madeye, ranguvar and ninja_pt - -pkgname=hwinfo -pkgver=21.10.1.1 -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/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" - 'custom_ioctl.patch') -sha256sums=('db8f9cbe57fc48e974b74fc035d4b308ff3fbc786408de983cbea69ef63aeaf9' - '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') - -prepare() { - #aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true - - # Wish upstream could just provide a normal $pkgname-$pkgver.tar.gz... - rpmextract.sh "$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" - tar Jxf "$pkgname-${pkgver%.*.*}.tar.xz" - - # Patching - cd "$pkgname-${pkgver%.*.*}" - patch -p0 -i ../custom_ioctl.patch -} - -build() { - make -C "$pkgname-${pkgver%.*.*}" -j1 \ - 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" -} - -# vim:set ts=2 sw=2 et: Copied: hwinfo/repos/community-i686/PKGBUILD (from rev 133094, hwinfo/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-05-09 15:25:24 UTC (rev 133095) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Gergely Imreh <imrehgATgmailDOTcom> +# Contributor: champus, madeye, ranguvar and ninja_pt + +pkgname=hwinfo +pkgver=21.12_1 +_fn="$pkgname-${pkgver/_/-}.1.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=('1f20612a1498007fdf73ad306520f90dadfa46a8b646a2e9c28e88d67710ea15' + '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') + +prepare() { + #aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true + + # 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: Deleted: community-i686/custom_ioctl.patch =================================================================== --- community-i686/custom_ioctl.patch 2015-05-09 15:25:07 UTC (rev 133094) +++ community-i686/custom_ioctl.patch 2015-05-09 15:25:24 UTC (rev 133095) @@ -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 133094, hwinfo/trunk/custom_ioctl.patch) =================================================================== --- community-i686/custom_ioctl.patch (rev 0) +++ community-i686/custom_ioctl.patch 2015-05-09 15:25:24 UTC (rev 133095) @@ -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 2015-05-09 15:25:07 UTC (rev 133094) +++ community-x86_64/PKGBUILD 2015-05-09 15:25:24 UTC (rev 133095) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Alexander Rødseth <rods...@gmail.com> -# Contributor: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Gergely Imreh <imrehgATgmailDOTcom> -# Contributor: champus, madeye, ranguvar and ninja_pt - -pkgname=hwinfo -pkgver=21.10.1.1 -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/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" - 'custom_ioctl.patch') -sha256sums=('db8f9cbe57fc48e974b74fc035d4b308ff3fbc786408de983cbea69ef63aeaf9' - '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') - -prepare() { - #aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true - - # Wish upstream could just provide a normal $pkgname-$pkgver.tar.gz... - rpmextract.sh "$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm" - tar Jxf "$pkgname-${pkgver%.*.*}.tar.xz" - - # Patching - cd "$pkgname-${pkgver%.*.*}" - patch -p0 -i ../custom_ioctl.patch -} - -build() { - make -C "$pkgname-${pkgver%.*.*}" -j1 \ - 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" -} - -# vim:set ts=2 sw=2 et: Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 133094, hwinfo/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-05-09 15:25:24 UTC (rev 133095) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Gergely Imreh <imrehgATgmailDOTcom> +# Contributor: champus, madeye, ranguvar and ninja_pt + +pkgname=hwinfo +pkgver=21.12_1 +_fn="$pkgname-${pkgver/_/-}.1.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=('1f20612a1498007fdf73ad306520f90dadfa46a8b646a2e9c28e88d67710ea15' + '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') + +prepare() { + #aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true + + # 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: Deleted: community-x86_64/custom_ioctl.patch =================================================================== --- community-x86_64/custom_ioctl.patch 2015-05-09 15:25:07 UTC (rev 133094) +++ community-x86_64/custom_ioctl.patch 2015-05-09 15:25:24 UTC (rev 133095) @@ -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 133094, hwinfo/trunk/custom_ioctl.patch) =================================================================== --- community-x86_64/custom_ioctl.patch (rev 0) +++ community-x86_64/custom_ioctl.patch 2015-05-09 15:25:24 UTC (rev 133095) @@ -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) + ;