[arch-commits] Commit in hwinfo/repos (8 files)
Alexander Rødseth
arodseth at nymeria.archlinux.org
Tue Mar 11 18:19:44 UTC 2014
Date: Tuesday, March 11, 2014 @ 19:19:44
Author: arodseth
Revision: 107044
archrelease: copy trunk to community-x86_64, community-i686
Added:
hwinfo/repos/community-i686/PKGBUILD
(from rev 107043, hwinfo/trunk/PKGBUILD)
hwinfo/repos/community-i686/custom_ioctl.patch
(from rev 107043, hwinfo/trunk/custom_ioctl.patch)
hwinfo/repos/community-x86_64/PKGBUILD
(from rev 107043, hwinfo/trunk/PKGBUILD)
hwinfo/repos/community-x86_64/custom_ioctl.patch
(from rev 107043, 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 | 90 ++++++++++++++++++++++++++++++++++
/custom_ioctl.patch | 32 ++++++++++++
community-i686/PKGBUILD | 44 ----------------
community-i686/custom_ioctl.patch | 16 ------
community-x86_64/PKGBUILD | 44 ----------------
community-x86_64/custom_ioctl.patch | 16 ------
6 files changed, 122 insertions(+), 120 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-03-11 17:20:10 UTC (rev 107043)
+++ community-i686/PKGBUILD 2014-03-11 18:19:44 UTC (rev 107044)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
-# Contributor: champus
-# Contributor: madeye
-# Contributor: Ranguvar
-# Contributor: ninja_pt
-
-pkgname=hwinfo
-pkgver=21.0
-_subver=1.2
-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=('perl' 'libx86emu')
-makedepends=('sysfsutils' 'rpmextract' 'flex')
-options=('!emptydirs')
-source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm"
- 'custom_ioctl.patch')
-sha256sums=('4126875621a935a450cf616b69a1f922047f241cedc3ac02ece54cd78b23a9fb'
- '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
-
-prepare() {
- rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm"
- tar jxf $pkgname-$pkgver.tar.bz2
- 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 107043, hwinfo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-03-11 18:19:44 UTC (rev 107044)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
+# Contributor: champus, madeye, ranguvar and ninja_pt
+
+pkgname=hwinfo
+pkgver=21.0.1.3
+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')
+makedepends=('sysfsutils' 'rpmextract' 'flex' 'aria2')
+options=('!emptydirs')
+source=("hwinfo.meta4::http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm"
+ 'custom_ioctl.patch')
+sha256sums=('SKIP' '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
+
+prepare() {
+ # Downloading the source rpm file, using meta4
+ aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true
+
+ # Wish they would just provide a normal $pkgname-$pkgvar.tar.gz...
+ rpmextract.sh "$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm"
+ tar jxf "$pkgname-${pkgver%.*.*}.tar.bz2"
+
+ # 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:
Deleted: community-i686/custom_ioctl.patch
===================================================================
--- community-i686/custom_ioctl.patch 2014-03-11 17:20:10 UTC (rev 107043)
+++ community-i686/custom_ioctl.patch 2014-03-11 18:19:44 UTC (rev 107044)
@@ -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 107043, hwinfo/trunk/custom_ioctl.patch)
===================================================================
--- community-i686/custom_ioctl.patch (rev 0)
+++ community-i686/custom_ioctl.patch 2014-03-11 18:19:44 UTC (rev 107044)
@@ -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 2014-03-11 17:20:10 UTC (rev 107043)
+++ community-x86_64/PKGBUILD 2014-03-11 18:19:44 UTC (rev 107044)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
-# Contributor: champus
-# Contributor: madeye
-# Contributor: Ranguvar
-# Contributor: ninja_pt
-
-pkgname=hwinfo
-pkgver=21.0
-_subver=1.2
-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=('perl' 'libx86emu')
-makedepends=('sysfsutils' 'rpmextract' 'flex')
-options=('!emptydirs')
-source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm"
- 'custom_ioctl.patch')
-sha256sums=('4126875621a935a450cf616b69a1f922047f241cedc3ac02ece54cd78b23a9fb'
- '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
-
-prepare() {
- rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm"
- tar jxf $pkgname-$pkgver.tar.bz2
- 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 107043, hwinfo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-03-11 18:19:44 UTC (rev 107044)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
+# Contributor: champus, madeye, ranguvar and ninja_pt
+
+pkgname=hwinfo
+pkgver=21.0.1.3
+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')
+makedepends=('sysfsutils' 'rpmextract' 'flex' 'aria2')
+options=('!emptydirs')
+source=("hwinfo.meta4::http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm"
+ 'custom_ioctl.patch')
+sha256sums=('SKIP' '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d')
+
+prepare() {
+ # Downloading the source rpm file, using meta4
+ aria2c -M "$pkgname.meta4" -V -c --allow-overwrite=true --no-conf=true
+
+ # Wish they would just provide a normal $pkgname-$pkgvar.tar.gz...
+ rpmextract.sh "$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm"
+ tar jxf "$pkgname-${pkgver%.*.*}.tar.bz2"
+
+ # 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:
Deleted: community-x86_64/custom_ioctl.patch
===================================================================
--- community-x86_64/custom_ioctl.patch 2014-03-11 17:20:10 UTC (rev 107043)
+++ community-x86_64/custom_ioctl.patch 2014-03-11 18:19:44 UTC (rev 107044)
@@ -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 107043, hwinfo/trunk/custom_ioctl.patch)
===================================================================
--- community-x86_64/custom_ioctl.patch (rev 0)
+++ community-x86_64/custom_ioctl.patch 2014-03-11 18:19:44 UTC (rev 107044)
@@ -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)
+ ;
More information about the arch-commits
mailing list