From dacf48e9b198b9645cf9c8c5a80ba3d99ae65a3c Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 1 May 2018 22:21:32 +0200 Subject: meson: bump version to 0.46.0 Bump version and drop obsolete patch. Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- ...NotFoundError-when-restorecon-unavailable.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch (limited to 'package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch') diff --git a/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch b/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch deleted file mode 100644 index 3f1ca68dfc..0000000000 --- a/package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -- cgit v1.2.3