Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] lvm2: add host variant
@ 2017-10-05 15:06 Peter Korsgaard
  2017-10-05 15:06 ` [Buildroot] [PATCH 2/2] cryptsetup: " Peter Korsgaard
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-10-05 15:06 UTC (permalink / raw)
  To: buildroot

This is only for the device-mapper library, so a user selectable
Config.in.host option isn't needed.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/lvm2/lvm2.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index f7f706976f..5783ab08be 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -51,4 +51,16 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
 endif
 
+HOST_LVM2_CONF_OPTS = \
+	--enable-write_install \
+	--enable-pkgconfig \
+	--disable-cmdlib \
+	--disable-dmeventd \
+	--disable-applib \
+	--disable-fsadm \
+	--disable-readline
+HOST_LVM2_MAKE_OPTS = device-mapper
+HOST_LVM2_INSTALL_OPTS = install_device-mapper
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] cryptsetup: add host variant
  2017-10-05 15:06 [Buildroot] [PATCH 1/2] lvm2: add host variant Peter Korsgaard
@ 2017-10-05 15:06 ` Peter Korsgaard
  2017-10-05 20:45   ` Peter Korsgaard
  2017-10-05 18:32 ` [Buildroot] [PATCH 1/2] lvm2: " Arnout Vandecappelle
  2017-10-05 20:45 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2017-10-05 15:06 UTC (permalink / raw)
  To: buildroot

E.G. for generating dm-verity hashes or dm-crypt data at build time in a
post-image script.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in.host            |  1 +
 package/cryptsetup/Config.in.host |  8 ++++++++
 package/cryptsetup/cryptsetup.mk  | 10 ++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 package/cryptsetup/Config.in.host

diff --git a/package/Config.in.host b/package/Config.in.host
index 679fe22a52..3755310de4 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -6,6 +6,7 @@ menu "Host utilities"
 	source "package/checkpolicy/Config.in.host"
 	source "package/cmake/Config.in.host"
 	source "package/cramfs/Config.in.host"
+	source "package/cryptsetup/Config.in.host"
 	source "package/dfu-util/Config.in.host"
 	source "package/dos2unix/Config.in.host"
 	source "package/dosfstools/Config.in.host"
diff --git a/package/cryptsetup/Config.in.host b/package/cryptsetup/Config.in.host
new file mode 100644
index 0000000000..7060ed16a9
--- /dev/null
+++ b/package/cryptsetup/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_CRYPTSETUP
+	bool "host-cryptsetup"
+	select BR2_PACKAGE_HOST_UTIL_LINUX
+	help
+	  This tool helps manipulate dm-crypt and luks partitions for
+	  on-disk encryption.
+
+	  https://gitlab.com/cryptsetup/cryptsetup
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 5496583028..6b0fa318aa 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -28,4 +28,14 @@ else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
 
+HOST_CRYPTSETUP_DEPENDENCIES = \
+	host-pkgconf \
+	host-lvm2 \
+	host-popt \
+	host-util-linux \
+	host-openssl
+
+HOST_CRYPTSETUP_CONF_OPTS = --with-crypto-backend=openssl
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] lvm2: add host variant
  2017-10-05 15:06 [Buildroot] [PATCH 1/2] lvm2: add host variant Peter Korsgaard
  2017-10-05 15:06 ` [Buildroot] [PATCH 2/2] cryptsetup: " Peter Korsgaard
@ 2017-10-05 18:32 ` Arnout Vandecappelle
  2017-10-05 19:40   ` Peter Korsgaard
  2017-10-05 20:45 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-10-05 18:32 UTC (permalink / raw)
  To: buildroot



On 05-10-17 17:06, Peter Korsgaard wrote:
> This is only for the device-mapper library, so a user selectable
> Config.in.host option isn't needed.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

 I was going to apply, but...

> ---
>  package/lvm2/lvm2.mk | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
> index f7f706976f..5783ab08be 100644
> --- a/package/lvm2/lvm2.mk
> +++ b/package/lvm2/lvm2.mk
> @@ -51,4 +51,16 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
>  LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
>  endif
>  
> +HOST_LVM2_CONF_OPTS = \
> +	--enable-write_install \
> +	--enable-pkgconfig \

 ... this made me think: shouldn't it depend on host-pkgconf? The target package
depends on host-pkgconf, even though it doesn't depend on anything else (except
optionally readline but that doesn't have a .pc file). It's probably OK but I'd
like an explanation just to be sure.

 Regards,
 Arnout

> +	--disable-cmdlib \
> +	--disable-dmeventd \
> +	--disable-applib \
> +	--disable-fsadm \
> +	--disable-readline
> +HOST_LVM2_MAKE_OPTS = device-mapper
> +HOST_LVM2_INSTALL_OPTS = install_device-mapper
> +
>  $(eval $(autotools-package))
> +$(eval $(host-autotools-package))
> 

-- 
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:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] lvm2: add host variant
  2017-10-05 18:32 ` [Buildroot] [PATCH 1/2] lvm2: " Arnout Vandecappelle
@ 2017-10-05 19:40   ` Peter Korsgaard
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-10-05 19:40 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 05-10-17 17:06, Peter Korsgaard wrote:
 >> This is only for the device-mapper library, so a user selectable
 >> Config.in.host option isn't needed.
 >> 
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

 >  I was going to apply, but...

 >> ---
 >> package/lvm2/lvm2.mk | 12 ++++++++++++
 >> 1 file changed, 12 insertions(+)
 >> 
 >> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
 >> index f7f706976f..5783ab08be 100644
 >> --- a/package/lvm2/lvm2.mk
 >> +++ b/package/lvm2/lvm2.mk
 >> @@ -51,4 +51,16 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 >> LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
 >> endif
 >> 
 >> +HOST_LVM2_CONF_OPTS = \
 >> +	--enable-write_install \
 >> +	--enable-pkgconfig \

 >  ... this made me think: shouldn't it depend on host-pkgconf? The
 > target package depends on host-pkgconf, even though it doesn't depend
 > on anything else (except optionally readline but that doesn't have a
 > .pc file). It's probably OK but I'd like an explanation just to be
 > sure.

--enable-pkgconfig is about if lvm2 should install .pc files, not if it
should use pkg-config to find dependencies. I had missed the
host-pkgconf dependency on the target variant (because of the +=).
The device-mapper library doesn't strictly need pkg-config, but yeah, it
makes sense to keep in sync with the target version.

I'll add it when applying, thanks!

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] lvm2: add host variant
  2017-10-05 15:06 [Buildroot] [PATCH 1/2] lvm2: add host variant Peter Korsgaard
  2017-10-05 15:06 ` [Buildroot] [PATCH 2/2] cryptsetup: " Peter Korsgaard
  2017-10-05 18:32 ` [Buildroot] [PATCH 1/2] lvm2: " Arnout Vandecappelle
@ 2017-10-05 20:45 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-10-05 20:45 UTC (permalink / raw)
  To: buildroot

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > This is only for the device-mapper library, so a user selectable
 > Config.in.host option isn't needed.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed after adding the host-pkgconf dependency as pointed out by
Arnout, thanks.

> ---
 >  package/lvm2/lvm2.mk | 12 ++++++++++++
 >  1 file changed, 12 insertions(+)

 > diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
 > index f7f706976f..5783ab08be 100644
 > --- a/package/lvm2/lvm2.mk
 > +++ b/package/lvm2/lvm2.mk
 > @@ -51,4 +51,16 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 >  LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
 >  endif
 
 > +HOST_LVM2_CONF_OPTS = \
 > +	--enable-write_install \
 > +	--enable-pkgconfig \
 > +	--disable-cmdlib \
 > +	--disable-dmeventd \
 > +	--disable-applib \
 > +	--disable-fsadm \
 > +	--disable-readline
 > +HOST_LVM2_MAKE_OPTS = device-mapper
 > +HOST_LVM2_INSTALL_OPTS = install_device-mapper
 > +
 >  $(eval $(autotools-package))
 > +$(eval $(host-autotools-package))
 > -- 
 > 2.11.0


-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] cryptsetup: add host variant
  2017-10-05 15:06 ` [Buildroot] [PATCH 2/2] cryptsetup: " Peter Korsgaard
@ 2017-10-05 20:45   ` Peter Korsgaard
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-10-05 20:45 UTC (permalink / raw)
  To: buildroot

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > E.G. for generating dm-verity hashes or dm-crypt data at build time in a
 > post-image script.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-10-05 20:45 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-05 15:06 [Buildroot] [PATCH 1/2] lvm2: add host variant Peter Korsgaard
2017-10-05 15:06 ` [Buildroot] [PATCH 2/2] cryptsetup: " Peter Korsgaard
2017-10-05 20:45   ` Peter Korsgaard
2017-10-05 18:32 ` [Buildroot] [PATCH 1/2] lvm2: " Arnout Vandecappelle
2017-10-05 19:40   ` Peter Korsgaard
2017-10-05 20:45 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox