Re: [ptxdist] [APPLIED] pciutils: Update to accomodate for hwdata package.

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as e61ccbcad6537c02ae00477507ef2c6655f22907.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:36 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Make pciutils depend on hwdata-pci files.
> 
> Remove compression as all utils may not be able to read
> compressed .ids files.
> 
> Remove update-pciids script. This is done by updating
> hwdata now.
> 
> Remove installation of pci.ids, provided by hwdata.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-4-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/pciutils.in b/rules/pciutils.in
> index 9f9e93ee7ed9..b4607916fbe4 100644
> --- a/rules/pciutils.in
> +++ b/rules/pciutils.in
> @@ -1,7 +1,8 @@
>  ## SECTION=shell_and_console
>  menuconfig PCIUTILS
> -	select ZLIB	if PCIUTILS_COMPRESS
> -	select LIBKMOD	if PCIUTILS_LIBKMOD
> +	select LIBKMOD		if PCIUTILS_LIBKMOD
> +	select HWDATA		if !SYSTEMD_HWDB
> +	select HWDATA_PCI	if !SYSTEMD_HWDB	
>  	tristate
>  	prompt "pciutils                      "
>  	help
> @@ -36,13 +37,5 @@ config PCIUTILS_LIBPCI
>  	help
>  	  Generate and install the shared libpci library.
>  
> -config PCIUTILS_COMPRESS
> -	bool
> -	default y
> -	prompt "compress pci_ids"
> -	help
> -	  Save storage space by compressing the pci-id database. Access will
> -	  be a little bit slower then.
> -
>  endif
>  
> diff --git a/rules/pciutils.make b/rules/pciutils.make
> index 6f472e63d1f2..0e6cad59d372 100644
> --- a/rules/pciutils.make
> +++ b/rules/pciutils.make
> @@ -39,7 +39,6 @@ PCIUTILS_MAKE_OPT := \
>  	SBINDIR=/usr/bin \
>  	HOST=$(PTXCONF_ARCH_STRING)-linux \
>  	RELEASE=$(KERNEL_HEADER_VERSION) \
> -	ZLIB=$(call ptx/yesno, PTXCONF_PCIUTILS_COMPRESS) \
>  	LIBKMOD=$(call ptx/yesno, PTXCONF_PCIUTILS_LIBKMOD) \
>  	SHARED=$(call ptx/yesno, PTXCONF_PCIUTILS_LIBPCI) \
>  	STRIP= \
> @@ -67,20 +66,12 @@ $(STATEDIR)/pciutils.targetinstall:
>  ifdef PTXCONF_PCIUTILS_TOOLS
>  	@$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/lspci)
>  	@$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/setpci)
> -	@$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/update-pciids)
>  endif
>  
>  ifdef PTXCONF_PCIUTILS_LIBPCI
>  	@$(call install_lib, pciutils, 0, 0, 0644, libpci)
>  endif
>  
> -ifdef PTXCONF_PCIUTILS_COMPRESS
> -	@$(call install_copy, pciutils, 0, 0, 0644, -, \
> -		/usr/share/pci.ids.gz, n)
> -else
> -	@$(call install_copy, pciutils, 0, 0, 0644, -, \
> -		/usr/share/pci.ids, n)
> -endif
>  	@$(call install_finish, pciutils)
>  
>  	@$(call touch)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de