* [Buildroot] [PATCH 1/3] [v3] libgudev: New package
@ 2015-08-24 15:44 Nathaniel Roach
2015-08-24 15:44 ` [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd Nathaniel Roach
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Nathaniel Roach @ 2015-08-24 15:44 UTC (permalink / raw)
To: buildroot
As libgudev recently was split from the main systemd/udev source,
this library is now required to build certain packages.
This library is only relevant to systemd, as the code it contains
is still contained in eudev.
Add the package and tweak systemd's Config.in message accordingly.
---
Changes v2 -> v3
(Changes as suggested by Yann E. MORIN)
- Separate libgudev and network-manager portions into
discrete patches, and a new patch for libmbim
Changes v1 -> v2
(Changes as suggested by Peter Korsgaard)
- Added the toolchain dependencies
- Dropped NM references in package
- Added _LICENSE_FILEs
- Conditionally depend on libgudev in NM if using systemd
Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
---
package/Config.in | 1 +
package/libgudev/Config.in | 19 +++++++++++++++++++
package/libgudev/libgudev.mk | 17 +++++++++++++++++
package/systemd/Config.in | 1 -
4 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 package/libgudev/Config.in
create mode 100644 package/libgudev/libgudev.mk
diff --git a/package/Config.in b/package/Config.in
index 47d14d7..6494322 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -852,6 +852,7 @@ menu "Hardware handling"
source "package/libfreefare/Config.in"
source "package/libftdi/Config.in"
source "package/libftdi1/Config.in"
+ source "package/libgudev/Config.in"
source "package/libhid/Config.in"
source "package/libiio/Config.in"
source "package/libinput/Config.in"
diff --git a/package/libgudev/Config.in b/package/libgudev/Config.in
new file mode 100644
index 0000000..8cdd9f6
--- /dev/null
+++ b/package/libgudev/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBGUDEV
+ bool "libgudev"
+ depends on BR2_INIT_SYSTEMD
+ depends on BR2_USE_WCHAR # gettext
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU # fork()
+ select BR2_PACKAGE_LIBGLIB2
+ help
+ This library provides GObject bindings for libudev.
+ It was originally part of udev-extras, then udev, then systemd.
+ It's now a project on its own.
+ Required for building some programs that use udev, when using
+ systemd.
+
+ https://wiki.gnome.org/Projects/libgudev
+
+comment "libgudev needs a toolchain w/ wchar, threads, and systemd"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INIT_SYSTEMD
diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk
new file mode 100644
index 0000000..fa15b56
--- /dev/null
+++ b/package/libgudev/libgudev.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libgudev
+#
+################################################################################
+
+LIBGUDEV_VERSION = 230
+LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz
+LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION)
+LIBGUDEV_INSTALL_STAGING = YES
+
+LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2
+
+LIBGUDEV_LICENSE = GPLv2+
+LIBGUDEV_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 510badd..f7fc3bb 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -55,7 +55,6 @@ config BR2_PACKAGE_SYSTEMD
The selection of other packages will enable some features:
- - libglib2 package will add support for gudev.
- acl package will add support for multi-seat.
http://freedesktop.org/wiki/Software/systemd
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd
2015-08-24 15:44 [Buildroot] [PATCH 1/3] [v3] libgudev: New package Nathaniel Roach
@ 2015-08-24 15:44 ` Nathaniel Roach
2015-08-25 18:49 ` Thomas Petazzoni
2015-08-24 15:44 ` [Buildroot] [PATCH 3/3] package/libmbim: " Nathaniel Roach
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Nathaniel Roach @ 2015-08-24 15:44 UTC (permalink / raw)
To: buildroot
NetworkManager uses code (originally from udev) that has since
been split from the main systemd codebase into libgudev.
Tweak the package files for NetworkManager to require libgudev
when building with systemd.
Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
---
package/network-manager/Config.in | 1 +
package/network-manager/network-manager.mk | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index bcf8f90..5a0e636 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -11,6 +11,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBNL
+ select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_WIRELESS_TOOLS
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 25ad2a2..03c7d63 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -63,6 +63,10 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
endif
+ifeq ($(BR2_INIT_SYSTEMD),y)
+NETWORK_MANAGER_DEPENDENCIES += libgudev
+endif
+
# uClibc by default doesn't have backtrace support, so don't use it
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd
2015-08-24 15:44 ` [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd Nathaniel Roach
@ 2015-08-25 18:49 ` Thomas Petazzoni
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2015-08-25 18:49 UTC (permalink / raw)
To: buildroot
Dear Nathaniel Roach,
On Mon, 24 Aug 2015 23:44:15 +0800, Nathaniel Roach wrote:
> NetworkManager uses code (originally from udev) that has since
> been split from the main systemd codebase into libgudev.
>
> Tweak the package files for NetworkManager to require libgudev
> when building with systemd.
>
> Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
> ---
> package/network-manager/Config.in | 1 +
> package/network-manager/network-manager.mk | 4 ++++
> 2 files changed, 5 insertions(+)
I've removed the tabs in the second lines of each paragraph in the
commit log, and applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] package/libmbim: Now needs libgudev under systemd
2015-08-24 15:44 [Buildroot] [PATCH 1/3] [v3] libgudev: New package Nathaniel Roach
2015-08-24 15:44 ` [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd Nathaniel Roach
@ 2015-08-24 15:44 ` Nathaniel Roach
2015-08-25 5:56 ` Yegor Yefremov
2015-08-25 18:49 ` Thomas Petazzoni
2015-08-25 5:56 ` [Buildroot] [PATCH 1/3] [v3] libgudev: New package Yegor Yefremov
2015-08-25 18:48 ` Thomas Petazzoni
3 siblings, 2 replies; 8+ messages in thread
From: Nathaniel Roach @ 2015-08-24 15:44 UTC (permalink / raw)
To: buildroot
libmbim uses code (originally from udev) that has since
been split from the main systemd codebase into libgudev.
Fixes: http://autobuild.buildroot.org/results/638/638dbf05b785a276a33983b0237b7cad54777b85/
Tweak the package files for libmbim to require libgudev
when building with systemd.
Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
---
package/libmbim/Config.in | 1 +
package/libmbim/libmbim.mk | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/package/libmbim/Config.in b/package/libmbim/Config.in
index bd34dd4..e79d51f 100644
--- a/package/libmbim/Config.in
+++ b/package/libmbim/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBMBIM
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_PACKAGE_HAS_UDEV
+ select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
select BR2_PACKAGE_LIBGLIB2
help
libmbim is a glib-based library for talking to WWAN modems and
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
index 8d49f28..cfba08e 100644
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -13,6 +13,10 @@ LIBMBIM_INSTALL_STAGING = YES
LIBMBIM_DEPENDENCIES = libglib2 udev
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LIBMBIM_DEPENDENCIES += libgudev
+endif
+
# we don't want -Werror
LIBMBIM_CONF_OPTS = --enable-more-warnings=no
--
2.5.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] package/libmbim: Now needs libgudev under systemd
2015-08-24 15:44 ` [Buildroot] [PATCH 3/3] package/libmbim: " Nathaniel Roach
@ 2015-08-25 5:56 ` Yegor Yefremov
2015-08-25 18:49 ` Thomas Petazzoni
1 sibling, 0 replies; 8+ messages in thread
From: Yegor Yefremov @ 2015-08-25 5:56 UTC (permalink / raw)
To: buildroot
On Mon, Aug 24, 2015 at 5:44 PM, Nathaniel Roach <nroach44@gmail.com> wrote:
> libmbim uses code (originally from udev) that has since
> been split from the main systemd codebase into libgudev.
>
> Fixes: http://autobuild.buildroot.org/results/638/638dbf05b785a276a33983b0237b7cad54777b85/
>
> Tweak the package files for libmbim to require libgudev
> when building with systemd.
>
> Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/libmbim/Config.in | 1 +
> package/libmbim/libmbim.mk | 4 ++++
> 2 files changed, 5 insertions(+)
>
> diff --git a/package/libmbim/Config.in b/package/libmbim/Config.in
> index bd34dd4..e79d51f 100644
> --- a/package/libmbim/Config.in
> +++ b/package/libmbim/Config.in
> @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBMBIM
> depends on BR2_USE_WCHAR # libglib2
> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> depends on BR2_PACKAGE_HAS_UDEV
> + select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
> select BR2_PACKAGE_LIBGLIB2
> help
> libmbim is a glib-based library for talking to WWAN modems and
> diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
> index 8d49f28..cfba08e 100644
> --- a/package/libmbim/libmbim.mk
> +++ b/package/libmbim/libmbim.mk
> @@ -13,6 +13,10 @@ LIBMBIM_INSTALL_STAGING = YES
>
> LIBMBIM_DEPENDENCIES = libglib2 udev
>
> +ifeq ($(BR2_INIT_SYSTEMD),y)
> +LIBMBIM_DEPENDENCIES += libgudev
> +endif
> +
> # we don't want -Werror
> LIBMBIM_CONF_OPTS = --enable-more-warnings=no
>
> --
> 2.5.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/3] package/libmbim: Now needs libgudev under systemd
2015-08-24 15:44 ` [Buildroot] [PATCH 3/3] package/libmbim: " Nathaniel Roach
2015-08-25 5:56 ` Yegor Yefremov
@ 2015-08-25 18:49 ` Thomas Petazzoni
1 sibling, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2015-08-25 18:49 UTC (permalink / raw)
To: buildroot
Dear Nathaniel Roach,
On Mon, 24 Aug 2015 23:44:16 +0800, Nathaniel Roach wrote:
> libmbim uses code (originally from udev) that has since
> been split from the main systemd codebase into libgudev.
>
> Fixes: http://autobuild.buildroot.org/results/638/638dbf05b785a276a33983b0237b7cad54777b85/
>
> Tweak the package files for libmbim to require libgudev
> when building with systemd.
>
> Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
> ---
> package/libmbim/Config.in | 1 +
> package/libmbim/libmbim.mk | 4 ++++
> 2 files changed, 5 insertions(+)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/3] [v3] libgudev: New package
2015-08-24 15:44 [Buildroot] [PATCH 1/3] [v3] libgudev: New package Nathaniel Roach
2015-08-24 15:44 ` [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd Nathaniel Roach
2015-08-24 15:44 ` [Buildroot] [PATCH 3/3] package/libmbim: " Nathaniel Roach
@ 2015-08-25 5:56 ` Yegor Yefremov
2015-08-25 18:48 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Yegor Yefremov @ 2015-08-25 5:56 UTC (permalink / raw)
To: buildroot
On Mon, Aug 24, 2015 at 5:44 PM, Nathaniel Roach <nroach44@gmail.com> wrote:
> As libgudev recently was split from the main systemd/udev source,
> this library is now required to build certain packages.
>
> This library is only relevant to systemd, as the code it contains
> is still contained in eudev.
>
> Add the package and tweak systemd's Config.in message accordingly.
>
> ---
> Changes v2 -> v3
> (Changes as suggested by Yann E. MORIN)
> - Separate libgudev and network-manager portions into
> discrete patches, and a new patch for libmbim
>
> Changes v1 -> v2
> (Changes as suggested by Peter Korsgaard)
> - Added the toolchain dependencies
> - Dropped NM references in package
> - Added _LICENSE_FILEs
> - Conditionally depend on libgudev in NM if using systemd
>
> Signed-off-by: Nathaniel Roach <nroach44@gmail.com>
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/Config.in | 1 +
> package/libgudev/Config.in | 19 +++++++++++++++++++
> package/libgudev/libgudev.mk | 17 +++++++++++++++++
> package/systemd/Config.in | 1 -
> 4 files changed, 37 insertions(+), 1 deletion(-)
> create mode 100644 package/libgudev/Config.in
> create mode 100644 package/libgudev/libgudev.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 47d14d7..6494322 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -852,6 +852,7 @@ menu "Hardware handling"
> source "package/libfreefare/Config.in"
> source "package/libftdi/Config.in"
> source "package/libftdi1/Config.in"
> + source "package/libgudev/Config.in"
> source "package/libhid/Config.in"
> source "package/libiio/Config.in"
> source "package/libinput/Config.in"
> diff --git a/package/libgudev/Config.in b/package/libgudev/Config.in
> new file mode 100644
> index 0000000..8cdd9f6
> --- /dev/null
> +++ b/package/libgudev/Config.in
> @@ -0,0 +1,19 @@
> +config BR2_PACKAGE_LIBGUDEV
> + bool "libgudev"
> + depends on BR2_INIT_SYSTEMD
> + depends on BR2_USE_WCHAR # gettext
> + depends on BR2_TOOLCHAIN_HAS_THREADS
> + depends on BR2_USE_MMU # fork()
> + select BR2_PACKAGE_LIBGLIB2
> + help
> + This library provides GObject bindings for libudev.
> + It was originally part of udev-extras, then udev, then systemd.
> + It's now a project on its own.
> + Required for building some programs that use udev, when using
> + systemd.
> +
> + https://wiki.gnome.org/Projects/libgudev
> +
> +comment "libgudev needs a toolchain w/ wchar, threads, and systemd"
> + depends on BR2_USE_MMU
> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INIT_SYSTEMD
> diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk
> new file mode 100644
> index 0000000..fa15b56
> --- /dev/null
> +++ b/package/libgudev/libgudev.mk
> @@ -0,0 +1,17 @@
> +################################################################################
> +#
> +# libgudev
> +#
> +################################################################################
> +
> +LIBGUDEV_VERSION = 230
> +LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz
> +LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION)
> +LIBGUDEV_INSTALL_STAGING = YES
> +
> +LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2
> +
> +LIBGUDEV_LICENSE = GPLv2+
> +LIBGUDEV_LICENSE_FILES = COPYING
> +
> +$(eval $(autotools-package))
> diff --git a/package/systemd/Config.in b/package/systemd/Config.in
> index 510badd..f7fc3bb 100644
> --- a/package/systemd/Config.in
> +++ b/package/systemd/Config.in
> @@ -55,7 +55,6 @@ config BR2_PACKAGE_SYSTEMD
>
> The selection of other packages will enable some features:
>
> - - libglib2 package will add support for gudev.
> - acl package will add support for multi-seat.
>
> http://freedesktop.org/wiki/Software/systemd
> --
> 2.5.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/3] [v3] libgudev: New package
2015-08-24 15:44 [Buildroot] [PATCH 1/3] [v3] libgudev: New package Nathaniel Roach
` (2 preceding siblings ...)
2015-08-25 5:56 ` [Buildroot] [PATCH 1/3] [v3] libgudev: New package Yegor Yefremov
@ 2015-08-25 18:48 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2015-08-25 18:48 UTC (permalink / raw)
To: buildroot
Nathaniel,
On Mon, 24 Aug 2015 23:44:14 +0800, Nathaniel Roach wrote:
> As libgudev recently was split from the main systemd/udev source,
> this library is now required to build certain packages.
>
> This library is only relevant to systemd, as the code it contains
> is still contained in eudev.
>
> Add the package and tweak systemd's Config.in message accordingly.
>
> ---
> Changes v2 -> v3
> (Changes as suggested by Yann E. MORIN)
> - Separate libgudev and network-manager portions into
> discrete patches, and a new patch for libmbim
Applied after doing a few changes:
[Thomas:
- don't show the dependency comment when systemd is not available,
since libgudev is anyway useless when you're not using systemd.
- fix the license, it's LGPLv2.1+ and not GPLv2+
- remove useless empty lines in the .mk file.]
In addition to this, two comments:
* Your SoB line should be before the first "---". Otherwise, it gets
removed by git when applying the patch (anything after the first
"---" gets ignored by git in terms of commit log)
* Don't indent the second line of paragraphs with a tab, we don't do
this in general for Buildroot commit logs.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-08-25 18:49 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-24 15:44 [Buildroot] [PATCH 1/3] [v3] libgudev: New package Nathaniel Roach
2015-08-24 15:44 ` [Buildroot] [PATCH 2/3] package/network-manager: Now needs libgudev under systemd Nathaniel Roach
2015-08-25 18:49 ` Thomas Petazzoni
2015-08-24 15:44 ` [Buildroot] [PATCH 3/3] package/libmbim: " Nathaniel Roach
2015-08-25 5:56 ` Yegor Yefremov
2015-08-25 18:49 ` Thomas Petazzoni
2015-08-25 5:56 ` [Buildroot] [PATCH 1/3] [v3] libgudev: New package Yegor Yefremov
2015-08-25 18:48 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox