[ptxdist] [PATCH] util-linux-ng: allow losetup to be optionally installed

[ptxdist] [PATCH] util-linux-ng: allow losetup to be optionally installed

[jon]

From: Jon Ringle <jringle@gridpoint.com>

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
 rules/util-linux-ng.in   | 10 ++++++++++
 rules/util-linux-ng.make |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index 249bc37..a98074e 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -129,6 +129,16 @@ config UTIL_LINUX_NG_SWAPON
 comment "BusyBox' swapon is selected!"
 	depends on BUSYBOX_SWAPONOFF
 
+config UTIL_LINUX_NG_LOSETUP
+	bool
+	prompt "losetup"
+	depends on !BUSYBOX_LOSETUP || ALLYES
+	help
+	  losetup is used to associate or detach a loop device with a regular file or block device, and to query the status of a loop device.
+
+comment "BusyBox' losetup is selected!"
+	depends on BUSYBOX_LOSETUP
+
 config UTIL_LINUX_NG_MOUNT
 	bool
 	prompt "mount"
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index ced9e98..c47a933 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -59,7 +59,7 @@ UTIL_LINUX_NG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
 	--disable-deprecated-mount \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
-	--disable-losetup \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOSETUP)-losetup \
 	--disable-cytune \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
@@ -167,6 +167,9 @@ ifdef PTXCONF_UTIL_LINUX_NG_SWAPON
 	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/swapon)
 	@$(call install_link, util-linux-ng, swapon, /sbin/swapoff)
 endif
+ifdef PTXCONF_UTIL_LINUX_NG_LOSETUP
+	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/losetup)
+endif
 ifdef PTXCONF_UTIL_LINUX_NG_MOUNT
 	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/mount)
 endif
-- 
1.8.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] util-linux-ng: allow losetup to be optionally installed

[Michael Olbrich]

On Wed, Jun 25, 2014 at 10:07:04PM -0400, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
> 

Thanks, applied.

Michael

> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
>  rules/util-linux-ng.in   | 10 ++++++++++
>  rules/util-linux-ng.make |  5 ++++-
>  2 files changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
> index 249bc37..a98074e 100644
> --- a/rules/util-linux-ng.in
> +++ b/rules/util-linux-ng.in
> @@ -129,6 +129,16 @@ config UTIL_LINUX_NG_SWAPON
>  comment "BusyBox' swapon is selected!"
>  	depends on BUSYBOX_SWAPONOFF
>  
> +config UTIL_LINUX_NG_LOSETUP
> +	bool
> +	prompt "losetup"
> +	depends on !BUSYBOX_LOSETUP || ALLYES
> +	help
> +	  losetup is used to associate or detach a loop device with a regular file or block device, and to query the status of a loop device.
> +
> +comment "BusyBox' losetup is selected!"
> +	depends on BUSYBOX_LOSETUP
> +
>  config UTIL_LINUX_NG_MOUNT
>  	bool
>  	prompt "mount"
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index ced9e98..c47a933 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -59,7 +59,7 @@ UTIL_LINUX_NG_CONF_OPT	:= \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LIBMOUNT)-libmount \
>  	--disable-deprecated-mount \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
> -	--disable-losetup \
> +	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LOSETUP)-losetup \
>  	--disable-cytune \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
> @@ -167,6 +167,9 @@ ifdef PTXCONF_UTIL_LINUX_NG_SWAPON
>  	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/swapon)
>  	@$(call install_link, util-linux-ng, swapon, /sbin/swapoff)
>  endif
> +ifdef PTXCONF_UTIL_LINUX_NG_LOSETUP
> +	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/losetup)
> +endif
>  ifdef PTXCONF_UTIL_LINUX_NG_MOUNT
>  	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/mount)
>  endif
> -- 
> 1.8.5.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de