summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch
diff options
context:
space:
mode:
authordheerajpdsk <p.dheeraj.srujan.kumar@intel.com>2022-06-16 23:47:53 +0300
committerGitHub <noreply@github.com>2022-06-16 23:47:53 +0300
commite0c224c79550bf49928bfb75f629233b1ef07c7a (patch)
treedfe08b91193d44f4984117dbd3eef9866e097582 /meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch
parent0945170f93cc0c101bf01739f41136c2f05af570 (diff)
parent1f4be67aa2cc61a3db46c577da5ccd88cc84fa16 (diff)
downloadopenbmc-e0c224c79550bf49928bfb75f629233b1ef07c7a.tar.xz
Merge pull request #82 from Intel-BMC/update1-0.91-151
Update to internal 1-0.91-151
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch
new file mode 100644
index 000000000..e475289f6
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-core/util-linux/util-linux/configure-sbindir.patch
@@ -0,0 +1,23 @@
+util-linux: take ${sbindir} from the environment if it is set there
+fix the test, the [ ] syntax was getting eaten by autoconf
+
+Signed-off-by: Phil Blundell <pb@pbcl.net>
+Signed-off-by: Saul Wold <sgw@linux.intel.com
+Upstream-Status: Inappropriate [configuration]
+
+Index: util-linux-2.31/configure.ac
+===================================================================
+--- util-linux-2.31.orig/configure.ac
++++ util-linux-2.31/configure.ac
+@@ -89,7 +89,10 @@ AC_SUBST([runstatedir])
+ usrbin_execdir='${exec_prefix}/bin'
+ AC_SUBST([usrbin_execdir])
+
+-usrsbin_execdir='${exec_prefix}/sbin'
++if test -z "$usrsbin_execdir" ;
++then
++ usrsbin_execdir='${exec_prefix}/sbin'
++fi
+ AC_SUBST([usrsbin_execdir])
+
+ AS_CASE([$libdir],