From: Fabrice Fontaine Date: Tue, 13 Mar 2018 21:18:25 +0000 (+0100) Subject: meson: fix error when restorecon unavailable X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cbb08d8e59d56e5d86a85fc8730c9c604d77d27;p=buildroot.git meson: fix error when restorecon unavailable host-meson is used by some packages such as libmpdclient. If selinuxenabled is installed on host but restorecon is unavailable (for an "unknwown" reason), install will crash. Fixes: - http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- diff --git a/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch b/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch new file mode 100644 index 0000000000..3f1ca68dfc --- /dev/null +++ b/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch @@ -0,0 +1,31 @@ +From 8edc477b7d7b160004eb700a1b7523237333d9ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 13 Mar 2018 18:52:36 +0100 +Subject: [PATCH] Fix FileNotFoundError when restorecon unavailable + +Fixes: + - http://autobuild.buildroot.net/results/d5dcdfdfab3503fdc387f99e68267972a38c417d + +Signed-off-by: Fabrice Fontaine +--- + mesonbuild/scripts/meson_install.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py +index f895f17d..1414ace2 100644 +--- a/mesonbuild/scripts/meson_install.py ++++ b/mesonbuild/scripts/meson_install.py +@@ -97,6 +97,10 @@ def restore_selinux_contexts(): + # is ignored quietly. + return + ++ if not shutil.which('restorecon'): ++ # If we don't have restorecon, failure is ignored quietly. ++ return ++ + with subprocess.Popen(['restorecon', '-F', '-f-', '-0'], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc: + out, err = proc.communicate(input=b'\0'.join(os.fsencode(f) for f in selinux_updates) + b'\0') +-- +2.14.1 +