new package: hwinfo

This commit is contained in:
Leonid Plyushch 2019-06-25 23:14:55 +03:00 committed by Yaksh Bariya
parent 0546985dd1
commit 9f6dc23595
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
8 changed files with 197 additions and 0 deletions

View File

@ -0,0 +1,47 @@
diff -uNr hwinfo-21.60/Makefile hwinfo-21.60.mod/Makefile
--- hwinfo-21.60/Makefile 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/Makefile 2019-06-25 22:59:08.675729970 +0300
@@ -102,26 +102,26 @@
@cd doc ; doxygen libhd.doxy
install:
- install -d -m 755 $(DESTDIR)/sbin $(DESTDIR)/usr/sbin $(DESTDIR)$(ULIBDIR) \
- $(DESTDIR)$(ULIBDIR)/pkgconfig $(DESTDIR)/usr/include
- install -m 755 hwinfo $(DESTDIR)/usr/sbin
- install -m 755 src/ids/check_hd $(DESTDIR)/usr/sbin
- install -m 755 src/ids/convert_hd $(DESTDIR)/usr/sbin
+ install -d -m 755 $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/$(ULIBDIR) \
+ $(DESTDIR)/$(PREFIX)/$(ULIBDIR)/pkgconfig $(DESTDIR)/$(PREFIX)/include
+ install -m 755 hwinfo $(DESTDIR)/$(PREFIX)/bin/
+ install -m 755 src/ids/check_hd $(DESTDIR)/$(PREFIX)/bin/
+ install -m 755 src/ids/convert_hd $(DESTDIR)/$(PREFIX)/bin/
if [ -f $(LIBHD_SO) ] ; then \
- install $(LIBHD_SO) $(DESTDIR)$(ULIBDIR) ; \
- ln -snf $(LIBHD_NAME) $(DESTDIR)$(ULIBDIR)/$(LIBHD_SONAME) ; \
- ln -snf $(LIBHD_SONAME) $(DESTDIR)$(ULIBDIR)/$(LIBHD_BASE).so ; \
+ install $(LIBHD_SO) $(DESTDIR)/$(PREFIX)/$(ULIBDIR)/ ; \
+ ln -snf $(LIBHD_NAME) $(DESTDIR)/$(PREFIX)/$(ULIBDIR)/$(LIBHD_SONAME) ; \
+ ln -snf $(LIBHD_SONAME) $(DESTDIR)/$(PREFIX)/$(ULIBDIR)/$(LIBHD_BASE).so ; \
else \
- install -m 644 $(LIBHD) $(DESTDIR)$(ULIBDIR) ; \
+ install -m 644 $(LIBHD) $(DESTDIR)/$(PREFIX)/$(ULIBDIR) ; \
fi
- install -m 644 hwinfo.pc $(DESTDIR)$(ULIBDIR)/pkgconfig
- install -m 644 src/hd/hd.h $(DESTDIR)/usr/include
- install -m 755 getsysinfo $(DESTDIR)/usr/sbin
- install -m 755 src/isdn/cdb/mk_isdnhwdb $(DESTDIR)/usr/sbin
- install -d -m 755 $(DESTDIR)/usr/share/hwinfo
- install -d -m 755 $(DESTDIR)/var/lib/hardware/udi
- install -m 644 src/isdn/cdb/ISDN.CDB.txt $(DESTDIR)/usr/share/hwinfo
- install -m 644 src/isdn/cdb/ISDN.CDB.hwdb $(DESTDIR)/usr/share/hwinfo
+ install -m 644 hwinfo.pc $(DESTDIR)/$(PREFIX)/$(ULIBDIR)/pkgconfig/
+ install -m 644 src/hd/hd.h $(DESTDIR)/$(PREFIX)/include/
+ install -m 755 getsysinfo $(DESTDIR)/$(PREFIX)/bin/
+ install -m 755 src/isdn/cdb/mk_isdnhwdb $(DESTDIR)/$(PREFIX)/bin/
+ install -d -m 755 $(DESTDIR)/$(PREFIX)/share/hwinfo
+ install -d -m 755 $(DESTDIR)/$(PREFIX)/var/lib/hardware/udi
+ install -m 644 src/isdn/cdb/ISDN.CDB.txt $(DESTDIR)/$(PREFIX)/share/hwinfo
+ install -m 644 src/isdn/cdb/ISDN.CDB.hwdb $(DESTDIR)/$(PREFIX)/share/hwinfo
archive: changelog
@if [ ! -d .git ] ; then echo no git repo ; false ; fi

View File

@ -0,0 +1,23 @@
TERMUX_PKG_HOMEPAGE=https://github.com/openSUSE/hwinfo
TERMUX_PKG_DESCRIPTION="Hardware detection tool from openSUSE"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=21.60
TERMUX_PKG_SRCURL=https://github.com/openSUSE/hwinfo/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=7d07ecd799a6c0e25d1dcd5ec7cbba1f1a4f2c69938593900a38bfd32a7d083a
TERMUX_PKG_DEPENDS="libandroid-shmem, libuuid, libx86emu"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_configure() {
echo 'touch changelog' > git2log
LDFLAGS+=" -landroid-shmem"
}
termux_step_make() {
make -j1 HWINFO_VERSION="$TERMUX_PKG_VERSION" \
LIBDIR="$TERMUX_PREFIX/lib"
}
termux_step_make_install() {
make HWINFO_VERSION="$TERMUX_PKG_VERSION" \
LIBDIR="$TERMUX_PREFIX/lib" PREFIX="$TERMUX_PREFIX" install
}

View File

@ -0,0 +1,13 @@
diff -uNr hwinfo-21.60/src/hd/bios.c hwinfo-21.60.mod/src/hd/bios.c
--- hwinfo-21.60/src/hd/bios.c 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/src/hd/bios.c 2019-06-26 13:34:45.081793132 +0300
@@ -6,9 +6,6 @@
#include <byteswap.h>
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(__i386__) || defined (__x86_64__) || defined(__ia64__)
-#include <sys/io.h>
-#endif
#include <linux/pci.h>
#include "hd.h"

View File

@ -0,0 +1,11 @@
diff -uNr hwinfo-21.60/src/hd/mdt.c hwinfo-21.60.mod/src/hd/mdt.c
--- hwinfo-21.60/src/hd/mdt.c 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/src/hd/mdt.c 2019-06-26 13:35:03.021913541 +0300
@@ -15,7 +15,6 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/io.h>
#include <sys/time.h>
#include <x86emu.h>

View File

@ -0,0 +1,13 @@
diff -uNr hwinfo-21.60/src/hd/sys.c hwinfo-21.60.mod/src/hd/sys.c
--- hwinfo-21.60/src/hd/sys.c 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/src/hd/sys.c 2019-06-26 13:35:17.695345306 +0300
@@ -8,9 +8,6 @@
#include <sys/types.h>
#include <sys/wait.h>
-#if defined(__i386__) || defined (__x86_64__)
-#include <sys/io.h>
-#endif
#include "hd.h"
#include "hd_int.h"

View File

@ -0,0 +1,22 @@
diff -uNr hwinfo-21.60/src/ids/Makefile hwinfo-21.60.mod/src/ids/Makefile
--- hwinfo-21.60/src/ids/Makefile 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/src/ids/Makefile 2019-06-25 22:54:25.404041321 +0300
@@ -53,11 +53,14 @@
check_hd: check_hd.c
$(CC) $(CFLAGS) $< -o $@
+check_hd_host: check_hd.c
+ gcc -O2 $< -o $@
+
hd_ids.c: hd_ids.h hd_ids_tiny.h
-hd_ids.h hd.ids: check_hd $(IDFILES)
- ./check_hd --check --sort --cfile hd_ids.h $(IDFILES)
+hd_ids.h hd.ids: check_hd check_hd_host $(IDFILES)
+ ./check_hd_host --check --sort --cfile hd_ids.h $(IDFILES)
-hd_ids_tiny.h: check_hd hd.ids
- ./check_hd --mini --cfile hd_ids_tiny.h --log=hd_tiny.log --out=hd_tiny.ids hd.ids
+hd_ids_tiny.h: check_hd check_hd_host hd.ids
+ ./check_hd_host --mini --cfile hd_ids_tiny.h --log=hd_tiny.log --out=hd_tiny.ids hd.ids

View File

@ -0,0 +1,57 @@
diff -uNr hwinfo-21.60/src/isdn/cdb/Makefile hwinfo-21.60.mod/src/isdn/cdb/Makefile
--- hwinfo-21.60/src/isdn/cdb/Makefile 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/src/isdn/cdb/Makefile 2019-06-25 22:54:25.404041321 +0300
@@ -1,6 +1,6 @@
TOPDIR = ../../..
-TARGETS = mk_isdnhwdb isdn_cdb.h ISDN.CDB.hwdb
-CLEANFILES = isdn_cdb isdn_cdb.h lex.yy.c ISDN.CDB.txt mk_isdnhwdb ISDN.CDB.hwdb
+TARGETS = mk_isdnhwdb mk_isdnhwdb_host isdn_cdb.h ISDN.CDB.hwdb
+CLEANFILES = isdn_cdb isdn_cdb_host isdn_cdb.h lex.yy.c ISDN.CDB.txt mk_isdnhwdb ISDN.CDB.hwdb
include $(TOPDIR)/Makefile.common
@@ -11,23 +11,40 @@
ln -s ISDN.ppc.txt ISDN.CDB.txt; \
fi
-isdn_cdb.h: isdn_cdb ISDN.CDB.txt
+isdn_cdb.h: isdn_cdb_host ISDN.CDB.txt
rm -f isdn_cdb.h
- ./isdn_cdb ISDN.CDB.txt isdn_cdb.h
+ ./isdn_cdb_host ISDN.CDB.txt isdn_cdb.h
lex.yy.c: isdn_cdb.lex
lex isdn_cdb.lex
isdn_cdb: isdn_cdb.o cdb_read.o
+isdn_cdb_host: isdn_cdb_host.o cdb_read_host.o
+ gcc isdn_cdb_host.o cdb_read_host.o -o isdn_cdb_host
+
mk_isdnhwdb: mk_isdnhwdb.o cdb_read.o
+mk_isdnhwdb_host: mk_isdnhwdb_host.o cdb_read_host.o
+ gcc mk_isdnhwdb_host.o cdb_read_host.o -o mk_isdnhwdb_host
+
cdb_read.o: cdb_read.c cdb_read.h
+cdb_read_host.o: cdb_read.c cdb_read.h
+ gcc -O2 -I../../hd -c cdb_read.c -o cdb_read_host.o
+
isdn_cdb.o: isdn_cdb.c cdb_read.h lex.yy.c
+isdn_cdb_host.o: isdn_cdb.c cdb_read.h lex.yy.c
+ gcc -O2 -I../../hd -c isdn_cdb.c -o isdn_cdb_host.o
+ gcc -O2 -I../../hd -c lex.yy.c -o lex.yy.host.o
+
mk_isdnhwdb.o: mk_isdnhwdb.c cdb_read.h lex.yy.c
-ISDN.CDB.hwdb: mk_isdnhwdb ISDN.CDB.txt
+mk_isdnhwdb_host.o: mk_isdnhwdb.c cdb_read.h lex.yy.c
+ gcc -O2 -I../../hd -c mk_isdnhwdb.c -o mk_isdnhwdb_host.o
+ gcc -O2 -I../../hd -c lex.yy.c -o lex.yy.host.o
+
+ISDN.CDB.hwdb: mk_isdnhwdb_host ISDN.CDB.txt
rm -f ISDN.CDB.hwdb
- ./mk_isdnhwdb ISDN.CDB.txt ISDN.CDB.hwdb
+ ./mk_isdnhwdb_host ISDN.CDB.txt ISDN.CDB.hwdb

View File

@ -0,0 +1,11 @@
diff -uNr hwinfo-21.60/src/isdn/isa_probe.c hwinfo-21.60.mod/src/isdn/isa_probe.c
--- hwinfo-21.60/src/isdn/isa_probe.c 2018-10-17 16:23:47.000000000 +0300
+++ hwinfo-21.60.mod/src/isdn/isa_probe.c 2019-06-26 13:35:29.558758182 +0300
@@ -1,7 +1,6 @@
#if defined(__i386__)
#include <stdio.h>
-#include <sys/io.h>
#include "hd.h"
#include "hd_int.h"