Skip to contentSkip to conversation

meson: bump version to 0.46.0

PATCH New Eric Le Bihan 2 participants 2 messages May 1, 2018 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Eric Le Bihan

author
#0 lore raw

PATCH 1/1 meson: bump version to 0.46.0

Bump version and drop obsolete patch.

Signed-off-by Eric Le Bihan <[email protected]>
---
 ...NotFoundError-when-restorecon-unavailable.patch | 31 ----------------------
 package/meson/meson.hash                           |  4 +--
 package/meson/meson.mk                             |  2 +-
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch
package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch deleted +0 -31
deleted file mode 100644
index 3f1ca68dfc..0000000000
@@ -1,31 +0,0 @@
-From 8edc477b7d7b160004eb700a1b7523237333d9ec Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-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 <[email protected]>
----
- 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
-
package/meson/meson.hash +2 -2
index c460302f00..44785aef29 100644
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-# https://github.com/mesonbuild/meson/releases/download/0.45.0/meson-0.45.0.tar.gz.asc
-sha256	3455abbc30a3fbd9cc8abb6d5fcdc42ce618665b95ac2c3ad7792a4a6ba47ce4	meson-0.45.0.tar.gz
+# https://github.com/mesonbuild/meson/releases/download/0.46.0/meson-0.46.0.tar.gz.asc
+sha256 b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0  meson-0.46.0.tar.gz
 sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30	COPYING
package/meson/meson.mk +1 -1
index 2e0db90236..9b5ca0d5b9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MESON_VERSION = 0.45.0
+MESON_VERSION = 0.46.0
 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
 MESON_LICENSE = Apache-2.0
 MESON_LICENSE_FILES = COPYING
Signature · 1 line
2.14.3
Applied
#1 lore raw

PATCH 1/1 meson: bump version to 0.46.0

Hello,

Quoted 9 lines · Eric Le Bihan

Bump version and drop obsolete patch.

Signed-off-by Eric Le Bihan <[email protected]>
---
 ...NotFoundError-when-restorecon-unavailable.patch | 31 ----------------------
 package/meson/meson.hash                           |  4 +--
 package/meson/meson.mk                             |  2 +-
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 package/meson/0001-Fix-FileNotFoundError-when-restorecon-unavailable.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com