[PATCH] update-pciids: fix PCI_COMPRESSED_IDS value when zlib is disabled

[PATCH] update-pciids: fix PCI_COMPRESSED_IDS value when zlib is disabled

[Mike Frysinger]

If you build with zlib disabled, then PCI_COMPRESSED_IDS is not defined,
which generates the line in the update script:
	PCI_COMPRESSED_IDS=
which in turn causes the update script to warn:
	bash: [: : integer expression expected

So default it to 0 to avoid that logic.

Reported-by: AlphatPC@gmail.com
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index d5ed7ac..86fb0c7 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ ls-map.o: ls-map.c $(LSPCIINC)
 setpci.o: setpci.c pciutils.h $(PCIINC)
 common.o: common.c pciutils.h $(PCIINC)
 
+PCI_COMPRESSED_IDS ?= 0
 update-pciids: update-pciids.sh
 	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
 	chmod +x $@
-- 
1.7.8.4

[PCIUTILS] Re: [PATCH] update-pciids: fix PCI_COMPRESSED_IDS value when zlib is disabled

[Martin Mares]

Hello!

> If you build with zlib disabled, then PCI_COMPRESSED_IDS is not defined,
> which generates the line in the update script:
> 	PCI_COMPRESSED_IDS=
> which in turn causes the update script to warn:
> 	bash: [: : integer expression expected
> 
> So default it to 0 to avoid that logic.

I hope that this is already fixed in the current tree, could you please check?

				Have a nice fortnight
-- 
Martin `MJ' Mares                          <mj@ucw.cz>   http://mj.ucw.cz/
Faculty of Math and Physics, Charles University, Prague, Czech Rep., Earth
Outside of a dog, a book is man's best friend. Inside a dog, it's too dark to read.

Re: [PCIUTILS] Re: [PATCH] update-pciids: fix PCI_COMPRESSED_IDS value when zlib is disabled

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 724 bytes --]

On Monday 01 April 2013 15:52:28 Martin Mares wrote:
> > If you build with zlib disabled, then PCI_COMPRESSED_IDS is not defined,
> > 
> > which generates the line in the update script:
> > 	PCI_COMPRESSED_IDS=
> > 
> > which in turn causes the update script to warn:
> > 	bash: [: : integer expression expected
> > 
> > So default it to 0 to avoid that logic.
> 
> I hope that this is already fixed in the current tree, could you please
> check?

yeah, i think this commit addressed this in a different way:

commit 4339115006b225c8e33b7427cf5dba6b3831a625
Author: Ville Skyttä <ville.skytta@iki.fi>
Date:   Mon May 21 00:35:19 2012 +0300

    Fix syntax error when PCI_COMPRESSED_IDS is empty.
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]