[arch-commits] Commit in hwinfo/repos/community-x86_64 (4 files)
Alexander Rødseth
arodseth at gemini.archlinux.org
Sat Aug 6 00:36:06 UTC 2022
Date: Saturday, August 6, 2022 @ 00:36:05
Author: arodseth
Revision: 1260363
archrelease: copy trunk to community-x86_64
Added:
hwinfo/repos/community-x86_64/PKGBUILD
(from rev 1260362, hwinfo/trunk/PKGBUILD)
hwinfo/repos/community-x86_64/custom_ioctl.patch
(from rev 1260362, 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 | 40 ++++++++++++------------
2 files changed, 63 insertions(+), 61 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-06 00:35:55 UTC (rev 1260362)
+++ PKGBUILD 2022-08-06 00:36:05 UTC (rev 1260363)
@@ -1,41 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Gergely Imreh <imrehg at gmail.com>
-# Contributor: champus
-# Contributor: madeye
-# Contributor: ranguvar
-# Contributor: ninja_pt
-
-pkgname=hwinfo
-pkgver=21.82
-pkgrel=1
-pkgdesc='Hardware detection tool from openSUSE'
-arch=(x86_64)
-url='https://github.com/openSUSE/hwinfo'
-license=(GPL2)
-depends=('libx86emu=3.5' perl-xml-parser perl-xml-writer)
-makedepends=(flex git sysfsutils)
-options=(!emptydirs)
-source=(custom_ioctl.patch
- "git+$url#commit=d72143a28319f212c3e808e1721f4d5c872b3e56") # tag: 21.80
-b2sums=('2b1bd3b53bbfc1e545e1a70ffd6cca08f704639a104928b2c02ccca3e82000f07a470fbdf129566ece6dfb2b98fdad0e82f18cc5c2016ebfeed043b4edb295b4'
- 'SKIP')
-
-prepare() {
- cd $pkgname
- patch -p1 -i ../custom_ioctl.patch
- echo touch changelog > git2log
-}
-
-build() {
- make -C $pkgname -j1 \
- CFLAGS+="-fPIC -I$srcdir/$pkgname/src/hd -w" \
- HWINFO_VERSION="$pkgver" \
- LIBDIR=/usr/lib
-}
-
-package() {
- make -C $pkgname DESTDIR="$pkgdir" LIBDIR=/usr/lib install
- mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
- rmdir "$pkgdir/sbin"
-}
Copied: hwinfo/repos/community-x86_64/PKGBUILD (from rev 1260362, hwinfo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-06 00:36:05 UTC (rev 1260363)
@@ -0,0 +1,43 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Gergely Imreh <imrehg at gmail.com>
+# Contributor: champus
+# Contributor: madeye
+# Contributor: ranguvar
+# Contributor: ninja_pt
+
+pkgname=hwinfo
+pkgver=21.83
+pkgrel=1
+pkgdesc='Hardware detection tool from openSUSE'
+arch=(x86_64)
+url='https://github.com/openSUSE/hwinfo'
+license=(GPL2)
+depends=('libx86emu=3.5' perl-xml-parser perl-xml-writer)
+makedepends=(flex git sysfsutils)
+options=(!emptydirs)
+source=(custom_ioctl.patch
+ "git+$url#commit=ded18cd1b47acc204ea445fd66c0fc2a85c3e61a") # tag: 21.83
+b2sums=('2b1bd3b53bbfc1e545e1a70ffd6cca08f704639a104928b2c02ccca3e82000f07a470fbdf129566ece6dfb2b98fdad0e82f18cc5c2016ebfeed043b4edb295b4'
+ 'SKIP')
+
+prepare() {
+ cd $pkgname
+ patch -p1 -i ../custom_ioctl.patch
+ echo touch changelog > git2log
+
+ sed -i '/linux\/fs.h/d' src/hd/hd.c
+}
+
+build() {
+ make -C $pkgname -j1 \
+ CFLAGS+="-fPIC -I$srcdir/$pkgname/src/hd -w" \
+ HWINFO_VERSION="$pkgver" \
+ LIBDIR=/usr/lib
+}
+
+package() {
+ make -C $pkgname DESTDIR="$pkgdir" LIBDIR=/usr/lib install
+ mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
+ rmdir "$pkgdir/sbin"
+}
Deleted: custom_ioctl.patch
===================================================================
--- custom_ioctl.patch 2022-08-06 00:35:55 UTC (rev 1260362)
+++ custom_ioctl.patch 2022-08-06 00:36:05 UTC (rev 1260363)
@@ -1,20 +0,0 @@
-diff --git a/src/hd/kbd.c b/src/hd/kbd.c
-index fa08817..184ac08 100644
---- a/src/hd/kbd.c
-+++ b/src/hd/kbd.c
-@@ -134,6 +134,7 @@ void add_serial_console(hd_data_t *hd_data)
- }
-
- 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);
-@@ -152,6 +153,7 @@ void add_serial_console(hd_data_t *hd_data)
- free_mem(dev_link);
- free_mem(dev_name);
- }
-+ */
-
- if (dev)
- ;
Copied: hwinfo/repos/community-x86_64/custom_ioctl.patch (from rev 1260362, hwinfo/trunk/custom_ioctl.patch)
===================================================================
--- custom_ioctl.patch (rev 0)
+++ custom_ioctl.patch 2022-08-06 00:36:05 UTC (rev 1260363)
@@ -0,0 +1,20 @@
+diff --git a/src/hd/kbd.c b/src/hd/kbd.c
+index fa08817..184ac08 100644
+--- a/src/hd/kbd.c
++++ b/src/hd/kbd.c
+@@ -134,6 +134,7 @@ void add_serial_console(hd_data_t *hd_data)
+ }
+
+ 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);
+@@ -152,6 +153,7 @@ void add_serial_console(hd_data_t *hd_data)
+ free_mem(dev_link);
+ free_mem(dev_name);
+ }
++ */
+
+ if (dev)
+ ;
More information about the arch-commits
mailing list