* [ptxdist] [PATCH 1/3] udev: remove unused kconfig symbols for udev-legacy @ 2019-10-01 11:15 Roland Hieber 2019-10-01 11:15 ` [ptxdist] [PATCH 2/3] usb-ids: new package Roland Hieber 2019-10-01 11:15 ` [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 Roland Hieber 0 siblings, 2 replies; 10+ messages in thread From: Roland Hieber @ 2019-10-01 11:15 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/udev.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/rules/udev.in b/rules/udev.in index 2a6d375ca5e1..6747084dec77 100644 --- a/rules/udev.in +++ b/rules/udev.in @@ -24,8 +24,6 @@ menuconfig UDEV_LEGACY select LIBKMOD select LIBBLKID select HOST_GPERF if UDEV_LEGACY_KEYMAPS - select PCIUTILS if UDEV_LEGACY_PERSISTENT_PCI - select USBUTILS if UDEV_LEGACY_PERSISTENT_USB depends on SYSTEMD = n help udev provides a dynamic device directory containing only the files for @@ -135,14 +133,6 @@ config UDEV_LEGACY_PERSISTENT_GENERATOR your CD/DVD media and network devices Warning: this needs write access to /etc/udev/rules.d/ -config UDEV_LEGACY_PERSISTENT_PCI - bool - prompt "pci" - -config UDEV_LEGACY_PERSISTENT_USB - bool - prompt "usb" - config UDEV_LEGACY_PERSISTENT_SCSI bool prompt "scsi" -- 2.23.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 2/3] usb-ids: new package 2019-10-01 11:15 [ptxdist] [PATCH 1/3] udev: remove unused kconfig symbols for udev-legacy Roland Hieber @ 2019-10-01 11:15 ` Roland Hieber 2019-10-01 16:12 ` Alexander Dahl 2019-10-02 13:43 ` Michael Olbrich 2019-10-01 11:15 ` [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 Roland Hieber 1 sibling, 2 replies; 10+ messages in thread From: Roland Hieber @ 2019-10-01 11:15 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber The usb.ids file is no longer installed by usbutils since v008, create a new package to fetch it. Since the file is not a tarball, we cannot use $(call extract) and need to extract it ourselves. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/usb-ids.in | 4 ++ rules/usb-ids.make | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 rules/usb-ids.in create mode 100644 rules/usb-ids.make diff --git a/rules/usb-ids.in b/rules/usb-ids.in new file mode 100644 index 000000000000..8c447c5c2c47 --- /dev/null +++ b/rules/usb-ids.in @@ -0,0 +1,4 @@ +## SECTION=shell_and_console + +config USB_IDS + tristate diff --git a/rules/usb-ids.make b/rules/usb-ids.make new file mode 100644 index 000000000000..904cec9537d6 --- /dev/null +++ b/rules/usb-ids.make @@ -0,0 +1,92 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Roland Hieber <rhi@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_USB_IDS) += usb-ids + +# +# Paths and names +# +USB_IDS_VERSION := 0 +USB_IDS_MD5 := 47a791eab0bf9aa41a33a82bbccaedb3 +USB_IDS := usb-ids +USB_IDS_SUFFIX := bz2 +USB_IDS_URL := http://www.linux-usb.org/usb.ids.$(USB_IDS_SUFFIX) +USB_IDS_SOURCE := $(SRCDIR)/$(USB_IDS).$(USB_IDS_SUFFIX) +USB_IDS_DIR := $(BUILDDIR)/$(USB_IDS) +USB_IDS_LICENSE := GPL-2.0-or-later OR BSD-3-Clause + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- + +$(STATEDIR)/usb-ids.extract: + @$(call targetinfo) + @$(call clean, $(USB_IDS_DIR)) + @mkdir -p $(USB_IDS_DIR) && \ + cd $(USB_IDS_DIR) && \ + bzcat $(USB_IDS_SOURCE) > usb.ids + @$(call touch) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +$(STATEDIR)/usb-ids.prepare: + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +$(STATEDIR)/usb-ids.compile: + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/usb-ids.install: + @$(call targetinfo) + @mkdir -p $(USB_IDS_PKGDIR)/usr/share/ + @cd $(USB_IDS_DIR) && \ + install -m0644 usb.ids $(USB_IDS_PKGDIR)/usr/share/ + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/usb-ids.targetinstall: + @$(call targetinfo) + + @$(call install_init, usb-ids) + @$(call install_fixup, usb-ids,PRIORITY,optional) + @$(call install_fixup, usb-ids,SECTION,base) + @$(call install_fixup, usb-ids,AUTHOR,"Roland Hieber <rhi@pengutronix.de>") + @$(call install_fixup, usb-ids,DESCRIPTION,missing) + + @$(call install_copy, usb-ids, 0, 0, 0644, -, /usr/share/usb.ids) + + @$(call install_finish, usb-ids) + + @$(call touch) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +#$(STATEDIR)/usb-ids.clean: +# @$(call targetinfo) +# @$(call clean_pkg, USB_IDS) + +# vim: syntax=make -- 2.23.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 2/3] usb-ids: new package 2019-10-01 11:15 ` [ptxdist] [PATCH 2/3] usb-ids: new package Roland Hieber @ 2019-10-01 16:12 ` Alexander Dahl 2019-10-02 10:59 ` Roland Hieber 2019-10-02 13:43 ` Michael Olbrich 1 sibling, 1 reply; 10+ messages in thread From: Alexander Dahl @ 2019-10-01 16:12 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Hello Roland, Am Dienstag, 1. Oktober 2019, 13:15:19 CEST schrieb Roland Hieber: > The usb.ids file is no longer installed by usbutils since v008, create a > new package to fetch it. Since the file is not a tarball, we cannot use > $(call extract) and need to extract it ourselves. > > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > --- > rules/usb-ids.in | 4 ++ > rules/usb-ids.make | 92 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 96 insertions(+) > create mode 100644 rules/usb-ids.in > create mode 100644 rules/usb-ids.make > > diff --git a/rules/usb-ids.in b/rules/usb-ids.in > new file mode 100644 > index 000000000000..8c447c5c2c47 > --- /dev/null > +++ b/rules/usb-ids.in > @@ -0,0 +1,4 @@ > +## SECTION=shell_and_console > + > +config USB_IDS > + tristate > diff --git a/rules/usb-ids.make b/rules/usb-ids.make > new file mode 100644 > index 000000000000..904cec9537d6 > --- /dev/null > +++ b/rules/usb-ids.make > @@ -0,0 +1,92 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Roland Hieber <rhi@pengutronix.de> > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_USB_IDS) += usb-ids > + > +# > +# Paths and names > +# > +USB_IDS_VERSION := 0 > +USB_IDS_MD5 := 47a791eab0bf9aa41a33a82bbccaedb3 > +USB_IDS := usb-ids > +USB_IDS_SUFFIX := bz2 > +USB_IDS_URL := http://www.linux-usb.org/usb.ids.$(USB_IDS_SUFFIX) > +USB_IDS_SOURCE := $(SRCDIR)/$(USB_IDS).$(USB_IDS_SUFFIX) > +USB_IDS_DIR := $(BUILDDIR)/$(USB_IDS) > +USB_IDS_LICENSE := GPL-2.0-or-later OR BSD-3-Clause > + > +# > --------------------------------------------------------------------------- > - +# Extract > +# > --------------------------------------------------------------------------- > - + > +$(STATEDIR)/usb-ids.extract: > + @$(call targetinfo) > + @$(call clean, $(USB_IDS_DIR)) > + @mkdir -p $(USB_IDS_DIR) && \ > + cd $(USB_IDS_DIR) && \ > + bzcat $(USB_IDS_SOURCE) > usb.ids > + @$(call touch) Is there a benefit of calling bzcat and redirecting the output, instead of just calling bunzip2? > + > +# > --------------------------------------------------------------------------- > - +# Prepare > +# > --------------------------------------------------------------------------- > - + > +$(STATEDIR)/usb-ids.prepare: > + @$(call targetinfo) > + @$(call touch) > + > +# > --------------------------------------------------------------------------- > - +# Compile > +# > --------------------------------------------------------------------------- > - + > +$(STATEDIR)/usb-ids.compile: > + @$(call targetinfo) > + @$(call touch) > + > +# > --------------------------------------------------------------------------- > - +# Install > +# > --------------------------------------------------------------------------- > - + > +$(STATEDIR)/usb-ids.install: > + @$(call targetinfo) > + @mkdir -p $(USB_IDS_PKGDIR)/usr/share/ > + @cd $(USB_IDS_DIR) && \ > + install -m0644 usb.ids $(USB_IDS_PKGDIR)/usr/share/ > + @$(call touch) > + > +# > --------------------------------------------------------------------------- > - +# Target-Install > +# > --------------------------------------------------------------------------- > - + > +$(STATEDIR)/usb-ids.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, usb-ids) > + @$(call install_fixup, usb-ids,PRIORITY,optional) > + @$(call install_fixup, usb-ids,SECTION,base) > + @$(call install_fixup, usb-ids,AUTHOR,"Roland Hieber > <rhi@pengutronix.de>") + @$(call install_fixup, > usb-ids,DESCRIPTION,missing) > + > + @$(call install_copy, usb-ids, 0, 0, 0644, -, /usr/share/usb.ids) > + > + @$(call install_finish, usb-ids) > + > + @$(call touch) > + > +# > --------------------------------------------------------------------------- > - +# Clean > +# > --------------------------------------------------------------------------- > - + > +#$(STATEDIR)/usb-ids.clean: > +# @$(call targetinfo) > +# @$(call clean_pkg, USB_IDS) > + > +# vim: syntax=make Alex _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 2/3] usb-ids: new package 2019-10-01 16:12 ` Alexander Dahl @ 2019-10-02 10:59 ` Roland Hieber 0 siblings, 0 replies; 10+ messages in thread From: Roland Hieber @ 2019-10-02 10:59 UTC (permalink / raw) To: Alexander Dahl; +Cc: ptxdist On Tue, Oct 01, 2019 at 06:12:37PM +0200, Alexander Dahl wrote: > Hello Roland, > > Am Dienstag, 1. Oktober 2019, 13:15:19 CEST schrieb Roland Hieber: > > The usb.ids file is no longer installed by usbutils since v008, create a > > new package to fetch it. Since the file is not a tarball, we cannot use > > $(call extract) and need to extract it ourselves. > > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > > --- > > rules/usb-ids.in | 4 ++ > > rules/usb-ids.make | 92 ++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 96 insertions(+) > > create mode 100644 rules/usb-ids.in > > create mode 100644 rules/usb-ids.make > > > > diff --git a/rules/usb-ids.in b/rules/usb-ids.in > > new file mode 100644 > > index 000000000000..8c447c5c2c47 > > --- /dev/null > > +++ b/rules/usb-ids.in > > @@ -0,0 +1,4 @@ > > +## SECTION=shell_and_console > > + > > +config USB_IDS > > + tristate > > diff --git a/rules/usb-ids.make b/rules/usb-ids.make > > new file mode 100644 > > index 000000000000..904cec9537d6 > > --- /dev/null > > +++ b/rules/usb-ids.make > > @@ -0,0 +1,92 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2019 by Roland Hieber <rhi@pengutronix.de> > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_USB_IDS) += usb-ids > > + > > +# > > +# Paths and names > > +# > > +USB_IDS_VERSION := 0 > > +USB_IDS_MD5 := 47a791eab0bf9aa41a33a82bbccaedb3 > > +USB_IDS := usb-ids > > +USB_IDS_SUFFIX := bz2 > > +USB_IDS_URL := http://www.linux-usb.org/usb.ids.$(USB_IDS_SUFFIX) > > +USB_IDS_SOURCE := $(SRCDIR)/$(USB_IDS).$(USB_IDS_SUFFIX) > > +USB_IDS_DIR := $(BUILDDIR)/$(USB_IDS) > > +USB_IDS_LICENSE := GPL-2.0-or-later OR BSD-3-Clause > > + > > +# > > --------------------------------------------------------------------------- > > - +# Extract > > +# > > --------------------------------------------------------------------------- > > - + > > +$(STATEDIR)/usb-ids.extract: > > + @$(call targetinfo) > > + @$(call clean, $(USB_IDS_DIR)) > > + @mkdir -p $(USB_IDS_DIR) && \ > > + cd $(USB_IDS_DIR) && \ > > + bzcat $(USB_IDS_SOURCE) > usb.ids > > + @$(call touch) > > Is there a benefit of calling bzcat and redirecting the output, instead of > just calling bunzip2? Yes. bunzip2 deletes the source file and saves the extracted file to the same folder, but here we want a different output. - Roland > > > + > > +# > > --------------------------------------------------------------------------- > > - +# Prepare > > +# > > --------------------------------------------------------------------------- > > - + > > +$(STATEDIR)/usb-ids.prepare: > > + @$(call targetinfo) > > + @$(call touch) > > + > > +# > > --------------------------------------------------------------------------- > > - +# Compile > > +# > > --------------------------------------------------------------------------- > > - + > > +$(STATEDIR)/usb-ids.compile: > > + @$(call targetinfo) > > + @$(call touch) > > + > > +# > > --------------------------------------------------------------------------- > > - +# Install > > +# > > --------------------------------------------------------------------------- > > - + > > +$(STATEDIR)/usb-ids.install: > > + @$(call targetinfo) > > + @mkdir -p $(USB_IDS_PKGDIR)/usr/share/ > > + @cd $(USB_IDS_DIR) && \ > > + install -m0644 usb.ids $(USB_IDS_PKGDIR)/usr/share/ > > + @$(call touch) > > + > > +# > > --------------------------------------------------------------------------- > > - +# Target-Install > > +# > > --------------------------------------------------------------------------- > > - + > > +$(STATEDIR)/usb-ids.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, usb-ids) > > + @$(call install_fixup, usb-ids,PRIORITY,optional) > > + @$(call install_fixup, usb-ids,SECTION,base) > > + @$(call install_fixup, usb-ids,AUTHOR,"Roland Hieber > > <rhi@pengutronix.de>") + @$(call install_fixup, > > usb-ids,DESCRIPTION,missing) > > + > > + @$(call install_copy, usb-ids, 0, 0, 0644, -, /usr/share/usb.ids) > > + > > + @$(call install_finish, usb-ids) > > + > > + @$(call touch) > > + > > +# > > --------------------------------------------------------------------------- > > - +# Clean > > +# > > --------------------------------------------------------------------------- > > - + > > +#$(STATEDIR)/usb-ids.clean: > > +# @$(call targetinfo) > > +# @$(call clean_pkg, USB_IDS) > > + > > +# vim: syntax=make > > Alex > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Roland Hieber | r.hieber@pengutronix.de | Pengutronix e.K. | https://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 2/3] usb-ids: new package 2019-10-01 11:15 ` [ptxdist] [PATCH 2/3] usb-ids: new package Roland Hieber 2019-10-01 16:12 ` Alexander Dahl @ 2019-10-02 13:43 ` Michael Olbrich 1 sibling, 0 replies; 10+ messages in thread From: Michael Olbrich @ 2019-10-02 13:43 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber On Tue, Oct 01, 2019 at 01:15:19PM +0200, Roland Hieber wrote: > The usb.ids file is no longer installed by usbutils since v008, create a > new package to fetch it. Since the file is not a tarball, we cannot use > $(call extract) and need to extract it ourselves. > > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > --- > rules/usb-ids.in | 4 ++ > rules/usb-ids.make | 92 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 96 insertions(+) > create mode 100644 rules/usb-ids.in > create mode 100644 rules/usb-ids.make > > diff --git a/rules/usb-ids.in b/rules/usb-ids.in > new file mode 100644 > index 000000000000..8c447c5c2c47 > --- /dev/null > +++ b/rules/usb-ids.in > @@ -0,0 +1,4 @@ > +## SECTION=shell_and_console > + > +config USB_IDS > + tristate > diff --git a/rules/usb-ids.make b/rules/usb-ids.make > new file mode 100644 > index 000000000000..904cec9537d6 > --- /dev/null > +++ b/rules/usb-ids.make > @@ -0,0 +1,92 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Roland Hieber <rhi@pengutronix.de> > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_USB_IDS) += usb-ids > + > +# > +# Paths and names > +# > +USB_IDS_VERSION := 0 > +USB_IDS_MD5 := 47a791eab0bf9aa41a33a82bbccaedb3 > +USB_IDS := usb-ids > +USB_IDS_SUFFIX := bz2 > +USB_IDS_URL := http://www.linux-usb.org/usb.ids.$(USB_IDS_SUFFIX) This won't work. You'll get a different file from the same URL as soon as the data changes. > +USB_IDS_SOURCE := $(SRCDIR)/$(USB_IDS).$(USB_IDS_SUFFIX) > +USB_IDS_DIR := $(BUILDDIR)/$(USB_IDS) > +USB_IDS_LICENSE := GPL-2.0-or-later OR BSD-3-Clause > + > +# ---------------------------------------------------------------------------- > +# Extract > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/usb-ids.extract: > + @$(call targetinfo) > + @$(call clean, $(USB_IDS_DIR)) > + @mkdir -p $(USB_IDS_DIR) && \ > + cd $(USB_IDS_DIR) && \ > + bzcat $(USB_IDS_SOURCE) > usb.ids > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/usb-ids.prepare: > + @$(call targetinfo) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Compile > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/usb-ids.compile: > + @$(call targetinfo) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/usb-ids.install: > + @$(call targetinfo) > + @mkdir -p $(USB_IDS_PKGDIR)/usr/share/ > + @cd $(USB_IDS_DIR) && \ > + install -m0644 usb.ids $(USB_IDS_PKGDIR)/usr/share/ > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/usb-ids.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, usb-ids) > + @$(call install_fixup, usb-ids,PRIORITY,optional) > + @$(call install_fixup, usb-ids,SECTION,base) > + @$(call install_fixup, usb-ids,AUTHOR,"Roland Hieber <rhi@pengutronix.de>") > + @$(call install_fixup, usb-ids,DESCRIPTION,missing) > + > + @$(call install_copy, usb-ids, 0, 0, 0644, -, /usr/share/usb.ids) > + > + @$(call install_finish, usb-ids) > + > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Clean > +# ---------------------------------------------------------------------------- > + > +#$(STATEDIR)/usb-ids.clean: > +# @$(call targetinfo) > +# @$(call clean_pkg, USB_IDS) Remove. Michael > + > +# vim: syntax=make > -- > 2.23.0 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 2019-10-01 11:15 [ptxdist] [PATCH 1/3] udev: remove unused kconfig symbols for udev-legacy Roland Hieber 2019-10-01 11:15 ` [ptxdist] [PATCH 2/3] usb-ids: new package Roland Hieber @ 2019-10-01 11:15 ` Roland Hieber 2019-10-01 16:15 ` Alexander Dahl 2019-10-02 13:47 ` Michael Olbrich 1 sibling, 2 replies; 10+ messages in thread From: Roland Hieber @ 2019-10-01 11:15 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber The upstream tarball currently does not provide a pre-built configure script [1], we need to generate it during the extract stage. The usb.ids file was removed from the source tarball in v008 [3], instead we now install it through an extra package. With that, zlib is no longer needed for the build. A look through the source tree shows GPL-2.0-or-later files too. Pin down all relevant license files. [1]: https://github.com/gregkh/usbutils/issues/95#issuecomment-490086696 [3]: https://github.com/gregkh/usbutils/commit/5d7ea40bc94c --- patches/usbutils-012/autogen.sh | 1 + rules/usbutils.in | 15 +++++++++++++-- rules/usbutils.make | 15 ++++++++------- 3 files changed, 22 insertions(+), 9 deletions(-) create mode 120000 patches/usbutils-012/autogen.sh diff --git a/patches/usbutils-012/autogen.sh b/patches/usbutils-012/autogen.sh new file mode 120000 index 000000000000..9f8a4cb7ddcb --- /dev/null +++ b/patches/usbutils-012/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/rules/usbutils.in b/rules/usbutils.in index f259f9c4e560..42eb0b77c6b0 100644 --- a/rules/usbutils.in +++ b/rules/usbutils.in @@ -1,9 +1,13 @@ ## SECTION=shell_and_console menuconfig USBUTILS - select LIBUSB tristate prompt "usbutils " + select LIBUSB + select UDEV + select UDEV_LIBUDEV + select USB_IDS if USBUTILS_IDS + help Linux USB utilities @@ -44,8 +48,15 @@ config USBUTILS_USBHIDDUMP config USBUTILS_USBDEVICES bool - prompt "usbdevices" + prompt "usb-devices" help Print out sysfs information about usb devices. +config USBUTILS_IDS + bool + prompt "usb.ids" + help + Install /usr/share/usb.ids, the database of known USB vendor and + product IDs. + endif diff --git a/rules/usbutils.make b/rules/usbutils.make index 80af5a2bbf17..df1f44a5a2c7 100644 --- a/rules/usbutils.make +++ b/rules/usbutils.make @@ -15,14 +15,18 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils # # Paths and names # -USBUTILS_VERSION := 007 -USBUTILS_MD5 := c9df5107ae9d26b10a1736a261250139 +USBUTILS_VERSION := 012 +USBUTILS_MD5 := 0da98eb80159071fdbb00905390509d9 USBUTILS := usbutils-$(USBUTILS_VERSION) USBUTILS_SUFFIX := tar.xz USBUTILS_URL := $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)) USBUTILS_SOURCE := $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX) USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS) -USBUTILS_LICENSE := GPL-2.0-only +USBUTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later +USBUTILS_LICENSE_FILES := \ + file://README.md;startline=2;endline=3;md5=d1a09bbc0904287c70ce0a7aba17d637 \ + file://LICENSES/GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/GPL-3.0.txt;md5=1ebbd3e34237af26da5dc08a4e440464 # ---------------------------------------------------------------------------- # Prepare @@ -36,9 +40,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 +64,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.23.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 2019-10-01 11:15 ` [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 Roland Hieber @ 2019-10-01 16:15 ` Alexander Dahl 2019-10-02 11:00 ` Roland Hieber 2019-10-16 12:36 ` Roland Hieber 2019-10-02 13:47 ` Michael Olbrich 1 sibling, 2 replies; 10+ messages in thread From: Alexander Dahl @ 2019-10-01 16:15 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber Hello Roland, Am Dienstag, 1. Oktober 2019, 13:15:20 CEST schrieb Roland Hieber: > The upstream tarball currently does not provide a pre-built configure > script [1], we need to generate it during the extract stage. > > The usb.ids file was removed from the source tarball in v008 [3], > instead we now install it through an extra package. With that, zlib is > no longer needed for the build. > > A look through the source tree shows GPL-2.0-or-later files too. Pin > down all relevant license files. I would expect version bump and license issues in two separate commits. ;-) > > [1]: https://github.com/gregkh/usbutils/issues/95#issuecomment-490086696 > [3]: https://github.com/gregkh/usbutils/commit/5d7ea40bc94c > --- > patches/usbutils-012/autogen.sh | 1 + > rules/usbutils.in | 15 +++++++++++++-- > rules/usbutils.make | 15 ++++++++------- > 3 files changed, 22 insertions(+), 9 deletions(-) > create mode 120000 patches/usbutils-012/autogen.sh > > diff --git a/patches/usbutils-012/autogen.sh > b/patches/usbutils-012/autogen.sh new file mode 120000 > index 000000000000..9f8a4cb7ddcb > --- /dev/null > +++ b/patches/usbutils-012/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/rules/usbutils.in b/rules/usbutils.in > index f259f9c4e560..42eb0b77c6b0 100644 > --- a/rules/usbutils.in > +++ b/rules/usbutils.in > @@ -1,9 +1,13 @@ > ## SECTION=shell_and_console > > menuconfig USBUTILS > - select LIBUSB > tristate > prompt "usbutils " > + select LIBUSB > + select UDEV > + select UDEV_LIBUDEV > + select USB_IDS if USBUTILS_IDS > + > help > Linux USB utilities > > @@ -44,8 +48,15 @@ config USBUTILS_USBHIDDUMP > > config USBUTILS_USBDEVICES > bool > - prompt "usbdevices" > + prompt "usb-devices" > help > Print out sysfs information about usb devices. > > +config USBUTILS_IDS > + bool > + prompt "usb.ids" > + help > + Install /usr/share/usb.ids, the database of known USB vendor and > + product IDs. > + > endif > diff --git a/rules/usbutils.make b/rules/usbutils.make > index 80af5a2bbf17..df1f44a5a2c7 100644 > --- a/rules/usbutils.make > +++ b/rules/usbutils.make > @@ -15,14 +15,18 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils > # > # Paths and names > # > -USBUTILS_VERSION := 007 > -USBUTILS_MD5 := c9df5107ae9d26b10a1736a261250139 > +USBUTILS_VERSION := 012 > +USBUTILS_MD5 := 0da98eb80159071fdbb00905390509d9 > USBUTILS := usbutils-$(USBUTILS_VERSION) > USBUTILS_SUFFIX := tar.xz > USBUTILS_URL := $(call ptx/mirror, KERNEL, > utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)) USBUTILS_SOURCE := > $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX) > USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS) > -USBUTILS_LICENSE := GPL-2.0-only > +USBUTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later > +USBUTILS_LICENSE_FILES := \ > + file://README.md;startline=2;endline=3;md5=d1a09bbc0904287c70ce0a7aba17d63 > 7 \ + file://LICENSES/GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > + file://LICENSES/GPL-3.0.txt;md5=1ebbd3e34237af26da5dc08a4e440464 > > # > --------------------------------------------------------------------------- > - # Prepare > @@ -36,9 +40,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 +64,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) Alex _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 2019-10-01 16:15 ` Alexander Dahl @ 2019-10-02 11:00 ` Roland Hieber 2019-10-16 12:36 ` Roland Hieber 1 sibling, 0 replies; 10+ messages in thread From: Roland Hieber @ 2019-10-02 11:00 UTC (permalink / raw) To: Alexander Dahl; +Cc: ptxdist On Tue, Oct 01, 2019 at 06:15:14PM +0200, Alexander Dahl wrote: > Hello Roland, > > Am Dienstag, 1. Oktober 2019, 13:15:20 CEST schrieb Roland Hieber: > > The upstream tarball currently does not provide a pre-built configure > > script [1], we need to generate it during the extract stage. > > > > The usb.ids file was removed from the source tarball in v008 [3], > > instead we now install it through an extra package. With that, zlib is > > no longer needed for the build. > > > > A look through the source tree shows GPL-2.0-or-later files too. Pin > > down all relevant license files. > > I would expect version bump and license issues in two separate commits. ;-) Hmm, good point. They are not related here. - Roland > > > > > [1]: https://github.com/gregkh/usbutils/issues/95#issuecomment-490086696 > > [3]: https://github.com/gregkh/usbutils/commit/5d7ea40bc94c > > --- > > patches/usbutils-012/autogen.sh | 1 + > > rules/usbutils.in | 15 +++++++++++++-- > > rules/usbutils.make | 15 ++++++++------- > > 3 files changed, 22 insertions(+), 9 deletions(-) > > create mode 120000 patches/usbutils-012/autogen.sh > > > > diff --git a/patches/usbutils-012/autogen.sh > > b/patches/usbutils-012/autogen.sh new file mode 120000 > > index 000000000000..9f8a4cb7ddcb > > --- /dev/null > > +++ b/patches/usbutils-012/autogen.sh > > @@ -0,0 +1 @@ > > +../autogen.sh > > \ No newline at end of file > > diff --git a/rules/usbutils.in b/rules/usbutils.in > > index f259f9c4e560..42eb0b77c6b0 100644 > > --- a/rules/usbutils.in > > +++ b/rules/usbutils.in > > @@ -1,9 +1,13 @@ > > ## SECTION=shell_and_console > > > > menuconfig USBUTILS > > - select LIBUSB > > tristate > > prompt "usbutils " > > + select LIBUSB > > + select UDEV > > + select UDEV_LIBUDEV > > + select USB_IDS if USBUTILS_IDS > > + > > help > > Linux USB utilities > > > > @@ -44,8 +48,15 @@ config USBUTILS_USBHIDDUMP > > > > config USBUTILS_USBDEVICES > > bool > > - prompt "usbdevices" > > + prompt "usb-devices" > > help > > Print out sysfs information about usb devices. > > > > +config USBUTILS_IDS > > + bool > > + prompt "usb.ids" > > + help > > + Install /usr/share/usb.ids, the database of known USB vendor and > > + product IDs. > > + > > endif > > diff --git a/rules/usbutils.make b/rules/usbutils.make > > index 80af5a2bbf17..df1f44a5a2c7 100644 > > --- a/rules/usbutils.make > > +++ b/rules/usbutils.make > > @@ -15,14 +15,18 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils > > # > > # Paths and names > > # > > -USBUTILS_VERSION := 007 > > -USBUTILS_MD5 := c9df5107ae9d26b10a1736a261250139 > > +USBUTILS_VERSION := 012 > > +USBUTILS_MD5 := 0da98eb80159071fdbb00905390509d9 > > USBUTILS := usbutils-$(USBUTILS_VERSION) > > USBUTILS_SUFFIX := tar.xz > > USBUTILS_URL := $(call ptx/mirror, KERNEL, > > utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)) USBUTILS_SOURCE := > > $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX) > > USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS) > > -USBUTILS_LICENSE := GPL-2.0-only > > +USBUTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later > > +USBUTILS_LICENSE_FILES := \ > > + file://README.md;startline=2;endline=3;md5=d1a09bbc0904287c70ce0a7aba17d63 > > 7 \ + file://LICENSES/GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > + file://LICENSES/GPL-3.0.txt;md5=1ebbd3e34237af26da5dc08a4e440464 > > > > # > > --------------------------------------------------------------------------- > > - # Prepare > > @@ -36,9 +40,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 +64,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) > > Alex > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Roland Hieber | r.hieber@pengutronix.de | Pengutronix e.K. | https://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 2019-10-01 16:15 ` Alexander Dahl 2019-10-02 11:00 ` Roland Hieber @ 2019-10-16 12:36 ` Roland Hieber 1 sibling, 0 replies; 10+ messages in thread From: Roland Hieber @ 2019-10-16 12:36 UTC (permalink / raw) To: Alexander Dahl; +Cc: ptxdist On Tue, Oct 01, 2019 at 06:15:14PM +0200, Alexander Dahl wrote: > Hello Roland, > > Am Dienstag, 1. Oktober 2019, 13:15:20 CEST schrieb Roland Hieber: > > The upstream tarball currently does not provide a pre-built configure > > script [1], we need to generate it during the extract stage. > > > > The usb.ids file was removed from the source tarball in v008 [3], > > instead we now install it through an extra package. With that, zlib is > > no longer needed for the build. > > > > A look through the source tree shows GPL-2.0-or-later files too. Pin > > down all relevant license files. > > I would expect version bump and license issues in two separate commits. ;-) To resolve this sub-issue: no, usbutils-007 has different license files so this commit does not apply there. - Roland > > > > > [1]: https://github.com/gregkh/usbutils/issues/95#issuecomment-490086696 > > [3]: https://github.com/gregkh/usbutils/commit/5d7ea40bc94c > > --- > > patches/usbutils-012/autogen.sh | 1 + > > rules/usbutils.in | 15 +++++++++++++-- > > rules/usbutils.make | 15 ++++++++------- > > 3 files changed, 22 insertions(+), 9 deletions(-) > > create mode 120000 patches/usbutils-012/autogen.sh > > > > diff --git a/patches/usbutils-012/autogen.sh > > b/patches/usbutils-012/autogen.sh new file mode 120000 > > index 000000000000..9f8a4cb7ddcb > > --- /dev/null > > +++ b/patches/usbutils-012/autogen.sh > > @@ -0,0 +1 @@ > > +../autogen.sh > > \ No newline at end of file > > diff --git a/rules/usbutils.in b/rules/usbutils.in > > index f259f9c4e560..42eb0b77c6b0 100644 > > --- a/rules/usbutils.in > > +++ b/rules/usbutils.in > > @@ -1,9 +1,13 @@ > > ## SECTION=shell_and_console > > > > menuconfig USBUTILS > > - select LIBUSB > > tristate > > prompt "usbutils " > > + select LIBUSB > > + select UDEV > > + select UDEV_LIBUDEV > > + select USB_IDS if USBUTILS_IDS > > + > > help > > Linux USB utilities > > > > @@ -44,8 +48,15 @@ config USBUTILS_USBHIDDUMP > > > > config USBUTILS_USBDEVICES > > bool > > - prompt "usbdevices" > > + prompt "usb-devices" > > help > > Print out sysfs information about usb devices. > > > > +config USBUTILS_IDS > > + bool > > + prompt "usb.ids" > > + help > > + Install /usr/share/usb.ids, the database of known USB vendor and > > + product IDs. > > + > > endif > > diff --git a/rules/usbutils.make b/rules/usbutils.make > > index 80af5a2bbf17..df1f44a5a2c7 100644 > > --- a/rules/usbutils.make > > +++ b/rules/usbutils.make > > @@ -15,14 +15,18 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils > > # > > # Paths and names > > # > > -USBUTILS_VERSION := 007 > > -USBUTILS_MD5 := c9df5107ae9d26b10a1736a261250139 > > +USBUTILS_VERSION := 012 > > +USBUTILS_MD5 := 0da98eb80159071fdbb00905390509d9 > > USBUTILS := usbutils-$(USBUTILS_VERSION) > > USBUTILS_SUFFIX := tar.xz > > USBUTILS_URL := $(call ptx/mirror, KERNEL, > > utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)) USBUTILS_SOURCE := > > $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX) > > USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS) > > -USBUTILS_LICENSE := GPL-2.0-only > > +USBUTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later > > +USBUTILS_LICENSE_FILES := \ > > + file://README.md;startline=2;endline=3;md5=d1a09bbc0904287c70ce0a7aba17d63 > > 7 \ + file://LICENSES/GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > + file://LICENSES/GPL-3.0.txt;md5=1ebbd3e34237af26da5dc08a4e440464 > > > > # > > --------------------------------------------------------------------------- > > - # Prepare > > @@ -36,9 +40,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 +64,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) > > Alex > > -- Roland Hieber | r.hieber@pengutronix.de | Pengutronix e.K. | https://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 2019-10-01 11:15 ` [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 Roland Hieber 2019-10-01 16:15 ` Alexander Dahl @ 2019-10-02 13:47 ` Michael Olbrich 1 sibling, 0 replies; 10+ messages in thread From: Michael Olbrich @ 2019-10-02 13:47 UTC (permalink / raw) To: ptxdist; +Cc: Roland Hieber On Tue, Oct 01, 2019 at 01:15:20PM +0200, Roland Hieber wrote: > The upstream tarball currently does not provide a pre-built configure > script [1], we need to generate it during the extract stage. > > The usb.ids file was removed from the source tarball in v008 [3], I know. There is a reason why I didn't update to a newer version myself. At least Debian uses hwdb now. But creating that pulls in several more dependencies :-/. > instead we now install it through an extra package. With that, zlib is > no longer needed for the build. > > A look through the source tree shows GPL-2.0-or-later files too. Pin > down all relevant license files. > > [1]: https://github.com/gregkh/usbutils/issues/95#issuecomment-490086696 > [3]: https://github.com/gregkh/usbutils/commit/5d7ea40bc94c > --- > patches/usbutils-012/autogen.sh | 1 + > rules/usbutils.in | 15 +++++++++++++-- > rules/usbutils.make | 15 ++++++++------- > 3 files changed, 22 insertions(+), 9 deletions(-) > create mode 120000 patches/usbutils-012/autogen.sh > > diff --git a/patches/usbutils-012/autogen.sh b/patches/usbutils-012/autogen.sh > new file mode 120000 > index 000000000000..9f8a4cb7ddcb > --- /dev/null > +++ b/patches/usbutils-012/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/rules/usbutils.in b/rules/usbutils.in > index f259f9c4e560..42eb0b77c6b0 100644 > --- a/rules/usbutils.in > +++ b/rules/usbutils.in > @@ -1,9 +1,13 @@ > ## SECTION=shell_and_console > > menuconfig USBUTILS > - select LIBUSB > tristate > prompt "usbutils " > + select LIBUSB > + select UDEV > + select UDEV_LIBUDEV > + select USB_IDS if USBUTILS_IDS > + > help > Linux USB utilities > > @@ -44,8 +48,15 @@ config USBUTILS_USBHIDDUMP > > config USBUTILS_USBDEVICES > bool > - prompt "usbdevices" > + prompt "usb-devices" > help > Print out sysfs information about usb devices. > > +config USBUTILS_IDS > + bool > + prompt "usb.ids" > + help > + Install /usr/share/usb.ids, the database of known USB vendor and > + product IDs. No. The real benefit of the 'real' lsusb compared to busybox is that database. This should not be optional. Michael > + > endif > diff --git a/rules/usbutils.make b/rules/usbutils.make > index 80af5a2bbf17..df1f44a5a2c7 100644 > --- a/rules/usbutils.make > +++ b/rules/usbutils.make > @@ -15,14 +15,18 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils > # > # Paths and names > # > -USBUTILS_VERSION := 007 > -USBUTILS_MD5 := c9df5107ae9d26b10a1736a261250139 > +USBUTILS_VERSION := 012 > +USBUTILS_MD5 := 0da98eb80159071fdbb00905390509d9 > USBUTILS := usbutils-$(USBUTILS_VERSION) > USBUTILS_SUFFIX := tar.xz > USBUTILS_URL := $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)) > USBUTILS_SOURCE := $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX) > USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS) > -USBUTILS_LICENSE := GPL-2.0-only > +USBUTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later > +USBUTILS_LICENSE_FILES := \ > + file://README.md;startline=2;endline=3;md5=d1a09bbc0904287c70ce0a7aba17d637 \ > + file://LICENSES/GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > + file://LICENSES/GPL-3.0.txt;md5=1ebbd3e34237af26da5dc08a4e440464 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -36,9 +40,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 +64,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.23.0 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-10-16 12:36 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-01 11:15 [ptxdist] [PATCH 1/3] udev: remove unused kconfig symbols for udev-legacy Roland Hieber 2019-10-01 11:15 ` [ptxdist] [PATCH 2/3] usb-ids: new package Roland Hieber 2019-10-01 16:12 ` Alexander Dahl 2019-10-02 10:59 ` Roland Hieber 2019-10-02 13:43 ` Michael Olbrich 2019-10-01 11:15 ` [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012 Roland Hieber 2019-10-01 16:15 ` Alexander Dahl 2019-10-02 11:00 ` Roland Hieber 2019-10-16 12:36 ` Roland Hieber 2019-10-02 13:47 ` Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox