Merge pull request #479 from andreas-schwab/master

Fix pattern for debuginfo packages in baselibs_global.conf
openSUSE · Dec 11, 2018 · c7e17f1 · c7e17f1
2 parents e12f613 + 2aa795d
commit c7e17f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/baselibs_configs/baselibs_global-sle15.conf b/baselibs_configs/baselibs_global-sle15.conf
@@ -42,5 +42,5 @@ post "/sbin/ldconfig"
 
 package /(.*)-debuginfo$/
 targetname <match1>-<targettype>-debuginfo
-+/usr/lib(64|ilp32)?/debug/.*/lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)\.debug$
-+/usr/lib(64|ilp32)?/debug/.build-id/.*
++/usr/lib/debug/(.*/)?lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)(-.*-.*\..*)?\.debug$
++/usr/lib/debug/\.build-id/.*
diff --git a/baselibs_configs/baselibs_global.conf b/baselibs_configs/baselibs_global.conf
@@ -42,5 +42,5 @@ post "/sbin/ldconfig"
 
 package /(.*)-debuginfo$/
 targetname <match1>-<targettype>-debuginfo
-+/usr/lib(64|ilp32)?/debug/.*/lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)\.debug$
-+/usr/lib(64|ilp32)?/debug/.build-id/.*
++/usr/lib/debug/(.*/)?lib(64|ilp32)?/.*\.(so\..*|so|o|a|la)(-.*-.*\..*)?\.debug$
++/usr/lib/debug/\.build-id/.*