Add support for udisks package.
v2 cover Add support for udisks package.
Changes from v1:
- fix various problems in sg3_utils and polkit packages (Thomas Petazzoni)
This patches add support for udisks and dependencies + fixes.
Patches for sg3_utils, polkit and udisks was done by Thomas Petazzoni and overtaken from
http://free-electrons.com/~thomas/pub/udisks-buildroot/.
They were fixed to work with latest buildroot.
udisks with lvm2 support (default n) have dependency on devmapper and lvm2 application library. There are two fixes:
- correctly install devmapper.pc to staging/target
- add support for application library
Marek Belisko (6):
sg3_utils: new package
polkit: new package
libatasmart: new package.
lvm2: Install devmapper.pc to staging/target pkgconfig directory.
lvm2: Compile and install application library.
udisks: new package
package/Config.in | 5 +++++ package/libatasmart/Config.in | 11 +++++++++++ package/libatasmart/libatasmart.mk | 17 +++++++++++++++++ package/lvm2/Config.in | 6 ++++++ package/lvm2/lvm2.mk | 8 +++++++- package/polkit/Config.in | 10 ++++++++++ package/polkit/polkit.mk | 20 ++++++++++++++++++++ package/sg3_utils/Config.in | 15 +++++++++++++++ package/sg3_utils/sg3_utils.mk | 35 +++++++++++++++++++++++++++++++++++ package/udisks/Config.in | 32 ++++++++++++++++++++++++++++++++ package/udisks/udisks.mk | 28 ++++++++++++++++++++++++++++ 11 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 package/libatasmart/Config.in create mode 100644 package/libatasmart/libatasmart.mk create mode 100644 package/polkit/Config.in create mode 100644 package/polkit/polkit.mk create mode 100644 package/sg3_utils/Config.in create mode 100644 package/sg3_utils/sg3_utils.mk create mode 100644 package/udisks/Config.in create mode 100644 package/udisks/udisks.mk
Signature · 1 line
1.7.10.4
PATCH v2 1/6 sg3_utils: new package
--- package/Config.in | 1 + package/sg3_utils/Config.in | 15 +++++++++++++++ package/sg3_utils/sg3_utils.mk | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 package/sg3_utils/Config.in create mode 100644 package/sg3_utils/sg3_utils.mk
package/Config.in +1 -0
@@ -261,6 +261,7 @@ source "package/rpi-userland/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/setserial/Config.in" +source "package/sg3_utils/Config.in" source "package/smartmontools/Config.in" source "package/snowball-hdmiservice/Config.in" source "package/sredird/Config.in"
package/sg3_utils/Config.in new file +15 -0
@@ -0,0 +1,15 @@ +config BR2_PACKAGE_SG3_UTILS + bool "sgutils" + depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Low level utilities for devices that use a SCSI command set. + + http://sg.danny.cz/sg/sg3_utils.html + +config BR2_PACKAGE_SG3_UTILS_PROGS + bool "install programs" + depends on BR2_PACKAGE_SG3_UTILS + +comment "sgutils requires a toolchain with LARGEFILE and threads support" + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
package/sg3_utils/sg3_utils.mk new file +35 -0
@@ -0,0 +1,35 @@ +############################################################# +# +# sg3_utils +# +############################################################# +SG3_UTILS_VERSION = 1.34 +SG3_UTILS_SITE = http://sg.danny.cz/sg/p/ +SG3_UTILS_LICENSE = BSD GPL +SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE + +# install the libsgutils2 library +SG3_UTILS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) +define SG3_UTILS_REMOVE_PROGS + for prog in \ + dd decode_sense emc_trespass format get_config \ + get_lba_status ident inq logs luns map26 \ + map sgm_dd modes opcodes sgp_dd persist prevent \ + raw rbuf rdac read readcap read_block_limits \ + read_buffer read_long reassign referrals \ + requests reset rmsn rtpg safte sanitize \ + sat_identify sat_phy_event sat_set_features scan \ + senddiag ses start stpg sync test_rwbuf turs \ + unmap verify vpd write_buffer write_long \ + write_same wr_mode ; do \ + $(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \ + done + $(RM) $(TARGET_DIR)/usr/bin/sginfo +endef + +SG3_UTILS_POST_INSTALL_TARGET_HOOKS += SG3_UTILS_REMOVE_PROGS +endif + +$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
PATCH v2 1/6 sg3_utils: new package
Dear Marek Belisko,
package/sg3_utils/Config.in line 7
Quoted 7 lines · Marek Belisko
package/sg3_utils/Config.in new file +7
-0+config BR2_PACKAGE_SG3_UTILS + bool "sgutils" + depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Low level utilities for devices that use a SCSI command set. +
You should mention here that this option only installs the library (libraries?), but not the programs.
Quoted 1 line
+SG3_UTILS_LICENSE = BSD GPL
You should be work specific than just BSD and GPL. Like BSD-3c or BSD-4c, GPLv2, GPLv2+, GPLv3, GPLv3+, etc.
Otherwise, looks good.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 1/6 sg3_utils: new package
Hi Thomas,
Quoted 4 lines · Thomas Petazzoni
Dear Marek Belisko,
On Mon, 7 Jan 2013 21:43:14 +0100, Marek Belisko wrote:
Quoted 10 lines
package/sg3_utils/Config.in line 7
Quoted 7 lines
package/sg3_utils/Config.in new file +7
-0+config BR2_PACKAGE_SG3_UTILS + bool "sgutils" + depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Low level utilities for devices that use a SCSI command set. +You should mention here that this option only installs the library (libraries?), but not the programs.
OK.
Quoted 5 lines
Quoted 2 lines
+SG3_UTILS_LICENSE = BSD GPL
You should be work specific than just BSD and GPL. Like BSD-3c or BSD-4c, GPLv2, GPLv2+, GPLv3, GPLv3+, etc.
After proper reading of COPYING file it seems it GPLv2+ "Some of the older utilities are covered by the GPL. More precisely:
You are free to distribute this software under the terms of the GNU General Public License either version 2, or (at your option) any later version." but in same file there is no mention about BSD license version.
Quoted 9 lines
Otherwise, looks good.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Thanks,
mbe
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 1/6 sg3_utils: new package
Dear Belisko Marek,
Quoted 8 lines · Belisko Marek
Quoted 2 lines
You should be work specific than just BSD and GPL. Like BSD-3c or BSD-4c, GPLv2, GPLv2+, GPLv3, GPLv3+, etc.
After proper reading of COPYING file it seems it GPLv2+ "Some of the older utilities are covered by the GPL. More precisely:
You are free to distribute this software under the terms of the GNU General Public License either version 2, or (at your option) any later version." but in same file there is no mention about BSD license version.
There is a BSD_LICENSE file that contains a BSD three clause license, so I would say:
SG3_UTILS_LICENSE = GPLv2+ BSD-3c SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 1/6 sg3_utils: new package
Thomas, Belisko, All,
Quoted 11 lines · On Monday 07 January 2013 Thomas Petazzoni wrote:
Quoted 8 lines · Belisko Marek
Quoted 2 lines
You should be work specific than just BSD and GPL. Like BSD-3c or BSD-4c, GPLv2, GPLv2+, GPLv3, GPLv3+, etc.
After proper reading of COPYING file it seems it GPLv2+ "Some of the older utilities are covered by the GPL. More precisely:
You are free to distribute this software under the terms of the GNU General Public License either version 2, or (at your option) any later version." but in same file there is no mention about BSD license version.There is a
BSD_LICENSEfile that contains a BSD three clause license,
Actually, what matters in the content of the source files. Do some of them refer to either license?
- if the files only refer to GPLv2+, then the BSD-3c does not apply,
- if the files only refer to BSD-3c, then the GPLv2+ does not apply,
- if some file refer to one or two of the licenses, then both apply.
(/me likes how he managed to line up the above! ;-) )
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/6 sg3_utils: new package
Quoted 13 lines · Yann E. MORIN
Thomas, Belisko, All,
Quoted 10 lines · On Monday 07 January 2013 Thomas Petazzoni wrote:
Quoted 8 lines · Belisko Marek
Quoted 2 lines
You should be work specific than just BSD and GPL. Like BSD-3c or BSD-4c, GPLv2, GPLv2+, GPLv3, GPLv3+, etc.
After proper reading of COPYING file it seems it GPLv2+ "Some of the older utilities are covered by the GPL. More precisely:
You are free to distribute this software under the terms of the GNU General Public License either version 2, or (at your option) any later version." but in same file there is no mention about BSD license version.
Quoted 7 lines
Quoted 1 line
There is a
BSD_LICENSEfile that contains a BSD three clause license,Actually, what matters in the content of the source files. Do some of them refer to either license?
- if the files only refer to GPLv2+, then the BSD-3c does not apply,
- if the files only refer to BSD-3c, then the GPLv2+ does not apply,
- if some file refer to one or two of the licenses, then both apply.
- if all files refer to GPLv2+ and BSD-3c, then either applies.
Putting GPLv2+ BSD-3c implies that parts are GPLv2+, other parts and BSD-3c. But it's also possible (and likely) that either applies. BTW, it's not possible that both apply because they have conflicting terms.
Regards,
Arnout
Quoted 6 lines
(/me likes how he managed to line up the above! ;-) )
Regards,
Yann E. MORIN.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 1/6 sg3_utils: new package
Hi Arnout, All,
Quoted 29 lines · Arnout Vandecappelle
Quoted 18 lines · Yann E. MORIN
Thomas, Belisko, All,
Quoted 14 lines · On Monday 07 January 2013 Thomas Petazzoni wrote:
Quoted 10 lines · Belisko Marek
Quoted 3 lines
You should be work specific than just BSD and GPL. Like BSD-3c or BSD-4c, GPLv2, GPLv2+, GPLv3, GPLv3+, etc.
After proper reading of COPYING file it seems it GPLv2+ "Some of the older utilities are covered by the GPL. More precisely:
You are free to distribute this software under the terms of the GNU General Public License either version 2, or (at your option) any later version." but in same file there is no mention about BSD license version.Quoted 8 lines
Quoted 1 line
There is a
BSD_LICENSEfile that contains a BSD three clause license,Actually, what matters in the content of the source files. Do some of them refer to either license?
- if the files only refer to GPLv2+, then the BSD-3c does not apply,
- if the files only refer to BSD-3c, then the GPLv2+ does not apply,
- if some file refer to one or two of the licenses, then both apply.
Quoted 5 lines
- if all files refer to GPLv2+ and BSD-3c, then either applies.
Putting GPLv2+ BSD-3c implies that parts are GPLv2+, other parts and BSD-3c. But it's also possible (and likely) that either applies. BTW, it's not possible that both apply because they have conflicting terms.
Hmm what then should be in SG3_UTILS_LICENSE? I've checked files and some of them are BSD some GPLv2.
Quoted 20 lines
Regards,
ArnoutQuoted 6 lines
(/me likes how he managed to line up the above! ;-) )
Regards,
Yann E. MORIN.--
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Thanks,
marek
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 1/6 sg3_utils: new package
Belisko, Arnout, All,
Quoted 9 lines · On Tuesday 15 January 2013 Belisko Marek wrote:
Quoted 8 lines · Arnout Vandecappelle
Quoted 5 lines · Yann E. MORIN
Actually, what matters in the content of the source files. Do some of them refer to either license?
- if the files only refer to GPLv2+, then the BSD-3c does not apply,
- if the files only refer to BSD-3c, then the GPLv2+ does not apply,
- if some file refer to one or two of the licenses, then both apply.
Quoted 5 lines
Quoted 5 lines
- if all files refer to GPLv2+ and BSD-3c, then either applies.
Putting GPLv2+ BSD-3c implies that parts are GPLv2+, other parts and BSD-3c. But it's also possible (and likely) that either applies. BTW, it's not possible that both apply because they have conflicting terms.
Yes, the BSD-3c *is* compatible with the GPLv2. See:
http://directory.fsf.org/wiki/License:BSD_3Clause
Quoted 2 lines
Hmm what then should be in
SG3_UTILS_LICENSE? I've checked files and some of them are BSD some GPLv2.
Assuming that the libraries are dual-licensed LGPLv2.1+ / BSD-3c, and the programs are dual-licensed GPLv2+ / BSD-3c, I'd do something like:
SG3_UTILS_LICENCE = LGPLv2.1+ BSD-3c
ifneq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)SG3_UTILS_LICENCE += GPLV2+ BSD-3c
endif
Adapt to the real situation, of course.
Keep in minf that we try to keep the legal-info stuff correct, but we only advertise it as a non-authoritative status, and it is the responsibility of the person/entity that distributes the firmware to check the legal-info for correctness.
I think we should make that crystal-clear when generating the legal-info, so there is no ambiguity.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/6 sg3_utils: new package
Hi Yann, All,
Quoted 24 lines · Yann E. MORIN
Belisko, Arnout, All,
Quoted 9 lines · On Tuesday 15 January 2013 Belisko Marek wrote:
Quoted 8 lines · Arnout Vandecappelle
Quoted 5 lines · Yann E. MORIN
Actually, what matters in the content of the source files. Do some of them refer to either license?
- if the files only refer to GPLv2+, then the BSD-3c does not apply,
- if the files only refer to BSD-3c, then the GPLv2+ does not apply,
- if some file refer to one or two of the licenses, then both apply.Quoted 5 lines
Quoted 5 lines
- if all files refer to GPLv2+ and BSD-3c, then either applies.
Putting GPLv2+ BSD-3c implies that parts are GPLv2+, other parts and BSD-3c. But it's also possible (and likely) that either applies. BTW, it's not possible that both apply because they have conflicting terms.
Yes, the BSD-3c *is* compatible with the GPLv2. See:
http://directory.fsf.org/wiki/License:BSD_3ClauseQuoted 2 lines
Hmm what then should be in
SG3_UTILS_LICENSE? I've checked files and some of them are BSD some GPLv2.
Quoted 7 lines
Assuming that the libraries are dual-licensed LGPLv2.1+ / BSD-3c, and the programs are dual-licensed GPLv2+ / BSD-3c, I'd do something like:
SG3_UTILS_LICENCE= LGPLv2.1+ BSD-3c
ifneq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)SG3_UTILS_LICENCE+= GPLV2+ BSD-3c
endif
It's bit complicated. All library files are BSD only but utils files are mixed (BSD + GPLv2).
Quoted 14 lines
Adapt to the real situation, of course.
Keep in minf that we try to keep the legal-info stuff correct, but we only advertise it as a non-authoritative status, and it is the responsibility of the person/entity that distributes the firmware to check the legal-info for correctness.
I think we should make that crystal-clear when generating the legal-info, so there is no ambiguity.
Regards,
Yann E. MORIN.
Quoted 8 lines
--
.-----------------.--------------------.------------------.--------------------.| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |'------------------------------^-------^------------------^--------------------'
Cheers,
marek
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 1/6 sg3_utils: new package
Belisko, All,
Quoted 7 lines · On Tuesday 15 January 2013 Belisko Marek wrote:
Quoted 4 lines · Yann E. MORIN
SG3_UTILS_LICENCE= LGPLv2.1+ BSD-3c
ifneq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)SG3_UTILS_LICENCE+= GPLV2+ BSD-3c
endifIt's bit complicated. All library files are BSD only but utils files are mixed (BSD + GPLv2).
Then:
SG3_UTILS_LICENSE = BSD-3c
ifneq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)SG3_UTILS_LICENSE += GPLV2+
endif
(Note: LICENSE with a 'S', not LICENCE, my bad...)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/6 sg3_utils: new package
Quoted 11 lines · Yann E. MORIN
Belisko, All,
Quoted 7 lines · On Tuesday 15 January 2013 Belisko Marek wrote:
Quoted 4 lines · Yann E. MORIN
SG3_UTILS_LICENCE= LGPLv2.1+ BSD-3c
ifneq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)SG3_UTILS_LICENCE+= GPLV2+ BSD-3c
endifIt's bit complicated. All library files are BSD only but utils files are mixed (BSD + GPLv2).
Quoted 6 lines
Then:
SG3_UTILS_LICENSE= BSD-3c
ifneq ($(BR2_PACKAGE_SG3_UTILS_PROGS),)SG3_UTILS_LICENSE+= GPLV2+
endif
Agreed.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 2/6 polkit: new package
In reply to Marek Belisko--- package/Config.in | 1 + package/polkit/Config.in | 10 ++++++++++ package/polkit/polkit.mk | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 package/polkit/Config.in create mode 100644 package/polkit/polkit.mk
package/Config.in +1 -0
@@ -761,6 +761,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/module-init-tools/Config.in" endif source "package/monit/Config.in" +source "package/polkit/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/procps/Config.in" source "package/psmisc/Config.in"
package/polkit/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_POLKIT + bool "polkit" + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_EXPAT + help + PolicyKit is a toolkit for defining and handling + authorizations. It is used for allowing unprivileged + processes to speak to privileged processes. + + http://www.freedesktop.org/wiki/Software/polkit
package/polkit/polkit.mk new file +20 -0
@@ -0,0 +1,20 @@ +############################################################# +# +# polkit +# +############################################################# +POLKIT_VERSION = 0.103 +POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases/ +POLKIT_LICENCE = GPL +POLKIT_LICENCE_FILES = COPYING + +POLKIT_INSTALL_STAGING = YES + +POLKIT_DEPENDENCIES = libglib2 host-intltool expat + +# We could also support --with-authfw=pam +POLKIT_CONF_OPT = \ + --with-authfw=shadow \ + --with-os-type=unknown + +$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
PATCH v2 2/6 polkit: new package
Dear Marek Belisko,
Quoted 1 line · Marek Belisko
+POLKIT_LICENCE = GPL
LICENSE, not LICENCE. And be more specific than GPL.
Quoted 1 line
+POLKIT_LICENCE_FILES = COPYING
LICENSE_FILES.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 2/6 polkit: new package
In reply to Marek BeliskoDear Marek Belisko,
package/polkit/Config.in line 4
Quoted 2 lines · Marek Belisko
package/polkit/Config.in new file +2
-0+ select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_EXPAT
You should have:
depends on BR2_USE_WCHAR # gettext
here, because libglib2 has this dependency.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 3/6 libatasmart: new package.
In reply to Marek Belisko--- package/Config.in | 2 ++ package/libatasmart/Config.in | 11 +++++++++++ package/libatasmart/libatasmart.mk | 17 +++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 package/libatasmart/Config.in create mode 100644 package/libatasmart/libatasmart.mk
package/Config.in +2 -0
@@ -239,6 +239,8 @@ source "package/iostat/Config.in" source "package/irda-utils/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" +source "package/libatasmart/Config.in" +source "package/linux-firmware/Config.in" source "package/lm-sensors/Config.in" source "package/lshw/Config.in" source "package/lsuio/Config.in"
package/libatasmart/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBATASMART + bool "libatasmart" + depends on BR2_PACKAGE_UDEV + help + Reading and Parsing Library. + As the name suggests libatasmart only does ATA S.M.A.R.T. + + http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html + +comment "libatasmart requires udev to be enabled" + depends on !BR2_PACKAGE_UDEV
package/libatasmart/libatasmart.mk new file +17 -0
@@ -0,0 +1,17 @@ +############################################################# +# +# libatasmart +# +############################################################# +LIBATASMART_VERSION = 0.19 +LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz +LIBATASMART_SITE = http://0pointer.de/public +LIBATASMART_LICENCE = LGPL +LIBATASMART_LICELCE_FILE = LGPL +LIBATASMART_INSTALL_STAGING = YES + +LIBATASMART_AUTORECONF = YES + +LIBATASMART_DEPENDENCIES = udev + +$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
PATCH v2 3/6 libatasmart: new package.
Dear Marek Belisko,
package/Config.in source "package/iostat/Config.in" · line 243
Quoted 10 lines · Marek Belisko
package/Config.in +2
-0@@ -239,6 +239,8 @@ source "package/iostat/Config.in" source "package/irda-utils/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" +source "package/libatasmart/Config.in" +source "package/linux-firmware/Config.in"
Seems like a mismerge. You shouldn't be adding a
linux-firmware/Config.in include.
package/Config.in source "package/iostat/Config.in"
Quoted 5 lines
package/Config.in +5
-0+config BR2_PACKAGE_LIBATASMART + bool "libatasmart" + depends on BR2_PACKAGE_UDEV + help + Reading and Parsing Library.
This description sounds odd. Reading and Parsing Library for what?
package/Config.in
Quoted 6 lines
package/Config.in +6
-0+ As the name suggests libatasmart only does ATA S.M.A.R.T. + + http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html + +comment "libatasmart requires udev to be enabled" + depends on !BR2_PACKAGE_UDEV
Could you detail a little why udev is a dependency. Is libudev a dependency? Something else? We need to understand if it's a build dependency, a runtime dependency, the requirement for the system to actually use and run udev, etc.
Quoted 6 lines
package/libatasmart/libatasmart.mk new file +0
-0
package/libatasmart/libatasmart.mk line 9
Quoted 9 lines
package/libatasmart/libatasmart.mk new file +9
-0@@ -0,0 +1,17 @@ +############################################################# +# +# libatasmart +# +############################################################# +LIBATASMART_VERSION = 0.19 +LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz +LIBATASMART_SITE = http://0pointer.de/public +LIBATASMART_LICENCE = LGPL
LICENSE. Be more specific that LGPL.
package/libatasmart/libatasmart.mk line 10
Quoted 1 line
package/libatasmart/libatasmart.mk new file +1
-0+LIBATASMART_LICELCE_FILE = LGPL
LICENSE_FILES
package/libatasmart/libatasmart.mk line 13
Quoted 3 lines
package/libatasmart/libatasmart.mk new file +3
-0+LIBATASMART_INSTALL_STAGING = YES + +LIBATASMART_AUTORECONF = YES
Please add a comment here that explains why AUTORECONF = YES is needed.
package/libatasmart/libatasmart.mk line 17
Quoted 4 lines
package/libatasmart/libatasmart.mk new file +4
-0+ +LIBATASMART_DEPENDENCIES = udev + +$(eval $(autotools-package))
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 3/6 libatasmart: new package.
Hi Thomas,
Quoted 4 lines · Thomas Petazzoni
Dear Marek Belisko,
On Mon, 7 Jan 2013 21:43:16 +0100, Marek Belisko wrote:
Quoted 13 lines
package/Config.in source "package/iostat/Config.in" · line 243
Quoted 10 lines
package/Config.in +2
-0@@ -239,6 +239,8 @@ source "package/iostat/Config.in" source "package/irda-utils/Config.in" source "package/kbd/Config.in" source "package/lcdproc/Config.in" +source "package/libatasmart/Config.in" +source "package/linux-firmware/Config.in"Seems like a mismerge. You shouldn't be adding a
linux-firmware/Config.in include.
Right. I did rebase to actual master and make wrong config resolve. Will fix that.
Quoted 9 lines
package/Config.in source "package/iostat/Config.in"
Quoted 6 lines
package/Config.in +5
-0+config BR2_PACKAGE_LIBATASMART + bool "libatasmart" + depends on BR2_PACKAGE_UDEV + help + Reading and Parsing Library.This description sounds odd. Reading and Parsing Library for what?
Quoted 11 lines
package/Config.in
Quoted 6 lines
package/Config.in +6
-0+ As the name suggests libatasmart only does ATA S.M.A.R.T. + + http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html + +comment "libatasmart requires udev to be enabled" + depends on !BR2_PACKAGE_UDEVCould you detail a little why udev is a dependency. Is libudev a dependency? Something else? We need to understand if it's a build dependency, a runtime dependency, the requirement for the system to actually use and run udev, etc.
libudev is dependency for libatasmart.
Quoted 29 lines
Quoted 7 lines
package/libatasmart/libatasmart.mk new file +0
-0package/libatasmart/libatasmart.mk line 9
Quoted 9 lines
package/libatasmart/libatasmart.mk new file +9
-0@@ -0,0 +1,17 @@ +############################################################# +# +# libatasmart +# +############################################################# +LIBATASMART_VERSION = 0.19 +LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz +LIBATASMART_SITE = http://0pointer.de/public +LIBATASMART_LICENCE = LGPLLICENSE. Be more specific that LGPL.
package/libatasmart/libatasmart.mk line 10
Quoted 1 line
package/libatasmart/libatasmart.mk new file +1
-0+LIBATASMART_LICELCE_FILE = LGPL
LICENSE_FILESpackage/libatasmart/libatasmart.mk line 13
Quoted 3 lines
package/libatasmart/libatasmart.mk new file +3
-0+LIBATASMART_INSTALL_STAGING = YES + +LIBATASMART_AUTORECONF = YESPlease add a comment here that explains why AUTORECONF = YES is needed.
Quoted 11 lines
package/libatasmart/libatasmart.mk line 17
Quoted 4 lines
package/libatasmart/libatasmart.mk new file +4
-0+ +LIBATASMART_DEPENDENCIES = udev + +$(eval $(autotools-package))Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Thanks,
mbe
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 3/6 libatasmart: new package.
Dear Belisko Marek,
Quoted 5 lines · Belisko Marek
Quoted 4 lines
Could you detail a little why udev is a dependency. Is libudev a dependency? Something else? We need to understand if it's a build dependency, a runtime dependency, the requirement for the system to actually use and run udev, etc.
libudev is dependency for libatasmart.
Ok, then maybe put a comment on top of the "depends on BR2_PACKAGE_UDEV".
Thanks,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 4/6 lvm2: Install devmapper.pc to staging/target pkgconfig directory.
In reply to Marek BeliskoWithout this change if some package which have dependency on device mapper and use pkgconfig to check version always fail to find library because devmapper.pc file wasn't installed.
--- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lvm2/lvm2.mk +1 -1
@@ -21,7 +21,7 @@ LVM2_BINS = \ # Make sure that binaries and libraries are installed with write # permissions for the owner. -LVM2_CONF_OPT += --enable-write_install +LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig # LVM2 uses autoconf, but not automake, and the build system does not # take into account the CC passed at configure time.
Signature · 1 line
1.7.10.4
PATCH v2 5/6 lvm2: Compile and install application library.
In reply to Marek Belisko--- package/lvm2/Config.in | 6 ++++++ package/lvm2/lvm2.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
package/lvm2/Config.in +6 -0
@@ -21,5 +21,11 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY help Install dmsetup only and skip the LVM2 suite. +config BR2_PACKAGE_LVM2_APP_LIBRARY + bool "install application library" + depends on BR2_PACKAGE_LVM2 + help + Install application library (liblvm2app2). + comment "lvm2 requires a toolchain with LARGEFILE support" depends on !BR2_LARGEFILE
package/lvm2/lvm2.mk +7 -1
@@ -21,7 +21,7 @@ LVM2_BINS = \ # Make sure that binaries and libraries are installed with write # permissions for the owner. -LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig +LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig --enable-applib # LVM2 uses autoconf, but not automake, and the build system does not # take into account the CC passed at configure time.
@@ -41,6 +41,12 @@ LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper endif +ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) +LVM2_MAKE_OPT += liblvm +LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install +LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install +endif + define LVM2_UNINSTALL_STAGING_CMDS rm -f $(addprefix $(STAGING_DIR)/usr/sbin/,$(LVM2_BINS)) rm -f $(addprefix $(STAGING_DIR)/usr/lib/,libdevmapper.so*)
Signature · 1 line
1.7.10.4
PATCH v2 5/6 lvm2: Compile and install application library.
Dear Marek Belisko,
package/lvm2/Config.in config BR2_PACKAGE_LVM2_DMSETUP_ONLY
Quoted 12 lines · Marek Belisko
package/lvm2/Config.in +11
-0+config BR2_PACKAGE_LVM2_APP_LIBRARY + bool "install application library" + depends on BR2_PACKAGE_LVM2 + help + Install application library (liblvm2app2). + +ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) +LVM2_MAKE_OPT += liblvm +LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install +LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install +endif
I am not quite sure this is correct. Currently, the package works as follows (if I understand correctly):
* if BR2_PACKAGE_LVM2=y but BR2_PACKAGE_LVM2_DMSETUP_ONLY is not enabled, then LVM2_MAKE_OPT is empty, so it just runs the default make target, which presumably builds everything.
* if BR2_PACKAGE_LVM2=y and BR2_PACKAGE_LVM2_DMSETUP_ONLY=y, then LVM2_MAKE_OPT is set to device-mapper, in which case it only builds the device mapper code.
So now, you add a third BR2_PACKAGE_LVM2_APP_LIBRARY option. But if I do BR2_PACKAGE_LVM2=y and BR2_PACKAGE_LVM2_APP_LIBRARY=y, it will only build the library and not the rest, which is not what we expect.
I'd say that the DMSETUP_ONLY thing is a bad idea from the beginning, so I'm not sure what's the best way moving forward.
Are you sure liblvm doesn't get build and installed by the default BR2_PACKAGE_LVM2=y configuration?
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 5/6 lvm2: Compile and install application library.
Hi Thomas,
Quoted 32 lines · Thomas Petazzoni
Dear Marek Belisko,
package/lvm2/Config.in config BR2_PACKAGE_LVM2_DMSETUP_ONLY
Quoted 12 lines · Marek Belisko
package/lvm2/Config.in +11
-0+config BR2_PACKAGE_LVM2_APP_LIBRARY + bool "install application library" + depends on BR2_PACKAGE_LVM2 + help + Install application library (liblvm2app2). + +ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) +LVM2_MAKE_OPT += liblvm +LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install +LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install +endifI am not quite sure this is correct. Currently, the package works as follows (if I understand correctly):
* if BR2_PACKAGE_LVM2=y but
BR2_PACKAGE_LVM2_DMSETUP_ONLYis not enabled, thenLVM2_MAKE_OPTis empty, so it just runs the default make target, which presumably builds everything.* if BR2_PACKAGE_LVM2=y and BR2_PACKAGE_LVM2_DMSETUP_ONLY=y, then
LVM2_MAKE_OPTis set to device-mapper, in which case it only builds the device mapper code.So now, you add a third
BR2_PACKAGE_LVM2_APP_LIBRARYoption. But if I do BR2_PACKAGE_LVM2=y and BR2_PACKAGE_LVM2_APP_LIBRARY=y, it will only build the library and not the rest, which is not what we expect.
Quoted 5 lines
I'd say that the
DMSETUP_ONLYthing is a bad idea from the beginning, so I'm not sure what's the best way moving forward.Are you sure liblvm doesn't get build and installed by the default BR2_PACKAGE_LVM2=y configuration?
Nope and this was intention of this patch to add ability to build also library. lvm app library is necessary as dependency for udisk (if enabled lvm2 support - disabled by default).
Quoted 7 lines
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Regards,
mbe
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 5/6 lvm2: Compile and install application library.
In reply to Thomas PetazzoniHi Thomas,
Quoted 28 lines · Thomas Petazzoni
Dear Marek Belisko,
package/lvm2/Config.in config BR2_PACKAGE_LVM2_DMSETUP_ONLY
Quoted 12 lines · Marek Belisko
package/lvm2/Config.in +11
-0+config BR2_PACKAGE_LVM2_APP_LIBRARY + bool "install application library" + depends on BR2_PACKAGE_LVM2 + help + Install application library (liblvm2app2). + +ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) +LVM2_MAKE_OPT += liblvm +LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install +LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install +endifI am not quite sure this is correct. Currently, the package works as follows (if I understand correctly):
* if BR2_PACKAGE_LVM2=y but
BR2_PACKAGE_LVM2_DMSETUP_ONLYis not enabled, thenLVM2_MAKE_OPTis empty, so it just runs the default make target, which presumably builds everything.* if BR2_PACKAGE_LVM2=y and BR2_PACKAGE_LVM2_DMSETUP_ONLY=y, then
LVM2_MAKE_OPTis set to device-mapper, in which case it only builds the device mapper code.
Quoted 6 lines
So now, you add a third
BR2_PACKAGE_LVM2_APP_LIBRARYoption. But if I do BR2_PACKAGE_LVM2=y and BR2_PACKAGE_LVM2_APP_LIBRARY=y, it will only build the library and not the rest, which is not what we expect.I'd say that the
DMSETUP_ONLYthing is a bad idea from the beginning, so I'm not sure what's the best way moving forward.
What about to compile everything (device mapper + app library) and only install things which user select in
config.
Quoted 10 lines
Are you sure liblvm doesn't get build and installed by the default BR2_PACKAGE_LVM2=y configuration?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Thanks,
marek
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 5/6 lvm2: Compile and install application library.
Dear Belisko Marek,
Quoted 3 lines · Belisko Marek
What about to compile everything (device mapper + app library) and only install things which user select in
config.
That's usually what we do in relatively small packages for which the overall build time is not so significant to be worth the effort of doing selective compilation. We however do selective installation if needed to only install the required files.
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 5/6 lvm2: Compile and install application library.
Hi Thomas,
Quoted 4 lines · Thomas Petazzoni
Dear Belisko Marek,
On Tue, 15 Jan 2013 21:53:48 +0100, Belisko Marek wrote:
Quoted 8 lines
Quoted 3 lines
What about to compile everything (device mapper + app library) and only install things which user select in
config.That's usually what we do in relatively small packages for which the overall build time is not so significant to be worth the effort of doing selective compilation. We however do selective installation if needed to only install the required files.
OK. Any ideas how to proceed with this patch? Without that udisks (with lvm2) cannot work. IMO original patch is OK despite of fact it build only liblvm (not libdm + lvm2)
Quoted 9 lines
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Regards,
marek
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 5/6 lvm2: Compile and install application library.
In reply to Marek BeliskoQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Marek" == Marek Belisko <[email protected]> writes:
Marek> Signed-off-by: Marek Belisko <[email protected]> Marek> ---
Marek> package/lvm2/Config.in | 6 ++++++ Marek> package/lvm2/lvm2.mk | 8 +++++++-
Marek> 2 files changed, 13 insertions(+), 1 deletion(-)
Marek> diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in Marek> index 30af14e..bb41c0a 100644
Marek> --- a/package/lvm2/Config.in
Marek> +++ b/package/lvm2/Config.in
Marek> @@ -21,5 +21,11 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY
Marek> help
Marek> Install dmsetup only and skip the LVM2 suite.
Marek> +config BR2_PACKAGE_LVM2_APP_LIBRARY
Marek> + bool "install application library"
This option doesn't make much sense in combination with DMSETUP_ONLY, so I've made it depend on !DMSETUP_ONLY
Marek> + depends on BR2_PACKAGE_LVM2
Marek> + help
Marek> + Install application library (liblvm2app2).
Marek> +
Marek> comment "lvm2 requires a toolchain with LARGEFILE support"
Marek> depends on !BR2_LARGEFILE
Marek> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk Marek> index f54caa4..213ef65 100644
Marek> --- a/package/lvm2/lvm2.mk
Marek> +++ b/package/lvm2/lvm2.mk
Marek> @@ -21,7 +21,7 @@ LVM2_BINS = \
Marek> # Make sure that binaries and libraries are installed with write Marek> # permissions for the owner.
Marek> -LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig Marek> +LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig --enable-applib
We should only enable it if _APP_LIBRARY is enabled.
Marek> # LVM2 uses autoconf, but not automake, and the build system does not Marek> # take into account the CC passed at configure time.
Marek> @@ -41,6 +41,12 @@ LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper Marek> LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper Marek> endif
Marek> +ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) Marek> +LVM2_MAKE_OPT += liblvm
Marek> +LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install Marek> +LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
And then this isn't needed.
Committed with these fixes, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 5/6 lvm2: Compile and install application library.
Hi Peter,
Quoted 16 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Marek" == Marek Belisko <[email protected]> writes:
Marek> Signed-off-by: Marek Belisko <[email protected]> Marek> ---
Marek> package/lvm2/Config.in | 6 ++++++ Marek> package/lvm2/lvm2.mk | 8 +++++++-Marek> 2 files changed, 13 insertions(+), 1 deletion(-)
Marek> diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in Marek> index 30af14e..bb41c0a 100644
Marek> --- a/package/lvm2/Config.in
Marek> +++ b/package/lvm2/Config.in
Marek> @@ -21,5 +21,11 @@ configBR2_PACKAGE_LVM2_DMSETUP_ONLY
Marek> help
Marek> Install dmsetup only and skip the LVM2 suite.
Quoted 5 lines
Marek> +config
BR2_PACKAGE_LVM2_APP_LIBRARY
Marek> + bool "install application library"This option doesn't make much sense in combination with
DMSETUP_ONLY, so I've made it depend on !DMSETUP_ONLY
This patch was from v2 and was dropped in v3 because it wasn't necessary. Please see http://lists.busybox.net/pipermail/buildroot/2013-January/065740.html
I've tested it also with fresh build and it was working without this patch.
Quoted 34 lines
Marek> + depends on
BR2_PACKAGE_LVM2
Marek> + help
Marek> + Install application library (liblvm2app2).
Marek> +
Marek> comment "lvm2 requires a toolchain with LARGEFILE support"
Marek> depends on !BR2_LARGEFILE
Marek> diff --gita/package/lvm2/lvm2.mkb/package/lvm2/lvm2.mkMarek> index f54caa4..213ef65 100644
Marek> ---a/package/lvm2/lvm2.mk
Marek> +++b/package/lvm2/lvm2.mk
Marek> @@ -21,7 +21,7 @@LVM2_BINS= \Marek> # Make sure that binaries and libraries are installed with write Marek> # permissions for the owner.
Marek> -LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig Marek> +LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig --enable-applibWe should only enable it if
_APP_LIBRARYis enabled.Marek> # LVM2 uses autoconf, but not automake, and the build system does not Marek> # take into account the CC passed at configure time.
Marek> @@ -41,6 +41,12 @@LVM2_INSTALL_STAGING_OPT= DESTDIR=$(STAGING_DIR) install_device-mapper Marek>LVM2_INSTALL_TARGET_OPT= DESTDIR=$(TARGET_DIR) install_device-mapper Marek> endifMarek> +ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) Marek> +LVM2_MAKE_OPT += liblvm
Marek> +LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install Marek> +LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
Quoted 6 lines
And then this isn't needed.
Committed with these fixes, thanks.
--
Bye, Peter Korsgaard
Thanks,
marek
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 5/6 lvm2: Compile and install application library.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Belisko" == Belisko Marek <[email protected]> writes:
Hi,
Marek> +config BR2_PACKAGE_LVM2_APP_LIBRARY
Marek> + bool "install application library"
Quoted 3 lines
Quoted 3 lines
This option doesn't make much sense in combination with
DMSETUP_ONLY, so I've made it depend on !DMSETUP_ONLY
Belisko> This patch was from v2 and was dropped in v3 because it wasn't Belisko> necessary. Please see
Belisko> http://lists.busybox.net/pipermail/buildroot/2013-January/065740.html
Belisko> I've tested it also with fresh build and it was working Belisko> without this patch.
Hmm, it didn't work for me here.
From lvm2 configure.in:
AC_ARG_ENABLE(applib,
AC_HELP_STRING([--enable-applib], [build application library]), APPLIB=$enableval, APPLIB=no)AC_MSG_RESULT($APPLIB)
E.G. applib defaults to disabled.
Makefile.in:
ifeq ("@APPLIB@", "yes")
SUBDIRS += liblvm
endif
So I wonder how you could have gotten the liblvm subdir built without either passing --enable-applib or explicitly calling make liblvm.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 6/6 udisks: new package
In reply to Marek Belisko--- 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
package/Config.in +1 -0
@@ -272,6 +272,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"
package/udisks/Config.in new file +32 -0
@@ -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_LVM2_DMSETUP_ONLY #devmapper library + 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 + depends on BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_APP_LIBRARY + default n + +comment "udisks requires udev and dbus to be enabled" + depends on !BR2_PACKAGE_UDEV || !BR2_PACKAGE_DBUS
package/udisks/udisks.mk new file +28 -0
@@ -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))
Signature · 1 line
1.7.10.4
PATCH v2 6/6 udisks: new package
Dear Marek Belisko,
package/udisks/Config.in line 10
Quoted 13 lines · Marek Belisko
package/udisks/Config.in new file +10
-0@@ -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_LVM2_DMSETUP_ONLY #devmapper library
If you select BR2_PACKAGE_LVM2_DMSETUP_ONLY, then you also have to select BR2_PACKAGE_LVM2.
package/udisks/Config.in line 11
Quoted 1 line
package/udisks/Config.in new file +1
-0+ select BR2_PACKAGE_LIBATASMART
Also, you're doing a lot of select here. Please verify that all the configuration options you're selecting don't have depends on dependencies that aren't already brought through the dependency on dbus and udev here.
Quoted 8 lines
package/udisks/Config.in new file +8
-0+ 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
package/udisks/Config.in line 29
Quoted 10 lines
package/udisks/Config.in new file +10
-0+ and use the daemon + + http://www.freedesktop.org/wiki/Software/udisks + +config BR2_PACKAGE_UDISKS_LVM2 + bool "lvm2 support" + depends on BR2_PACKAGE_UDISKS + depends on BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_APP_LIBRARY + default n
BR2_PACKAGE_LVM2 is necessarily defined if BR2_PACKAGE_LVM2_DMSETUP_ONLY is selected by the main BR2_PACKAGE_UDISKS option.
If I understand correctly, you can build:
* udisks without the lvm2 library, but it needs the dmsetup binary unconditionally (which sounds strange, isn't capable of supporting setups without LVM stuff)
* udisks with the lvm2 library
Not sure how to handle that properly with the current BR2_PACKAGE_LVM2 options. Needs more thought.
package/udisks/Config.in
Quoted 9 lines
package/udisks/Config.in new file +9
-0+############################################################# +# +# udisks +# +############################################################# +UDISKS_VERSION = 1.0.4 +UDISKS_SITE = http://hal.freedesktop.org/releases/ +UDISKS_LICENCE = GPLv2+ +UDISKS_LICENCE_FILES = COPYING
LICENSE.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 6/6 udisks: new package
Hi Thomas,
Quoted 4 lines · Thomas Petazzoni
Dear Marek Belisko,
On Mon, 7 Jan 2013 21:43:19 +0100, Marek Belisko wrote:
Quoted 16 lines
package/udisks/Config.in line 10
Quoted 13 lines
package/udisks/Config.in new file +10
-0@@ -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_LVM2_DMSETUP_ONLY #devmapper libraryIf you select
BR2_PACKAGE_LVM2_DMSETUP_ONLY, then you also have to selectBR2_PACKAGE_LVM2.
This is selected conditionally when LVM2 support if selected.
Quoted 31 lines
package/udisks/Config.in line 11
Quoted 2 lines
package/udisks/Config.in new file +1
-0+ select BR2_PACKAGE_LIBATASMARTAlso, you're doing a lot of select here. Please verify that all the configuration options you're selecting don't have depends on dependencies that aren't already brought through the dependency on dbus and udev here.
Quoted 8 lines
package/udisks/Config.in new file +8
-0+ 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 querypackage/udisks/Config.in line 29
Quoted 10 lines
package/udisks/Config.in new file +10
-0+ and use the daemon + + http://www.freedesktop.org/wiki/Software/udisks + +config BR2_PACKAGE_UDISKS_LVM2 + bool "lvm2 support" + depends on BR2_PACKAGE_UDISKS + depends on BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_APP_LIBRARY + default n
BR2_PACKAGE_LVM2is necessarily defined ifBR2_PACKAGE_LVM2_DMSETUP_ONLYis selected by the mainBR2_PACKAGE_UDISKSoption.
Quoted 5 lines
If I understand correctly, you can build:
* udisks without the lvm2 library, but it needs the dmsetup binary unconditionally (which sounds strange, isn't capable of supporting setups without LVM stuff)
It is weird but configure phase require devmapper library (otherwise fails) in both case (udisks with/without lvm2 support)
Quoted 18 lines
* udisks with the lvm2 library
Not sure how to handle that properly with the current
BR2_PACKAGE_LVM2options. Needs more thought.package/udisks/Config.in
Quoted 9 lines
package/udisks/Config.in new file +9
-0+############################################################# +# +# udisks +# +############################################################# +UDISKS_VERSION = 1.0.4 +UDISKS_SITE = http://hal.freedesktop.org/releases/ +UDISKS_LICENCE = GPLv2+ +UDISKS_LICENCE_FILES = COPYINGLICENSE.
Quoted 6 lines
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Regards,
mbe
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 6/6 udisks: new package
Dear Belisko Marek,
Quoted 6 lines · Belisko Marek
Quoted 5 lines
package/udisks/Config.in line 10
Quoted 2 lines
package/udisks/Config.in new file +2
-0+ select BR2_PACKAGE_PARTED #select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_DMSETUP_ONLY #devmapper libraryIf you select
BR2_PACKAGE_LVM2_DMSETUP_ONLY, then you also have to selectBR2_PACKAGE_LVM2.This is selected conditionally when LVM2 support if selected.
This is not what your patch does:
+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_LVM2_DMSETUP_ONLY #devmapper library
+ select BR2_PACKAGE_LIBATASMART
The select of BR2_PACKAGE_LVM2 is commented.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 6/6 udisks: new package
Hi Thomas,
Quoted 24 lines · Thomas Petazzoni
Dear Belisko Marek,
Quoted 6 lines · Belisko Marek
Quoted 5 lines
package/udisks/Config.in line 10
Quoted 2 lines
package/udisks/Config.in new file +2
-0+ select BR2_PACKAGE_PARTED #select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_DMSETUP_ONLY #devmapper libraryIf you select
BR2_PACKAGE_LVM2_DMSETUP_ONLY, then you also have to selectBR2_PACKAGE_LVM2.This is selected conditionally when LVM2 support if selected.
This is not what your patch does:
package/udisks/Config.in new file +11
-0+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_LVM2_DMSETUP_ONLY #devmapper library + select BR2_PACKAGE_LIBATASMART
Quoted 1 line
The select of
BR2_PACKAGE_LVM2is commented.
No this is comment that BR2_PACKAGE_PARTED select also BR2_PACKAGE_LVM2. Maybe this is wrong approach but it works :).
Quoted 7 lines
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Regards,
mbe
Signature · 10 lines
as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com
PATCH v2 6/6 udisks: new package
Dear Belisko Marek,
Quoted 3 lines · Belisko Marek
Quoted 1 line
The select of
BR2_PACKAGE_LVM2is commented.No this is comment that
BR2_PACKAGE_PARTEDselect alsoBR2_PACKAGE_LVM2. Maybe this is wrong approach but it works :).
Ah, ok. Then please make the "select BR2_PACKAGE_LVM2" explicit, since udisks needs it directly.
But then, you can get rid of your "depends on BR2_PACKAGE_LVM2" in BR2_PACKAGE_UDISKS_LVM2, because the lvm2 package is surely already enabled, since it gets selected by udisks.
I still don't like those lvm2 configuration options that much, though...
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com