From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] hwdata: Update from individual file downloads to using a
 tarball source version 0.389
Date: Mon, 18 Nov 2024 20:06:38 +0000
Message-ID: <EAF6F709-83A1-4083-9917-5A8124E74741@ipfire.org>
In-Reply-To: <20241110130619.2608696-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2754126736219917992=="
List-Id: <development.lists.ipfire.org>

--===============2754126736219917992==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 10 Nov 2024, at 13:06, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - This patch uses https://github.com/vcrhonek/hwdata/ to obtain the pci.ids=
 & usb.ids
>   files. Arch Linux uses this source and they have been providing the updat=
es for
>   around 8 years.
> - Updated lfs to use the new source tarball
> - Updated rootfile to only install the pci.ids & usb.ids files
> - This will make it easier to identify when there have been updates of the =
.ids files
>   as there will be a new source tarball created.
>=20
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/hwdata |  6 +++++
> lfs/hwdata                     | 42 ++++++++++++++++++++++++++--------
> 2 files changed, 38 insertions(+), 10 deletions(-)
>=20
> diff --git a/config/rootfiles/common/hwdata b/config/rootfiles/common/hwdata
> index db268e887..1bca4a725 100644
> --- a/config/rootfiles/common/hwdata
> +++ b/config/rootfiles/common/hwdata
> @@ -1,3 +1,9 @@
> +#usr/lib/modprobe.d
> +#usr/lib/modprobe.d/dist-blacklist.conf
> #usr/share/hwdata
> +#usr/share/hwdata/iab.txt
> +#usr/share/hwdata/oui.txt
> usr/share/hwdata/pci.ids
> +#usr/share/hwdata/pnp.ids
> usr/share/hwdata/usb.ids
> +#usr/share/pkgconfig/hwdata.pc
> diff --git a/lfs/hwdata b/lfs/hwdata
> index 0ac9f1855..decf9b582 100644
> --- a/lfs/hwdata
> +++ b/lfs/hwdata
> @@ -24,27 +24,46 @@
>=20
> include Config
>=20
> -VER        =3D ipfire
> +VER        =3D 0.389
>=20
> -THISAPP    =3D hwdata
> +THISAPP    =3D hwdata-$(VER)
> +DL_FILE    =3D $(THISAPP).tar.gz
> +DL_FROM    =3D $(URL_IPFIRE)
> +DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET     =3D $(DIR_INFO)/$(THISAPP)
>=20
> -# https://pci-ids.ucw.cz/v2.2/pci.ids
> -# http://www.linux-usb.org/usb.ids
> +# https://github.com/vcrhonek/hwdata/releases?page=3D1
>=20
> ###########################################################################=
####
> # Top-level Rules
> ###########################################################################=
####
>=20
> -objects =3D
> +objects =3D $(DL_FILE)
> +
> +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_BLAKE2 =3D 967c107836e2cb6129d6432d116bae1ef57c8bf9212f5b052085=
029dc4dc7134b89237291ebec192d5031de6ff98338a253a1cdeed0a43a85c5ff37dd3d15b5c
>=20
> install : $(TARGET)
>=20
> -check :
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +b2 : $(subst %,%_BLAKE2,$(objects))
> +
> +##########################################################################=
#####
> +# Downloading, checking, b2sum
> +##########################################################################=
#####
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> + @$(CHECK)
>=20
> -download :
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> + @$(LOAD)
>=20
> -b2 :
> +$(subst %,%_BLAKE2,$(objects)) :
> + @$(B2SUM)
>=20
> ###########################################################################=
####
> # Installation Details
> @@ -52,6 +71,9 @@ b2 :
>=20
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> - -mkdir -p -m 755 /usr/share/hwdata
> - install -m 644 $(DIR_SRC)/src/hwdata/*.ids /usr/share/hwdata
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> + $(UPDATE_AUTOMAKE)
> + cd $(DIR_APP) && ./configure \
> + --prefix=3D/usr
> + cd $(DIR_APP) && make install
> @$(POSTBUILD)
> --=20
> 2.47.0
>=20


--===============2754126736219917992==--