Hi,

2010/1/19 Carsten Schlote <carsten.schl...@gmx.net>:
> From: Carsten Schlote <c.schl...@konzeptpark.de>
>
> Updated to 150 as proposed on ptxdist mailinglist. Compiles
> and works (tested with upstart initmethod).
>
> Added new config options for all files installed in package
> dir.
>
> Added 'install_copy' lines for all files found in package dir
> and as well some more obscure ones not installed by default.
>
> Added comments and reviews
>
> Crosscompile Patches:
> - commented out checks for pci.ids and provide link to file directly.
>
> Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
> ---
>  patches/udev-150/autogen.sh             |    1 +
>  patches/udev-150/fix-crosscompile.patch |   29 +++++
>  patches/udev-150/series                 |    1 +
>  rules/udev.in                           |  203 
> +++++++++++++++++++++++--------
>  rules/udev.make                         |  160 ++++++++++++++++++++++---
>  5 files changed, 329 insertions(+), 65 deletions(-)
>  create mode 120000 patches/udev-150/autogen.sh
>  create mode 100644 patches/udev-150/fix-crosscompile.patch
>  create mode 100644 patches/udev-150/series
>
> diff --git a/patches/udev-150/autogen.sh b/patches/udev-150/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/udev-150/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/udev-150/fix-crosscompile.patch 
> b/patches/udev-150/fix-crosscompile.patch
> new file mode 100644
> index 0000000..5a811eb
> --- /dev/null
> +++ b/patches/udev-150/fix-crosscompile.patch
> @@ -0,0 +1,29 @@
> +From: Carsten Schlote <c.schl...@konzeptpark.de>
> +Subject: Remove checks for pci.ids to allow cross-compilation.
> +
> +These checks for pci.ids seem to fail. So commented out and
> +path to pci.ids is provided with by commandline option on
> +configure.
> +
> +Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
> +---
> + configure.ac |    6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +Index: udev-146/configure.ac
> +===================================================================
> +--- udev-146.orig/configure.ac 2009-08-10 03:37:42.000000000 +0200
> ++++ udev-146/configure.ac      2009-12-09 10:11:53.000000000 +0100
> +@@ -69,9 +69,9 @@
> +       PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
> +       AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
> +
> +-      AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
> +-      AC_CHECK_FILES([/usr/share/hwdata/pci.ids], 
> [pciids=/usr/share/hwdata/pci.ids])
> +-      AC_CHECK_FILES([/usr/share/misc/pci.ids], 
> [pciids=/usr/share/misc/pci.ids])
> ++#     AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
> ++#     AC_CHECK_FILES([/usr/share/hwdata/pci.ids], 
> [pciids=/usr/share/hwdata/pci.ids])
> ++#     AC_CHECK_FILES([/usr/share/misc/pci.ids], 
> [pciids=/usr/share/misc/pci.ids])
> +       AC_ARG_WITH(pci-ids-path,
> +               AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
> +               [PCI_DATABASE=${withval}],
> diff --git a/patches/udev-150/series b/patches/udev-150/series
> new file mode 100644
> index 0000000..1752ae8
> --- /dev/null
> +++ b/patches/udev-150/series
> @@ -0,0 +1 @@
> +fix-crosscompile.patch
> diff --git a/rules/udev.in b/rules/udev.in
> index 58db642..5e56a29 100644
> --- a/rules/udev.in
> +++ b/rules/udev.in
> @@ -2,7 +2,13 @@
>  menuconfig UDEV
>        tristate
>        prompt "udev                          "
> +       select HOST_GPERF
>        select ROOTFS_DEV
> +       select GLIB           if UDEV__EXTRAS
> +       select ACL            if UDEV__EXTRAS
> +       select USBUTILS       if UDEV__EXTRAS
> +       select LIBUSB_COMPAT  if UDEV__EXTRAS
> +       select PCIUTILS       if UDEV__EXTRAS

Much better than previous patch, but can it be even more fine grained?
Something like 'select PCIUTILS if UDEV__EXTRA_PCI_DB' ?
I can imagine that someone wants usbutils on ARM for example, but not
want to have PCIUTILS...

Kind regards,

Remy

--
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to