[ptxdist] [PATCH 0/7] Hwdata introduction.

[ptxdist] [PATCH 0/7] Hwdata introduction.

[Christian Melki]

Introduce hwdata package and make relevant changes
in packages that use the .ids files.

Christian Melki (7):
  hwdata: New package.
  usbutils: Version bump 007 -> 014.
  pciutils: Update to accomodate for hwdata package.
  usbip: Update to accomodate for hwdata package.
  libpciaccess: Update to accomodate for hwdata package.
  lshw: Version bump. B.02.14 -> B.02.19.2 + accomodation for hwdata
    package.
  udev: Update to accomodate for hwdata package.

 rules/hwdata.in         | 47 +++++++++++++++++++++++
 rules/hwdata.make       | 84 +++++++++++++++++++++++++++++++++++++++++
 rules/libpciaccess.in   |  5 ---
 rules/libpciaccess.make |  2 +-
 rules/lshw.in           |  3 ++
 rules/lshw.make         |  6 +--
 rules/pciutils.in       | 13 ++-----
 rules/pciutils.make     |  9 -----
 rules/udev.make         |  2 +-
 rules/usbip.in          |  2 +
 rules/usbip.make        |  2 +-
 rules/usbutils.in       |  4 ++
 rules/usbutils.make     |  9 ++---
 13 files changed, 150 insertions(+), 38 deletions(-)
 create mode 100644 rules/hwdata.in
 create mode 100644 rules/hwdata.make

-- 
2.30.2


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

[ptxdist] [PATCH 1/7] hwdata: New package.

[Christian Melki]

Introduce the hwdata package.
It's a maintained set of the classic .ids files provided
by several packages (usbutils, pciutils etc).
It uses /usr/share/ for now, as a smaller changeset for
the introduction. After this has settled, one can move
packages collectively to /usr/share/hwdata.

This means:
* Packages need to stop providing their own
set of these files.

* Packages now select hwdata as a dependency.

* Packages need to stop updating these files. It's done
by updating the hwdata package.

* Packages can't assume that other packages can read compressed
variants of the text database.

hwdata will probably be replaced by systemd-hwdb in the long run.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/hwdata.in   | 47 ++++++++++++++++++++++++++
 rules/hwdata.make | 84 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 rules/hwdata.in
 create mode 100644 rules/hwdata.make

diff --git a/rules/hwdata.in b/rules/hwdata.in
new file mode 100644
index 000000000..c4e624b7f
--- /dev/null
+++ b/rules/hwdata.in
@@ -0,0 +1,47 @@
+## SECTION=shell_and_console
+
+menuconfig HWDATA
+	tristate
+	prompt "hwdata                        "
+	help
+	  Hwdata package.
+	  This package contains identity files for pci and usb etc.
+	  Various packages that have not been ported to systemd's binary
+	  hwdb may use this instead.
+
+if HWDATA
+
+config HWDATA_PCI
+	bool
+	prompt "hwdata PCI"
+	help
+	  The hwdata PCI (Vendor and product id) data set.
+
+config HWDATA_USB
+	bool
+	prompt "hwdata USB"
+	help
+	  The hwdata USB (Vendor and product id) data set.
+
+config HWDATA_PNP
+	bool
+	prompt "hwdata PNP"
+	help
+	  The hwdata PNP (Vendor names and vendor acronyms)
+	  data set.
+
+config HWDATA_OUI
+	bool
+	prompt "hwdata OUI"
+	help
+	  The hwdata OUI (IEEE Organizationally Unique Identifier)
+	  data set.
+
+config HWDATA_IAB
+	bool
+	prompt "hwdata IAB"
+	help
+	  The hwdata IAB (IEEE Individual Address Block)
+	  data set.
+
+endif
diff --git a/rules/hwdata.make b/rules/hwdata.make
new file mode 100644
index 000000000..5d09b6c81
--- /dev/null
+++ b/rules/hwdata.make
@@ -0,0 +1,84 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2021 by Christian Melki
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_HWDATA) += hwdata
+
+#
+# Paths and names
+#
+HWDATA_VERSION		:= 0.355
+HWDATA_MD5		:= ee30c73571b9392a7b2d77619a6842a5
+HWDATA			:= hwdata-$(HWDATA_VERSION)
+HWDATA_SUFFIX		:= tar.gz
+HWDATA_URL		:= https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX)
+HWDATA_SOURCE		:= $(SRCDIR)/$(HWDATA).$(HWDATA_SUFFIX)
+HWDATA_DIR		:= $(BUILDDIR)/$(HWDATA)
+HWDATA_LICENSE		:= GPL-2.0-or-later OR XFree86-1.0
+HWDATA_LICENSE_FILES	:= \
+	file://LICENSE;md5=1556547711e8246992b999edd9445a57 \
+	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HWDATA_PATH		:= PATH=$(CROSS_PATH)
+HWDATA_ENV		:= $(CROSS_ENV)
+
+# Package is not really using autoconf, so skip normal cross declaration.
+# Only text files are processed. Just prefix setting here.
+HWDATA_CONF_TOOL	:= autoconf
+HWDATA_CONF_OPT		:= \
+	--prefix=/usr
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/hwdata.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, hwdata)
+	@$(call install_fixup, hwdata,PRIORITY,optional)
+	@$(call install_fixup, hwdata,SECTION,base)
+	@$(call install_fixup, hwdata,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
+	@$(call install_fixup, hwdata,DESCRIPTION,missing)
+
+ifdef PTXCONF_HWDATA_PCI
+	@$(call install_copy, hwdata, 0, 0, 0644, \
+		$(HWDATA_PKGDIR)/usr/share/hwdata/pci.ids, /usr/share/pci.ids)
+endif
+
+ifdef PTXCONF_HWDATA_USB
+	@$(call install_copy, hwdata, 0, 0, 0644, \
+		$(HWDATA_PKGDIR)/usr/share/hwdata/usb.ids, /usr/share/usb.ids)
+endif
+
+ifdef PTXCONF_HWDATA_PNP
+	@$(call install_copy, hwdata, 0, 0, 0644, \
+		$(HWDATA_PKGDIR)/usr/share/hwdata/pnp.ids, /usr/share/pnp.ids)
+endif
+
+ifdef PTXCONF_HWDATA_OUI
+	@$(call install_copy, hwdata, 0, 0, 0644, \
+		$(HWDATA_PKGDIR)/usr/share/hwdata/oui.txt, /usr/share/oui.txt)
+endif
+
+ifdef PTXCONF_HWDATA_IAB
+	@$(call install_copy, hwdata, 0, 0, 0644, \
+		$(HWDATA_PKGDIR)/usr/share/hwdata/iab.txt, /usr/share/iab.txt)
+endif
+
+	@$(call install_finish, hwdata)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2


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

Re: [ptxdist] [APPLIED] hwdata: New package.

[Michael Olbrich]

Thanks, applied as effdc6de967ab9e86d6939fc821bd97726e038a6.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:34 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Introduce the hwdata package.
> It's a maintained set of the classic .ids files provided
> by several packages (usbutils, pciutils etc).
> It uses /usr/share/ for now, as a smaller changeset for
> the introduction. After this has settled, one can move
> packages collectively to /usr/share/hwdata.
> 
> This means:
> * Packages need to stop providing their own
> set of these files.
> 
> * Packages now select hwdata as a dependency.
> 
> * Packages need to stop updating these files. It's done
> by updating the hwdata package.
> 
> * Packages can't assume that other packages can read compressed
> variants of the text database.
> 
> hwdata will probably be replaced by systemd-hwdb in the long run.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/hwdata.in b/rules/hwdata.in
> new file mode 100644
> index 000000000000..c4e624b7ff90
> --- /dev/null
> +++ b/rules/hwdata.in
> @@ -0,0 +1,47 @@
> +## SECTION=shell_and_console
> +
> +menuconfig HWDATA
> +	tristate
> +	prompt "hwdata                        "
> +	help
> +	  Hwdata package.
> +	  This package contains identity files for pci and usb etc.
> +	  Various packages that have not been ported to systemd's binary
> +	  hwdb may use this instead.
> +
> +if HWDATA
> +
> +config HWDATA_PCI
> +	bool
> +	prompt "hwdata PCI"
> +	help
> +	  The hwdata PCI (Vendor and product id) data set.
> +
> +config HWDATA_USB
> +	bool
> +	prompt "hwdata USB"
> +	help
> +	  The hwdata USB (Vendor and product id) data set.
> +
> +config HWDATA_PNP
> +	bool
> +	prompt "hwdata PNP"
> +	help
> +	  The hwdata PNP (Vendor names and vendor acronyms)
> +	  data set.
> +
> +config HWDATA_OUI
> +	bool
> +	prompt "hwdata OUI"
> +	help
> +	  The hwdata OUI (IEEE Organizationally Unique Identifier)
> +	  data set.
> +
> +config HWDATA_IAB
> +	bool
> +	prompt "hwdata IAB"
> +	help
> +	  The hwdata IAB (IEEE Individual Address Block)
> +	  data set.
> +
> +endif
> diff --git a/rules/hwdata.make b/rules/hwdata.make
> new file mode 100644
> index 000000000000..5d09b6c810ca
> --- /dev/null
> +++ b/rules/hwdata.make
> @@ -0,0 +1,84 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2021 by Christian Melki
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_HWDATA) += hwdata
> +
> +#
> +# Paths and names
> +#
> +HWDATA_VERSION		:= 0.355
> +HWDATA_MD5		:= ee30c73571b9392a7b2d77619a6842a5
> +HWDATA			:= hwdata-$(HWDATA_VERSION)
> +HWDATA_SUFFIX		:= tar.gz
> +HWDATA_URL		:= https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX)
> +HWDATA_SOURCE		:= $(SRCDIR)/$(HWDATA).$(HWDATA_SUFFIX)
> +HWDATA_DIR		:= $(BUILDDIR)/$(HWDATA)
> +HWDATA_LICENSE		:= GPL-2.0-or-later OR XFree86-1.0
> +HWDATA_LICENSE_FILES	:= \
> +	file://LICENSE;md5=1556547711e8246992b999edd9445a57 \
> +	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +HWDATA_PATH		:= PATH=$(CROSS_PATH)
> +HWDATA_ENV		:= $(CROSS_ENV)
> +
> +# Package is not really using autoconf, so skip normal cross declaration.
> +# Only text files are processed. Just prefix setting here.
> +HWDATA_CONF_TOOL	:= autoconf
> +HWDATA_CONF_OPT		:= \
> +	--prefix=/usr
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/hwdata.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, hwdata)
> +	@$(call install_fixup, hwdata,PRIORITY,optional)
> +	@$(call install_fixup, hwdata,SECTION,base)
> +	@$(call install_fixup, hwdata,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
> +	@$(call install_fixup, hwdata,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_HWDATA_PCI
> +	@$(call install_copy, hwdata, 0, 0, 0644, \
> +		$(HWDATA_PKGDIR)/usr/share/hwdata/pci.ids, /usr/share/pci.ids)
> +endif
> +
> +ifdef PTXCONF_HWDATA_USB
> +	@$(call install_copy, hwdata, 0, 0, 0644, \
> +		$(HWDATA_PKGDIR)/usr/share/hwdata/usb.ids, /usr/share/usb.ids)
> +endif
> +
> +ifdef PTXCONF_HWDATA_PNP
> +	@$(call install_copy, hwdata, 0, 0, 0644, \
> +		$(HWDATA_PKGDIR)/usr/share/hwdata/pnp.ids, /usr/share/pnp.ids)
> +endif
> +
> +ifdef PTXCONF_HWDATA_OUI
> +	@$(call install_copy, hwdata, 0, 0, 0644, \
> +		$(HWDATA_PKGDIR)/usr/share/hwdata/oui.txt, /usr/share/oui.txt)
> +endif
> +
> +ifdef PTXCONF_HWDATA_IAB
> +	@$(call install_copy, hwdata, 0, 0, 0644, \
> +		$(HWDATA_PKGDIR)/usr/share/hwdata/iab.txt, /usr/share/iab.txt)
> +endif
> +
> +	@$(call install_finish, hwdata)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make

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

[ptxdist] [PATCH 2/7] usbutils: Version bump 007 -> 014.

[Christian Melki]

Upgrade old usbutils.

Usbutils now depends on libudev, add it.

Clear out some old configure options.

Also, usb.ids are not supplied anymore,
but rather supplied by the hwdata package.
Thus remove usb.ids installation and
make usbutils depend on hwdata-usb files.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/usbutils.in   | 4 ++++
 rules/usbutils.make | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rules/usbutils.in b/rules/usbutils.in
index f259f9c4e..105bb078a 100644
--- a/rules/usbutils.in
+++ b/rules/usbutils.in
@@ -2,6 +2,10 @@
 
 menuconfig USBUTILS
 	select LIBUSB
+	select UDEV
+	select UDEV_LIBUDEV
+	select HWDATA		if !SYSTEMD_HWDB
+	select HWDATA_USB	if !SYSTEMD_HWDB
 	tristate
 	prompt "usbutils                      "
 	help
diff --git a/rules/usbutils.make b/rules/usbutils.make
index 80af5a2bb..d594652ec 100644
--- a/rules/usbutils.make
+++ b/rules/usbutils.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils
 #
 # Paths and names
 #
-USBUTILS_VERSION	:= 007
-USBUTILS_MD5		:= c9df5107ae9d26b10a1736a261250139
+USBUTILS_VERSION	:= 014
+USBUTILS_MD5		:= f21aa68ee7870b161921a590be7765e6
 USBUTILS		:= usbutils-$(USBUTILS_VERSION)
 USBUTILS_SUFFIX		:= tar.xz
 USBUTILS_URL		:= $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX))
@@ -36,9 +36,7 @@ USBUTILS_ENV 	:= $(CROSS_ENV)
 #
 USBUTILS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-zlib \
-	--enable-usbids
+	$(GLOBAL_LARGE_FILE_OPTION)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -62,7 +60,6 @@ endif
 ifdef PTXCONF_USBUTILS_USBDEVICES
 	@$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/usb-devices)
 endif
-	@$(call install_copy, usbutils, 0, 0, 0644, -, /usr/share/usb.ids,n)
 
 	@$(call install_finish, usbutils)
 
-- 
2.30.2


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

Re: [ptxdist] [APPLIED] usbutils: Version bump 007 -> 014.

[Michael Olbrich]

Thanks, applied as 30c60206f0973a33c8cdbd1cf59079b22f6ed889.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:35 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Upgrade old usbutils.
> 
> Usbutils now depends on libudev, add it.
> 
> Clear out some old configure options.
> 
> Also, usb.ids are not supplied anymore,
> but rather supplied by the hwdata package.
> Thus remove usb.ids installation and
> make usbutils depend on hwdata-usb files.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-3-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/usbutils.in b/rules/usbutils.in
> index f259f9c4e560..105bb078af58 100644
> --- a/rules/usbutils.in
> +++ b/rules/usbutils.in
> @@ -2,6 +2,10 @@
>  
>  menuconfig USBUTILS
>  	select LIBUSB
> +	select UDEV
> +	select UDEV_LIBUDEV
> +	select HWDATA		if !SYSTEMD_HWDB
> +	select HWDATA_USB	if !SYSTEMD_HWDB
>  	tristate
>  	prompt "usbutils                      "
>  	help
> diff --git a/rules/usbutils.make b/rules/usbutils.make
> index 80af5a2bbf17..d594652eca93 100644
> --- a/rules/usbutils.make
> +++ b/rules/usbutils.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils
>  #
>  # Paths and names
>  #
> -USBUTILS_VERSION	:= 007
> -USBUTILS_MD5		:= c9df5107ae9d26b10a1736a261250139
> +USBUTILS_VERSION	:= 014
> +USBUTILS_MD5		:= f21aa68ee7870b161921a590be7765e6
>  USBUTILS		:= usbutils-$(USBUTILS_VERSION)
>  USBUTILS_SUFFIX		:= tar.xz
>  USBUTILS_URL		:= $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX))
> @@ -36,9 +36,7 @@ USBUTILS_ENV 	:= $(CROSS_ENV)
>  #
>  USBUTILS_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
> -	$(GLOBAL_LARGE_FILE_OPTION) \
> -	--disable-zlib \
> -	--enable-usbids
> +	$(GLOBAL_LARGE_FILE_OPTION)
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -62,7 +60,6 @@ endif
>  ifdef PTXCONF_USBUTILS_USBDEVICES
>  	@$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/usb-devices)
>  endif
> -	@$(call install_copy, usbutils, 0, 0, 0644, -, /usr/share/usb.ids,n)
>  
>  	@$(call install_finish, usbutils)
>  

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

[ptxdist] [PATCH 3/7] pciutils: Update to accomodate for hwdata package.

[Christian Melki]

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>
---
 rules/pciutils.in   | 13 +++----------
 rules/pciutils.make |  9 ---------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/rules/pciutils.in b/rules/pciutils.in
index 9f9e93ee7..b4607916f 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 6f472e63d..0e6cad59d 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)
-- 
2.30.2


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

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

[Michael Olbrich]

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

[ptxdist] [PATCH 4/7] usbip: Update to accomodate for hwdata package.

[Christian Melki]

Make usbip depend on hwdata-usb files.

Change directory here to /usr/share instead of changing
all the other locations to /usr/share/hwdata.
This is simpler, for now.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/usbip.in   | 2 ++
 rules/usbip.make | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/usbip.in b/rules/usbip.in
index 4455ce484..3b6fb77a7 100644
--- a/rules/usbip.in
+++ b/rules/usbip.in
@@ -4,6 +4,8 @@ config USBIP
 	tristate
 	select UDEV
 	select UDEV_LIBUDEV
+	select HWDATA		if !SYSTEMD_HWDB
+	select HWDATA_USB	if !SYSTEMD_HWDB
 	prompt "usbip"
 	help
 	  USB/IP system for sharing USB devices over the network.
diff --git a/rules/usbip.make b/rules/usbip.make
index a85512147..9d76ec578 100644
--- a/rules/usbip.make
+++ b/rules/usbip.make
@@ -32,7 +32,7 @@ USBIP_CONF_TOOL	:= autoconf
 USBIP_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--without-tcp-wrappers \
-	--with-usbids-dir=/usr/share/hwdata/ \
+	--with-usbids-dir=/usr/share/ \
 	--with-fortify
 
 # ----------------------------------------------------------------------------
-- 
2.30.2


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

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

[Michael Olbrich]

Thanks, applied as 301ccffc9ead2f4b598de4db9ff872818bdb5f4a.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:38 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Make usbip depend on hwdata-usb files.
> 
> Change directory here to /usr/share instead of changing
> all the other locations to /usr/share/hwdata.
> This is simpler, for now.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-5-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/usbip.in b/rules/usbip.in
> index 4455ce484cf0..3b6fb77a7520 100644
> --- a/rules/usbip.in
> +++ b/rules/usbip.in
> @@ -4,6 +4,8 @@ config USBIP
>  	tristate
>  	select UDEV
>  	select UDEV_LIBUDEV
> +	select HWDATA		if !SYSTEMD_HWDB
> +	select HWDATA_USB	if !SYSTEMD_HWDB
>  	prompt "usbip"
>  	help
>  	  USB/IP system for sharing USB devices over the network.
> diff --git a/rules/usbip.make b/rules/usbip.make
> index a85512147183..9d76ec5788be 100644
> --- a/rules/usbip.make
> +++ b/rules/usbip.make
> @@ -32,7 +32,7 @@ USBIP_CONF_TOOL	:= autoconf
>  USBIP_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--without-tcp-wrappers \
> -	--with-usbids-dir=/usr/share/hwdata/ \
> +	--with-usbids-dir=/usr/share/ \
>  	--with-fortify
>  
>  # ----------------------------------------------------------------------------

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

[ptxdist] [PATCH 5/7] libpciaccess: Update to accomodate for hwdata package.

[Christian Melki]

Make libpciaccess depend on hwdata-pci files.

Remove compression as all utils may not be able to read
compressed .ids files.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/libpciaccess.in   | 5 -----
 rules/libpciaccess.make | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules/libpciaccess.in b/rules/libpciaccess.in
index 03e6fcb76..b6f3e7340 100644
--- a/rules/libpciaccess.in
+++ b/rules/libpciaccess.in
@@ -2,7 +2,6 @@
 
 menuconfig LIBPCIACCESS
 	tristate
-	select ZLIB	if LIBPCIACCESS_ZLIB
 	prompt "libpciaccess                  "
 	help
 	  libpciaccess contains low level access functions to be used by
@@ -20,8 +19,4 @@ config LIBPCIACCESS_MTRR
 	  optimize accesses to various memory types, like main memory
 	  or memory accessible via buses like video memory on PCI cards.
 
-config LIBPCIACCESS_ZLIB
-	bool
-	default PCIUTILS_COMPRESS
-
 endif
diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make
index 20136d4a2..447236d7f 100644
--- a/rules/libpciaccess.make
+++ b/rules/libpciaccess.make
@@ -46,7 +46,7 @@ LIBPCIACCESS_CONF_OPT	:= \
 	--disable-linux-rom-fallback \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--with-pciids-path=/usr/share \
-	--$(call ptx/wwo, PTXCONF_LIBPCIACCESS_ZLIB)-zlib
+	--without-zlib
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2


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

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

[Michael Olbrich]

Thanks, applied as bea2aabbae71fc2b6637a5f803d46c13d472cb71.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:39 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Make libpciaccess depend on hwdata-pci files.
> 
> Remove compression as all utils may not be able to read
> compressed .ids files.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-6-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libpciaccess.in b/rules/libpciaccess.in
> index 03e6fcb76b8a..b6f3e7340f26 100644
> --- a/rules/libpciaccess.in
> +++ b/rules/libpciaccess.in
> @@ -2,7 +2,6 @@
>  
>  menuconfig LIBPCIACCESS
>  	tristate
> -	select ZLIB	if LIBPCIACCESS_ZLIB
>  	prompt "libpciaccess                  "
>  	help
>  	  libpciaccess contains low level access functions to be used by
> @@ -20,8 +19,4 @@ config LIBPCIACCESS_MTRR
>  	  optimize accesses to various memory types, like main memory
>  	  or memory accessible via buses like video memory on PCI cards.
>  
> -config LIBPCIACCESS_ZLIB
> -	bool
> -	default PCIUTILS_COMPRESS
> -
>  endif
> diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make
> index 20136d4a2278..447236d7fa41 100644
> --- a/rules/libpciaccess.make
> +++ b/rules/libpciaccess.make
> @@ -46,7 +46,7 @@ LIBPCIACCESS_CONF_OPT	:= \
>  	--disable-linux-rom-fallback \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--with-pciids-path=/usr/share \
> -	--$(call ptx/wwo, PTXCONF_LIBPCIACCESS_ZLIB)-zlib
> +	--without-zlib
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

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

[ptxdist] [PATCH 6/7] lshw: Version bump. B.02.14 -> B.02.19.2 + accomodation for hwdata package.

[Christian Melki]

Make lshw depend on hwdata-pci and hwdata-usb files.

Remove installation of .ids files, provided by hwdata.
Afaik, oui and manuf databases are not used.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/lshw.in   | 3 +++
 rules/lshw.make | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rules/lshw.in b/rules/lshw.in
index 6911380f6..c8632f7b4 100644
--- a/rules/lshw.in
+++ b/rules/lshw.in
@@ -7,6 +7,9 @@ menuconfig LSHW
 	select GCCLIBS_CXX
 	select GCCLIBS_GCC_S
 	select GTK if LSHW_GUI
+	select HWDATA		if !SYSTEMD_HWDB
+	select HWDATA_USB	if !SYSTEMD_HWDB
+	select HWDATA_PCI	if !SYSTEMD_HWDB
 	help
 	  lshw (Hardware Lister) is a small tool to provide detailed information
 	  on the hardware configuration of the machine. It can report exact
diff --git a/rules/lshw.make b/rules/lshw.make
index 28dbb6cb7..dadea9f78 100644
--- a/rules/lshw.make
+++ b/rules/lshw.make
@@ -14,7 +14,7 @@ PACKAGES-$(PTXCONF_LSHW) += lshw
 #
 # Paths and names
 #
-LSHW_VERSION	:= B.02.14
+LSHW_VERSION	:= B.02.19.2
 LSHW_MD5	:= 8bed55768c5cb2ceff062b882a687e9b
 LSHW		:= lshw-$(LSHW_VERSION)
 LSHW_SUFFIX	:= tar.gz
@@ -60,10 +60,6 @@ $(STATEDIR)/lshw.targetinstall:
 	@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/lshw)
 
 	@$(call install_copy, lshw, 0, 0, 0755, /usr/share/lshw)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/pci.ids)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/usb.ids)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/oui.txt)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/manuf.txt)
 
 ifdef PTXCONF_LSHW_GUI
 	@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/gtk-lshw)
-- 
2.30.2


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

Re: [ptxdist] [APPLIED] lshw: Version bump. B.02.14 -> B.02.19.2 + accomodation for hwdata package.

[Michael Olbrich]

Thanks, applied as 53e9381ce822a38cd30c7353db72e9a4f88a0d12.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:40 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Make lshw depend on hwdata-pci and hwdata-usb files.
> 
> Remove installation of .ids files, provided by hwdata.
> Afaik, oui and manuf databases are not used.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-7-christian.melki@t2data.com>
> [mol: don't create empty /usr/share/lshw]
> [mol: migrate patches]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/lshw-B.02.14/0001-fix-cross-compilation.patch b/patches/lshw-B.02.14/0001-fix-cross-compilation.patch
> deleted file mode 100644
> index 3e9974d15459..000000000000
> --- a/patches/lshw-B.02.14/0001-fix-cross-compilation.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -From cb3fbcd551017645b092743e2b48c27514829196 Mon Sep 17 00:00:00 2001
> -From: Remy Bohmer <linux@bohmer.net>
> -Date: Sun, 20 Jun 2010 22:48:09 +0200
> -Subject: [PATCH 1/2] fix cross-compilation
> -
> -Signed-off-by: Remy Bohmer <linux@bohmer.net>
> -[mkl: improve fix]
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - src/Makefile      |    4 ++--
> - src/core/Makefile |    6 +++---
> - src/gui/Makefile  |    6 +++---
> - 3 files changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/src/Makefile b/src/Makefile
> -index 93c3ead..ea20184 100644
> ---- a/src/Makefile
> -+++ b/src/Makefile
> -@@ -18,8 +18,8 @@ export DATADIR
> - CXX?=c++
> - INCLUDES=-I./core/
> - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
> --CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
> --LDFLAGS=-L./core/ -g
> -+CXXFLAGS+=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
> -+LDFLAGS+=-L./core/ -g
> - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
> - 	LDFLAGS+= -Wl,--as-needed
> - endif
> -diff --git a/src/core/Makefile b/src/core/Makefile
> -index 024b921..b108a6e 100644
> ---- a/src/core/Makefile
> -+++ b/src/core/Makefile
> -@@ -1,10 +1,10 @@
> - PACKAGENAME?=lshw
> - 
> --CXX=c++
> -+CXX?=c++
> - INCLUDES=
> - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
> --CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
> --LDFLAGS=
> -+CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
> -+LDFLAGS+=
> - LDSTATIC=
> - LIBS=
> - 
> -diff --git a/src/gui/Makefile b/src/gui/Makefile
> -index 05fbbfd..d410a1d 100644
> ---- a/src/gui/Makefile
> -+++ b/src/gui/Makefile
> -@@ -8,11 +8,11 @@ OBJCOPY?=objcopy
> - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
> - GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
> - INCLUDES=-I../core $(GTKINCLUDES)
> --CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
> --CFLAGS=$(CXXFLAGS) $(DEFINES)
> -+CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
> -+CFLAGS+=$(CXXFLAGS) $(DEFINES)
> - GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
> - LIBS=-L../core -llshw -lresolv $(GTKLIBS)
> --LDFLAGS=
> -+LDFLAGS+=
> - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
> - 	LDFLAGS+= -Wl,--as-needed
> - endif
> --- 
> -1.7.1
> -
> diff --git a/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch b/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch
> deleted file mode 100644
> index 903b87dd5538..000000000000
> --- a/patches/lshw-B.02.14/0003-fix-compiling-with-g-4.5.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From: unknown author <unknown.author@example.com>
> -Date: Mon, 23 Aug 2010 10:45:58 +0200
> -Subject: [PATCH] fix compiling with g++ 4.5
> -
> -g++ 4.5 is stricter and won't compile without this patch.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - src/core/scsi.cc |    2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/src/core/scsi.cc b/src/core/scsi.cc
> -index ef49677..e72376b 100644
> ---- a/src/core/scsi.cc
> -+++ b/src/core/scsi.cc
> -@@ -842,7 +842,7 @@ static bool scan_hosts(hwNode & node)
> - 
> -           if (!controller)
> -           {
> --            controller = node.addChild(hwNode::hwNode("scsi", hw::storage));
> -+            controller = node.addChild(hwNode("scsi", hw::storage));
> -             if (controller)
> -             {
> -               controller->setLogicalName(host_logicalname(number));
> --- 
> -1.7.1
> -
> diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series
> deleted file mode 100644
> index c740bfba63d1..000000000000
> --- a/patches/lshw-B.02.14/series
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -0001-fix-cross-compilation.patch
> -0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> -0003-fix-compiling-with-g-4.5.patch
> diff --git a/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch b/patches/lshw-B.02.19.2/0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> similarity index 61%
> rename from patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> rename to patches/lshw-B.02.19.2/0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> index eb9abb67193d..b075f7edf063 100644
> --- a/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> +++ b/patches/lshw-B.02.19.2/0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> @@ -1,7 +1,6 @@
> -From 0eea91e31ed90c82acc45c221be689c10e4f779c Mon Sep 17 00:00:00 2001
> -From: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
> +From: "Bart vdr. Meulen" <bartvdrmeulen@gmail.com>
>  Date: Sun, 20 Jun 2010 22:48:09 +0200
> -Subject: [PATCH 2/2] Replace keyword node with hwnode for TinyXpath compatibility
> +Subject: [PATCH] Replace keyword node with hwnode for TinyXpath compatibility
>  
>  It turns out that within TinyXpath 'node' is a reserved key-word.
>  Replace it with 'hwnode' when printing to xml.
> @@ -9,14 +8,14 @@ Replace it with 'hwnode' when printing to xml.
>  Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
>  Signed-off-by: Remy Bohmer <linux@bohmer.net>
>  ---
> - src/core/hw.cc |    4 ++--
> - 1 files changed, 2 insertions(+), 2 deletions(-)
> + src/core/hw.cc | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>  
>  diff --git a/src/core/hw.cc b/src/core/hw.cc
> -index 36679d3..367729b 100644
> +index 4522c1af0fc3..13c22ac8f44d 100644
>  --- a/src/core/hw.cc
>  +++ b/src/core/hw.cc
> -@@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level)
> +@@ -1715,7 +1715,7 @@ string hwNode::asXML(unsigned level)
>     if(visible(getClassName()))
>     {
>       out << spaces(2*level);
> @@ -25,7 +24,7 @@ index 36679d3..367729b 100644
>       if (disabled())
>         out << " disabled=\"true\"";
>       if (claimed())
> -@@ -1596,7 +1596,7 @@ string hwNode::asXML(unsigned level)
> +@@ -2014,7 +2014,7 @@ string hwNode::asXML(unsigned level)
>     if(visible(getClassName()))
>     {
>       out << spaces(2*level);
> @@ -33,7 +32,4 @@ index 36679d3..367729b 100644
>  +    out << "</hwnode>" << endl;
>     }
>   
> -   return out.str();
> --- 
> -1.7.1
> -
> +   if((level==0) && ::enabled("output:list"))
> diff --git a/patches/lshw-B.02.19.2/series b/patches/lshw-B.02.19.2/series
> new file mode 100644
> index 000000000000..9e84d09a6fc9
> --- /dev/null
> +++ b/patches/lshw-B.02.19.2/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
> +# 71740a4e0313709445f69ef544501432  - git-ptx-patches magic
> diff --git a/rules/lshw.in b/rules/lshw.in
> index 6911380f6999..c8632f7b41c3 100644
> --- a/rules/lshw.in
> +++ b/rules/lshw.in
> @@ -7,6 +7,9 @@ menuconfig LSHW
>  	select GCCLIBS_CXX
>  	select GCCLIBS_GCC_S
>  	select GTK if LSHW_GUI
> +	select HWDATA		if !SYSTEMD_HWDB
> +	select HWDATA_USB	if !SYSTEMD_HWDB
> +	select HWDATA_PCI	if !SYSTEMD_HWDB
>  	help
>  	  lshw (Hardware Lister) is a small tool to provide detailed information
>  	  on the hardware configuration of the machine. It can report exact
> diff --git a/rules/lshw.make b/rules/lshw.make
> index 28dbb6cb7d11..1feb82dba8e8 100644
> --- a/rules/lshw.make
> +++ b/rules/lshw.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LSHW) += lshw
>  #
>  # Paths and names
>  #
> -LSHW_VERSION	:= B.02.14
> -LSHW_MD5	:= 8bed55768c5cb2ceff062b882a687e9b
> +LSHW_VERSION	:= B.02.19.2
> +LSHW_MD5	:= 8c70d46e906688309095c73ecb9396e3
>  LSHW		:= lshw-$(LSHW_VERSION)
>  LSHW_SUFFIX	:= tar.gz
>  LSHW_URL	:= http://www.ezix.org/software/files/$(LSHW).$(LSHW_SUFFIX)
> @@ -59,12 +59,6 @@ $(STATEDIR)/lshw.targetinstall:
>  
>  	@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/lshw)
>  
> -	@$(call install_copy, lshw, 0, 0, 0755, /usr/share/lshw)
> -	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/pci.ids)
> -	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/usb.ids)
> -	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/oui.txt)
> -	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/manuf.txt)
> -
>  ifdef PTXCONF_LSHW_GUI
>  	@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/gtk-lshw)
>  

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

[ptxdist] [PATCH 7/7] udev: Update to accomodate for hwdata package.

[Christian Melki]

There are packages that can't read compressed .ids files.
So don't really expect it to ever be compressed.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/udev.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/udev.make b/rules/udev.make
index 9cb359017..e4760a60a 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -56,7 +56,7 @@ UDEV_LEGACY_CONF_OPT	:= \
 	--disable-floppy \
 	--without-selinux \
 	--with-usb-ids-path=/usr/share/usb.ids \
-	--with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,)
+	--with-pci-ids-path=/usr/share/pci.ids
 
 UDEV_LEGACY_RULES-y := \
 	50-udev-default.rules \
-- 
2.30.2


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

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

[Michael Olbrich]

Thanks, applied as 254ffcab110e6d4cc1c57c17410f39f7b47ad403.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:42 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> There are packages that can't read compressed .ids files.
> So don't really expect it to ever be compressed.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220108184518.3774572-8-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/udev.make b/rules/udev.make
> index 9cb359017869..e4760a60a0b6 100644
> --- a/rules/udev.make
> +++ b/rules/udev.make
> @@ -56,7 +56,7 @@ UDEV_LEGACY_CONF_OPT	:= \
>  	--disable-floppy \
>  	--without-selinux \
>  	--with-usb-ids-path=/usr/share/usb.ids \
> -	--with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,)
> +	--with-pci-ids-path=/usr/share/pci.ids
>  
>  UDEV_LEGACY_RULES-y := \
>  	50-udev-default.rules \

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