diff mbox

util-linux: build schedutils without enabling basic binaries

Message ID 1487448401-23830-1-git-send-email-casantos@datacom.ind.br
State Superseded, archived
Headers show

Commit Message

Carlos Santos Feb. 18, 2017, 8:06 p.m. UTC
Pull a patch already sent upstream tp fix AM_CONDITIONAL parameters that
conditioned the build of ionice, taskset an chrt to the wrong variable.

Fixes:
  https://bugs.busybox.net/show_bug.cgi?id=9656
  https://github.com/karelzak/util-linux/issues/415

Reported-by: Aaron Holtzman <aholtzma@gmail.com>
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
 ...build-when-configured-with-disable-all-pr.patch | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch

Comments

Baruch Siach Feb. 18, 2017, 8:26 p.m. UTC | #1
Hi Carlos,

On Sat, Feb 18, 2017 at 06:06:41PM -0200, Carlos Santos wrote:
> Pull a patch already sent upstream tp fix AM_CONDITIONAL parameters that
> conditioned the build of ionice, taskset an chrt to the wrong variable.
> 
> Fixes:
>   https://bugs.busybox.net/show_bug.cgi?id=9656
>   https://github.com/karelzak/util-linux/issues/415
> 
> Reported-by: Aaron Holtzman <aholtzma@gmail.com>
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
>  ...build-when-configured-with-disable-all-pr.patch | 52 ++++++++++++++++++++++
>  1 file changed, 52 insertions(+)
>  create mode 100644 package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch
> 
> diff --git a/package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch b/package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch
> new file mode 100644
> index 0000000..812927e
> --- /dev/null
> +++ b/package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch
> @@ -0,0 +1,52 @@
> +From e1578c3d32cc9f817f19729b5eee21e49b639185 Mon Sep 17 00:00:00 2001
> +From: Carlos Santos <casantos@datacom.ind.br>
> +Date: Sat, 18 Feb 2017 17:23:37 -0200
> +Subject: [PATCH] schedutils: build when configured with --disable-all-programs
> +
> +Fix AM_CONDITIONAL parameters that conditioned ionice, taskset an chrt
> +to the values of build_{ionice,taskset,chrt} respectively, instead of
> +build_schedutils.
> +
> +Fixes:
> +  https://bugs.busybox.net/show_bug.cgi?id=9656
> +  https://github.com/karelzak/util-linux/issues/415
> +
> +Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> +---
> + configure.ac | 6 +++---

Please update the _AUTORECONF comment in util-linux.mk.

baruch
diff mbox

Patch

diff --git a/package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch b/package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch
new file mode 100644
index 0000000..812927e
--- /dev/null
+++ b/package/util-linux/0003-schedutils-build-when-configured-with-disable-all-pr.patch
@@ -0,0 +1,52 @@ 
+From e1578c3d32cc9f817f19729b5eee21e49b639185 Mon Sep 17 00:00:00 2001
+From: Carlos Santos <casantos@datacom.ind.br>
+Date: Sat, 18 Feb 2017 17:23:37 -0200
+Subject: [PATCH] schedutils: build when configured with --disable-all-programs
+
+Fix AM_CONDITIONAL parameters that conditioned ionice, taskset an chrt
+to the values of build_{ionice,taskset,chrt} respectively, instead of
+build_schedutils.
+
+Fixes:
+  https://bugs.busybox.net/show_bug.cgi?id=9656
+  https://github.com/karelzak/util-linux/issues/415
+
+Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad241fe..1933741 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1935,7 +1935,7 @@ UL_REQUIRES_SYSCALL_CHECK([ionice],
+ 	  [x86_64*],	[252])],
+ 	[ioprio_get])
+ 
+-AM_CONDITIONAL([BUILD_IONICE], [test "x$build_ionice" = xyes])
++AM_CONDITIONAL([BUILD_IONICE], [test "x$build_schedutils" = xyes])
+ 
+ UL_BUILD_INIT([taskset], [check])
+ UL_REQUIRES_BUILD([taskset], [schedutils])
+@@ -1943,7 +1943,7 @@ UL_REQUIRES_HAVE([taskset], [cpu_set_t], [cpu_set_t type])
+ UL_REQUIRES_SYSCALL_CHECK([taskset],
+ 	[UL_CHECK_SYSCALL([sched_getaffinity])],
+ 	[sched_getaffinity])
+-AM_CONDITIONAL([BUILD_TASKSET], [test "x$build_taskset" = xyes])
++AM_CONDITIONAL([BUILD_TASKSET], [test "x$build_schedutils" = xyes])
+ 
+ 
+ have_schedsetter=no
+@@ -1953,7 +1953,7 @@ AS_IF([test "x$ac_cv_func_sched_setscheduler" = xyes], [have_schedsetter=yes],
+ UL_BUILD_INIT([chrt], [check])
+ UL_REQUIRES_BUILD([chrt], [schedutils])
+ UL_REQUIRES_HAVE([chrt], [schedsetter], [sched_set functions])
+-AM_CONDITIONAL([BUILD_CHRT], [test "x$build_chrt" = xyes])
++AM_CONDITIONAL([BUILD_CHRT], [test "x$build_schedutils" = xyes])
+ 
+ AS_IF([test "x$build_chrt" = xyes], [
+ 	UL_CHECK_SYSCALL([sched_setattr])
+-- 
+2.7.4
+