Message ID | 1358546927-25707-6-git-send-email-marek.belisko@open-nandra.com |
---|---|
State | Accepted |
Headers | show |
Hi, Any objections to this patch? On Fri, Jan 18, 2013 at 11:08 PM, Marek Belisko <marek.belisko@open-nandra.com> wrote: > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> > --- > package/Config.in | 1 + > package/udisks/Config.in | 32 ++++++++++++++++++++++++++++++++ > package/udisks/udisks.mk | 28 ++++++++++++++++++++++++++++ > 3 files changed, 61 insertions(+) > create mode 100644 package/udisks/Config.in > create mode 100644 package/udisks/udisks.mk > > diff --git a/package/Config.in b/package/Config.in > index 7201d1d..d3e3c44 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -271,6 +271,7 @@ source "package/sysstat/Config.in" > source "package/ti-utils/Config.in" > source "package/uboot-tools/Config.in" > source "package/udev/Config.in" > +source "package/udisks/Config.in" > source "package/usb_modeswitch/Config.in" > source "package/usb_modeswitch_data/Config.in" > source "package/usbmount/Config.in" > diff --git a/package/udisks/Config.in b/package/udisks/Config.in > new file mode 100644 > index 0000000..1637199 > --- /dev/null > +++ b/package/udisks/Config.in > @@ -0,0 +1,32 @@ > +config BR2_PACKAGE_UDISKS > + bool "udisks" > + depends on BR2_PACKAGE_UDEV > + depends on BR2_PACKAGE_DBUS > + select BR2_PACKAGE_SG3_UTILS > + select BR2_PACKAGE_UDEV_ALL_EXTRAS > + select BR2_PACKAGE_DBUS_GLIB > + select BR2_PACKAGE_POLKIT > + select BR2_PACKAGE_PARTED > + select BR2_PACKAGE_LVM2 > + select BR2_PACKAGE_LIBATASMART > + help > + The udisks project provides > + > + o A storage daemon that implements well-defined D-Bus > + interfaces that can be used to query and manipulate > + storage devices. > + > + o a command-line tool, udisks(1), that can be used to query > + and use the daemon > + > + http://www.freedesktop.org/wiki/Software/udisks > + > +config BR2_PACKAGE_UDISKS_LVM2 > + bool "lvm2 support" > + depends on BR2_PACKAGE_UDISKS > + default n > + help > + With LVM2 support. > + > +comment "udisks requires udev and dbus to be enabled" > + depends on !BR2_PACKAGE_UDEV || !BR2_PACKAGE_DBUS > diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk > new file mode 100644 > index 0000000..19f9da4 > --- /dev/null > +++ b/package/udisks/udisks.mk > @@ -0,0 +1,28 @@ > +############################################################# > +# > +# udisks > +# > +############################################################# > +UDISKS_VERSION = 1.0.4 > +UDISKS_SITE = http://hal.freedesktop.org/releases/ > +UDISKS_LICENCE = GPLv2+ > +UDISKS_LICENCE_FILES = COPYING > + > +UDISKS_DEPENDENCIES = \ > + sg3_utils \ > + host-pkgconf \ > + udev \ > + dbus \ > + dbus-glib \ > + polkit \ > + parted \ > + lvm2 \ > + libatasmart > + > +UDISKS_CONF_OPT = --disable-remote-access --disable-gtk-doc > + > +ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) > +UDISKS_CONF_OPT += --enable-lvm2 > +endif > + > +$(eval $(autotools-package)) > -- > 1.7.10.4 > marek
>>>>> "Marek" == Marek Belisko <marek.belisko@open-nandra.com> writes:
Marek> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Marek> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Marek> ---
Marek> package/Config.in | 1 +
Marek> package/udisks/Config.in | 32 ++++++++++++++++++++++++++++++++
Marek> package/udisks/udisks.mk | 28 ++++++++++++++++++++++++++++
Marek> 3 files changed, 61 insertions(+)
Marek> create mode 100644 package/udisks/Config.in
Marek> create mode 100644 package/udisks/udisks.mk
Marek> diff --git a/package/Config.in b/package/Config.in
Marek> index 7201d1d..d3e3c44 100644
Marek> --- a/package/Config.in
Marek> +++ b/package/Config.in
Marek> @@ -271,6 +271,7 @@ source "package/sysstat/Config.in"
Marek> source "package/ti-utils/Config.in"
Marek> source "package/uboot-tools/Config.in"
Marek> source "package/udev/Config.in"
Marek> +source "package/udisks/Config.in"
Marek> source "package/usb_modeswitch/Config.in"
Marek> source "package/usb_modeswitch_data/Config.in"
Marek> source "package/usbmount/Config.in"
Marek> diff --git a/package/udisks/Config.in b/package/udisks/Config.in
Marek> new file mode 100644
Marek> index 0000000..1637199
Marek> --- /dev/null
Marek> +++ b/package/udisks/Config.in
Marek> @@ -0,0 +1,32 @@
Marek> +config BR2_PACKAGE_UDISKS
Marek> + bool "udisks"
Marek> + depends on BR2_PACKAGE_UDEV
Marek> + depends on BR2_PACKAGE_DBUS
It makes more sense to use the BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
symbol like udev does.
dbus can be selected like a normal library these days, so I've changed
it to use that and reordered the lines.
Marek> + select BR2_PACKAGE_SG3_UTILS
Marek> + select BR2_PACKAGE_UDEV_ALL_EXTRAS
Marek> + select BR2_PACKAGE_DBUS_GLIB
Marek> + select BR2_PACKAGE_POLKIT
Marek> + select BR2_PACKAGE_PARTED
Marek> + select BR2_PACKAGE_LVM2
Marek> + select BR2_PACKAGE_LIBATASMART
Marek> + help
Marek> + The udisks project provides
Marek> +
Marek> + o A storage daemon that implements well-defined D-Bus
Marek> + interfaces that can be used to query and manipulate
Marek> + storage devices.
Marek> +
Marek> + o a command-line tool, udisks(1), that can be used to query
Marek> + and use the daemon
Marek> +
Marek> + http://www.freedesktop.org/wiki/Software/udisks
Marek> +
Marek> +config BR2_PACKAGE_UDISKS_LVM2
Marek> + bool "lvm2 support"
Marek> + depends on BR2_PACKAGE_UDISKS
Marek> + default n
'n' is default anyway, so this is not needed.
You forgot to select BR2_PACKAGE_LVM2_APP_LIBRARY, so I've added that.
Marek> + help
Marek> + With LVM2 support.
Marek> +
Marek> +comment "udisks requires udev and dbus to be enabled"
Marek> + depends on !BR2_PACKAGE_UDEV || !BR2_PACKAGE_DBUS
And adjusted the comment.
Committed with these fixes, thanks.
diff --git a/package/Config.in b/package/Config.in index 7201d1d..d3e3c44 100644 --- a/package/Config.in +++ b/package/Config.in @@ -271,6 +271,7 @@ source "package/sysstat/Config.in" source "package/ti-utils/Config.in" source "package/uboot-tools/Config.in" source "package/udev/Config.in" +source "package/udisks/Config.in" source "package/usb_modeswitch/Config.in" source "package/usb_modeswitch_data/Config.in" source "package/usbmount/Config.in" diff --git a/package/udisks/Config.in b/package/udisks/Config.in new file mode 100644 index 0000000..1637199 --- /dev/null +++ b/package/udisks/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_UDISKS + bool "udisks" + depends on BR2_PACKAGE_UDEV + depends on BR2_PACKAGE_DBUS + select BR2_PACKAGE_SG3_UTILS + select BR2_PACKAGE_UDEV_ALL_EXTRAS + select BR2_PACKAGE_DBUS_GLIB + select BR2_PACKAGE_POLKIT + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LIBATASMART + help + The udisks project provides + + o A storage daemon that implements well-defined D-Bus + interfaces that can be used to query and manipulate + storage devices. + + o a command-line tool, udisks(1), that can be used to query + and use the daemon + + http://www.freedesktop.org/wiki/Software/udisks + +config BR2_PACKAGE_UDISKS_LVM2 + bool "lvm2 support" + depends on BR2_PACKAGE_UDISKS + default n + help + With LVM2 support. + +comment "udisks requires udev and dbus to be enabled" + depends on !BR2_PACKAGE_UDEV || !BR2_PACKAGE_DBUS diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk new file mode 100644 index 0000000..19f9da4 --- /dev/null +++ b/package/udisks/udisks.mk @@ -0,0 +1,28 @@ +############################################################# +# +# udisks +# +############################################################# +UDISKS_VERSION = 1.0.4 +UDISKS_SITE = http://hal.freedesktop.org/releases/ +UDISKS_LICENCE = GPLv2+ +UDISKS_LICENCE_FILES = COPYING + +UDISKS_DEPENDENCIES = \ + sg3_utils \ + host-pkgconf \ + udev \ + dbus \ + dbus-glib \ + polkit \ + parted \ + lvm2 \ + libatasmart + +UDISKS_CONF_OPT = --disable-remote-access --disable-gtk-doc + +ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) +UDISKS_CONF_OPT += --enable-lvm2 +endif + +$(eval $(autotools-package))