Andreas Boll pushed to branch debian-unstable at X Strike Force / lib / mesa


Commits:
18626476 by Eric Engestrom at 2019-05-11T12:40:36Z
meson: remove meson-created megadrivers symlinks

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110356
Fixes: aa7afe324c2092fb31f9 "meson: strip rpath from megadrivers"
Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
Tested-by: Mike Lothian <m...@fireburn.co.uk>
Reviewed-by: Eric Anholt <e...@anholt.net>
(cherry picked from commit c77acc3ceba711ec3790fb674aeb8c6a25433741)

- - - - -
2b52a488 by Andreas Boll at 2019-05-11T12:42:42Z
Document the cherry-pick in debian/changelog

- - - - -
b7adac7f by Andreas Boll at 2019-05-11T13:43:24Z
Upload to unstable

- - - - -


2 changed files:

- bin/install_megadrivers.py
- debian/changelog


Changes:

=====================================
bin/install_megadrivers.py
=====================================
@@ -70,7 +70,14 @@ def main():
                 name, ext = os.path.splitext(name)
         finally:
             os.chdir(ret)
+
+    # Remove meson-created master .so and symlinks
     os.unlink(master)
+    name, ext = os.path.splitext(master)
+    while ext != '.so':
+        if os.path.lexists(name):
+            os.unlink(name)
+        name, ext = os.path.splitext(name)
 
 
 if __name__ == '__main__':


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mesa (18.3.6-2) unstable; urgency=medium
+
+  * Cherry-pick c77acc3ceba (meson: remove meson-created megadrivers
+    symlinks) from upstream master branch. Removes a broken symlink
+    (Closes: #926857).
+
+ -- Andreas Boll <ab...@debian.org>  Sat, 11 May 2019 15:43:07 +0200
+
 mesa (18.3.6-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/compare/1781ca7e79fa6f7d6310217c29a7cea3b0728efc...b7adac7fa63e9320ee519bc2297b0cc08fe53858

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/compare/1781ca7e79fa6f7d6310217c29a7cea3b0728efc...b7adac7fa63e9320ee519bc2297b0cc08fe53858
You're receiving this email because of your account on salsa.debian.org.

Reply via email to