Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
(cherry picked from commit c5ec5c70b3
)
lilik-openwrt-22.03
@ -1,11 +0,0 @@ | |||||
--- a/update-pciids.sh | |||||
+++ b/update-pciids.sh | |||||
@@ -33,7 +33,7 @@ if which curl >/dev/null 2>&1 ; then | |||||
DL="curl -o $DEST.new $SRC" | |||||
${quiet} && DL="$DL -s -S" | |||||
elif which wget >/dev/null 2>&1 ; then | |||||
- DL="wget --no-timestamping -O $DEST.new $SRC" | |||||
+ DL="wget -O $DEST.new $SRC" | |||||
${quiet} && DL="$DL -q" | |||||
elif which lynx >/dev/null 2>&1 ; then | |||||
DL="eval lynx -source $SRC >$DEST.new" |
@ -1,11 +1,13 @@ | |||||
--- a/Makefile | --- a/Makefile | ||||
+++ b/Makefile | +++ b/Makefile | ||||
@@ -119,7 +119,7 @@ distclean: clean | |||||
@@ -131,8 +131,8 @@ distclean: clean | |||||
install: all | install: all | ||||
# -c is ignored on Linux, but required on FreeBSD | # -c is ignored on Linux, but required on FreeBSD | ||||
$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5 | |||||
- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) | |||||
+ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR) | |||||
$(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)/$(MANDIR)/man5 | |||||
- $(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR) | |||||
- $(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR) | |||||
+ $(INSTALL) -c -m 755 lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR) | |||||
+ $(INSTALL) -c -m 755 setpci$(EXEEXT) $(DESTDIR)$(SBINDIR) | |||||
$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) | $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) | ||||
$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) | $(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 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 |
@ -1,31 +0,0 @@ | |||||
--- a/update-pciids.sh | |||||
+++ b/update-pciids.sh | |||||
@@ -6,9 +6,8 @@ set -e | |||||
SRC="https://pci-ids.ucw.cz/v2.2/pci.ids" | |||||
DEST=pci.ids | |||||
PCI_COMPRESSED_IDS= | |||||
-GREP=grep | |||||
-# if pci.ids is read-only (because the filesystem is read-only), | |||||
+# if pci.ids.gz is read-only (because the filesystem is read-only), | |||||
# then just skip this whole process. | |||||
if ! touch ${DEST} >/dev/null 2>&1 ; then | |||||
${quiet} || echo "${DEST} is read-only, exiting." 1>&2 | |||||
@@ -18,7 +17,7 @@ fi | |||||
if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then | |||||
DECOMP="cat" | |||||
SRC="$SRC.gz" | |||||
- GREP=zgrep | |||||
+ DEST="$DEST.gz" | |||||
elif which bzip2 >/dev/null 2>&1 ; then | |||||
DECOMP="bzip2 -d" | |||||
SRC="$SRC.bz2" | |||||
@@ -53,7 +52,7 @@ if ! $DECOMP <$DEST.new >$DEST.neww ; th | |||||
exit 1 | |||||
fi | |||||
-if ! $GREP >/dev/null "^C " $DEST.neww ; then | |||||
+if ! zcat $DEST.neww | grep >/dev/null "^C " ; then | |||||
echo >&2 "update-pciids: missing class info, probably truncated file" | |||||
exit 1 | |||||
fi |
@ -1,11 +0,0 @@ | |||||
--- a/Makefile | |||||
+++ b/Makefile | |||||
@@ -88,7 +88,7 @@ lspci: LDLIBS+=$(LIBKMOD_LIBS) | |||||
ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS) | |||||
update-pciids: update-pciids.sh | |||||
- sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@" | |||||
+ sed <$< >$@ "s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@" | |||||
chmod +x $@ | |||||
# The example of use of libpci |
@ -1,11 +1,11 @@ | |||||
--- a/lib/configure | --- a/lib/configure | ||||
+++ b/lib/configure | +++ b/lib/configure | ||||
@@ -52,7 +52,7 @@ echo >>$c "#define PCI_OS_`echo $sys | t | |||||
@@ -60,7 +60,7 @@ echo >>$c "#define PCI_OS_`echo $sys | t | |||||
echo >$m 'WITH_LIBS=' | echo >$m 'WITH_LIBS=' | ||||
echo_n "Looking for access methods..." | echo_n "Looking for access methods..." | ||||
-LIBRESOLV=-lresolv | -LIBRESOLV=-lresolv | ||||
+LIBRESOLV= | +LIBRESOLV= | ||||
LIBEXT=so | LIBEXT=so | ||||
case $sys in | |||||
EXEEXT= | |||||
SYSINCLUDE=/usr/include |
@ -1,11 +0,0 @@ | |||||
--- a/lib/configure | |||||
+++ b/lib/configure | |||||
@@ -39,7 +39,7 @@ if [ -z "$HOST" ] ; then | |||||
fi | |||||
[ -n "$RELEASE" ] && rel="${RELEASE}" | |||||
# CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. | |||||
-host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\2/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'` | |||||
+host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'` | |||||
cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | |||||
sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | |||||
echo " $host $rel $cpu $sys" |