Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1295 from 4fury-c3440d8/hw

Browse Source 
hardware.
This commit is contained in:
Rmys
2021-11-27 13:20:26 +02:00
committed by GitHub
parent a145a1a24d a0a4591e44
commit 37d2bb401f
8 changed files with 6390 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/pciutils/actions.py
+9 -11
View File
@@ -2,25 +2,23 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
j = ''.join([
' SHARED="yes"',
' PREFIX=/usr',
' IDSDIR="/usr/share/hwdata" '
])
def build():
autotools.make('OPT="%s" \
SHARED="yes" \
PREFIX=/usr \
IDSDIR="/usr/share/misc" \
all' % get.CFLAGS())
autotools.make('OPT="%s" %s all' % (get.CFLAGS(), j))
def install():
autotools.rawInstall('DESTDIR="%s" \
PREFIX=/usr \
SHARED="yes" \
IDSDIR="/usr/share/misc" \
install-lib' % get.installDIR())
autotools.rawInstall('DESTDIR="%s" %s install-lib' % (get.installDIR(), j))
# remove update-pciids
pisitools.remove("/usr/sbin/update-pciids")
system/base/pciutils/files/makefile.patch
-33
View File
@@ -1,33 +0,0 @@
Index: pciutils-3.1.7/Makefile
===================================================================
--- pciutils-3.1.7.orig/Makefile
+++ pciutils-3.1.7/Makefile
@@ -25,7 +25,7 @@ SHARED=no
ABI_VERSION=.3
# Installation directories
-PREFIX=/usr/local
+PREFIX=/usr
SBINDIR=$(PREFIX)/sbin
SHAREDIR=$(PREFIX)/share
IDSDIR=$(SHAREDIR)
@@ -37,10 +37,6 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
# Commands
INSTALL=install
DIRINSTALL=install -d
-STRIP=-s
-CC=$(CROSS_COMPILE)gcc
-AR=$(CROSS_COMPILE)ar
-RANLIB=$(CROSS_COMPILE)ranlib
# Base name of the library (overriden on NetBSD, which has its own libpci)
LIBNAME=libpci
@@ -97,7 +93,7 @@ distclean: clean
install: all
# -c is ignored on Linux, but required on FreeBSD
$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
+ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR)
$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
$(INSTALL) -c -m 644 lspci.8 setpci.8 $(DESTDIR)$(MANDIR)/man8
$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
system/base/pciutils/files/pci.ids
+2051 -231
View File
File diff suppressed because it is too large Load Diff
system/base/pciutils/files/pciutils-remove-update-pciids.patch
-55
View File
@@ -1,55 +0,0 @@
diff -ur pciutils-3.0.0.orig/Makefile pciutils-3.0.0/Makefile
--- pciutils-3.0.0.orig/Makefile 2008-04-10 22:19:43.000000000 +0300
+++ pciutils-3.0.0/Makefile 2008-04-11 12:44:07.000000000 +0300
@@ -50,7 +50,7 @@
export
-all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
+all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 $(PCI_IDS)
lib/$(PCILIB): $(PCIINC) force
$(MAKE) -C lib all
@@ -67,10 +67,6 @@
setpci.o: setpci.c pciutils.h $(PCIINC)
common.o: common.c pciutils.h $(PCIINC)
-update-pciids: update-pciids.sh
- sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
- chmod +x $@
-
# The example of use of libpci
example: example.o lib/$(PCILIB)
example.o: example.c $(PCIINC)
@@ -83,7 +79,7 @@
clean:
rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"`
- rm -f update-pciids lspci setpci example lib/config.* *.[78] pci.ids.* lib/*.pc lib/*.so lib/*.so.*
+ rm -f lspci setpci example lib/config.* *.[78] pci.ids.* lib/*.pc lib/*.so lib/*.so.*
rm -rf maint/dist
distclean: clean
@@ -92,9 +88,8 @@
# -c is ignored on Linux, but required on FreeBSD
$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
- $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL) -c -m 644 lspci.8 setpci.8 $(DESTDIR)$(MANDIR)/man8
$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
ifeq ($(SHARED),yes)
$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
@@ -112,9 +107,9 @@
endif
uninstall: all
- rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/update-pciids
+ rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci
rm -f $(DESTDIR)$(IDSDIR)/$(PCI_IDS)
- rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8 $(DESTDIR)$(MANDIR)/man8/update-pciids.8
+ rm -f $(DESTDIR)$(MANDIR)/man8/lspci.8 $(DESTDIR)$(MANDIR)/man8/setpci.8
rm -f $(DESTDIR)$(MANDIR)/man7/pcilib.7
ifeq ($(SHARED),yes)
rm -f $(DESTDIR)$(LIBDIR)/$(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
system/base/pciutils/pspec.xml
+13 -14
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pciutils</Name>
<Homepage>http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html</Homepage>
<Homepage>https://mj.ucw.cz/sw/pciutils/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
@@ -12,13 +12,8 @@
<IsA>app:console</IsA>
<Summary>Various utilities dealing with the PCI bus</Summary>
<Description>The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices.</Description>
<Archive sha1sum="f7d6860ffe405b4ebb23b013866a64c9f80c2fa3" type="tarxz">https://ftp.osuosl.org/pub/blfs/conglomeration/pciutils/pciutils-3.7.0.tar.xz</Archive>
<AdditionalFiles>
<!-- 20100714
from: http://pciids.sourceforge.net/v2.2/pci.ids
-->
<AdditionalFile target="pci.ids">pci.ids</AdditionalFile>
</AdditionalFiles>
<Archive sha1sum="f7d6860ffe405b4ebb23b013866a64c9f80c2fa3" type="tarxz">https://mirrors.edge.kernel.org/pub/software/utils/pciutils/pciutils-3.7.0.tar.xz</Archive>
<Archive sha1sum="dceac2605b238cb558aa2e80b0a4686e5a8eab74" type="binary" target="pciutils-3.7.0">https://github.com/pciutils/pciids/raw/master/pci.ids</Archive>
<BuildDependencies>
<Dependency>eudev-devel</Dependency>
<Dependency>libkmod-devel</Dependency>
@@ -27,9 +22,6 @@
<!-- Disable gz support of pciids file -->
<Patch level="1">pciutils-nogz.patch</Patch>
<Patch level="1">pciutils-3.1.9-static-pc.patch</Patch>
<!-- Remove update-pciids support -->
<!--Patch level="1">pciutils-remove-update-pciids.patch</Patch-->
</Patches>
</Source>
@@ -44,7 +36,7 @@
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/misc</Path>
<Path fileType="data">/usr/share/hwdata</Path>
</Files>
</Package>
@@ -62,6 +54,13 @@
</Package>
<History>
<Update release="9">
<Date>2021-11-27</Date>
<Version>3.7.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2020-12-09</Date>
<Version>3.7.0</Version>
@@ -76,7 +75,7 @@
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Update release="6">
<Date>2019-12-26</Date>
<Version>3.6.2</Version>
<Comment>Rebuild</Comment>
system/base/usbutils/actions.py
+4 -10
View File
@@ -2,26 +2,20 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.system("./autogen.sh \
--datadir=/usr/share/misc \
--disable-zlib")
#autotools.configure("--datadir=/usr/share/misc \
#--disable-zlib")
autotools.configure("--datadir=/usr/share/hwdata --disable-zlib")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.insinto("/usr/share/hwdata", "usb.ids")
#pisitools.removeDir("/usr/sbin")
pisitools.dodoc("NEWS", "README.md")
pisitools.dodoc("NEWS")
system/base/usbutils/files/usb.ids
+4301 -223
View File
File diff suppressed because it is too large Load Diff
system/base/usbutils/pspec.xml
+12 -11
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>usbutils</Name>
@@ -12,10 +12,8 @@
<IsA>app:console</IsA>
<Summary>Linux USB utilities</Summary>
<Description>usbutils provides utilities for inspecting devices connected to a USB bus.</Description>
<Archive sha1sum="c96072746f5be2e69e1c3243728256c93285fc1e" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/usb/usbutils/usbutils-013.tar.xz</Archive>
<AdditionalFiles>
<AdditionalFile target="usb.ids">usb.ids</AdditionalFile>
</AdditionalFiles>
<Archive sha1sum="02fb81d84d194df6e735989656980b5e3c0a193d" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/usb/usbutils/usbutils-014.tar.xz</Archive>
<Archive sha1sum="d928893495e5b67a875e72af5ac8aa64f572c866" type="binary" target="usbutils-014">http://www.linux-usb.org/usb.ids</Archive>
<BuildDependencies>
<Dependency versionFrom="1.0.24">libusb-devel</Dependency>
<Dependency>eudev-devel</Dependency>
@@ -27,21 +25,24 @@
<RuntimeDependencies>
<Dependency>libusb</Dependency>
<Dependency>eudev</Dependency>
<Dependency>python3</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/misc</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/share/hwdata</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/misc/usb.ids">usb.ids</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="10">
<Date>2021-11-27</Date>
<Version>014</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2021-07-28</Date>
<Version>013</Version>