[gnome-build-meta/alatiera/debugsym] wip

From: Jordan Petridis <jpetridis src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-build-meta/alatiera/debugsym] wip
Date: Tue, 25 Jan 2022 15:42:18 +0000 (UTC)

commit 5190daa08cde289eaa20e221f7857ef04279b4e3
Author: Jordan Petridis <jordan centricular com>
Date:   Mon Jan 24 18:08:57 2022 +0200

    wip

 elements/boards/pinebook-pro/filesystem.bst   |  2 ++
 elements/boards/raspberrypi-4/filesystem.bst  |  2 ++
 elements/flatpak/platform-arch-libs-debug.bst |  1 +
 elements/flatpak/platform-arch-libs.bst       |  1 +
 elements/flatpak/platform.bst                 |  2 ++
 elements/flatpak/sdk-arch-libs-debug.bst      |  1 +
 elements/flatpak/sdk-arch-libs.bst            |  2 ++
 elements/flatpak/sdk.bst                      |  2 ++
 elements/iso/filesystem.bst                   |  3 ++
 elements/oci/layers/platform.bst              |  2 ++
 elements/oci/layers/sdk.bst                   |  2 ++
 elements/oci/layers/toolbox.bst               |  2 ++
 elements/sdk/webkit2gtk-4.0.bst               |  3 ++
 elements/sdk/webkit2gtk-5.0.bst               |  3 ++
 elements/vm/filesystem-devel.bst              |  8 +++++-
 elements/vm/filesystem.bst                    | 41 ++++++++++++++++++++++++++-
 project.conf                                  |  9 ++++++
 17 files changed, 84 insertions(+), 2 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/filesystem.bst b/elements/boards/pinebook-pro/filesystem.bst
index 76cf9f5cf..5d69504eb 100644
--- a/elements/boards/pinebook-pro/filesystem.bst
+++ b/elements/boards/pinebook-pro/filesystem.bst
@@ -8,3 +8,5 @@ config:
   exclude:
   - devel
   - debug
+  - webkit-debug
+  - source
diff --git a/elements/boards/raspberrypi-4/filesystem.bst b/elements/boards/raspberrypi-4/filesystem.bst
index dc7971aaa..301c1f2b0 100644
--- a/elements/boards/raspberrypi-4/filesystem.bst
+++ b/elements/boards/raspberrypi-4/filesystem.bst
@@ -11,3 +11,5 @@ config:
   exclude:
   - devel
   - debug
+  - webkit-debug
+  - source
diff --git a/elements/flatpak/platform-arch-libs-debug.bst b/elements/flatpak/platform-arch-libs-debug.bst
index c10309bc4..9cb2ea6c1 100644
--- a/elements/flatpak/platform-arch-libs-debug.bst
+++ b/elements/flatpak/platform-arch-libs-debug.bst
@@ -7,6 +7,7 @@ config:
   directory: '%{debugdir}%{libdir}'
   include:
   - debug
+  - webkit-debug
 
   metadata:
     Runtime:
diff --git a/elements/flatpak/platform-arch-libs.bst b/elements/flatpak/platform-arch-libs.bst
index 91e0f18bc..6234bbb42 100644
--- a/elements/flatpak/platform-arch-libs.bst
+++ b/elements/flatpak/platform-arch-libs.bst
@@ -10,6 +10,7 @@ config:
   directory: '%{libdir}'
   exclude:
   - debug
+  - webkit-debug
 
   metadata:
     Runtime:
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 1c03fbd66..d40097fb4 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -11,8 +11,10 @@ config:
   directory: '%{prefix}'
   exclude:
   - debug
+  - webkit-debug
   - docs
   - locale
+  - source
 
   metadata:
     Runtime:
diff --git a/elements/flatpak/sdk-arch-libs-debug.bst b/elements/flatpak/sdk-arch-libs-debug.bst
index 7aecacbea..fe7d8271e 100644
--- a/elements/flatpak/sdk-arch-libs-debug.bst
+++ b/elements/flatpak/sdk-arch-libs-debug.bst
@@ -7,6 +7,7 @@ config:
   directory: '%{debugdir}%{libdir}'
   include:
   - debug
+  - webkit-debug
 
   metadata:
     Runtime:
diff --git a/elements/flatpak/sdk-arch-libs.bst b/elements/flatpak/sdk-arch-libs.bst
index 6dad9c353..2698f9d4a 100644
--- a/elements/flatpak/sdk-arch-libs.bst
+++ b/elements/flatpak/sdk-arch-libs.bst
@@ -6,6 +6,8 @@ depends:
 config:
   directory: '%{libdir}'
   exclude:
+  - source
+  - webkit-debug
   - debug
 
   metadata:
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index ef18e78e6..61d12f1dc 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -13,8 +13,10 @@ config:
   directory: '%{prefix}'
   exclude:
   - debug
+  - webkit-debug
   - docs
   - locale
+  - source
 
   metadata:
     Runtime:
diff --git a/elements/iso/filesystem.bst b/elements/iso/filesystem.bst
index b1b2ba93a..c862be00e 100644
--- a/elements/iso/filesystem.bst
+++ b/elements/iso/filesystem.bst
@@ -5,5 +5,8 @@ build-depends:
 
 config:
   exclude:
+  - doc
   - devel
   - debug
+  - webkit-debug
+  - source
diff --git a/elements/oci/layers/platform.bst b/elements/oci/layers/platform.bst
index 38acf8f12..54dc7cde2 100644
--- a/elements/oci/layers/platform.bst
+++ b/elements/oci/layers/platform.bst
@@ -7,8 +7,10 @@ build-depends:
 config:
   exclude:
   - debug
+  - webkit-debug
   - devel
   - doc
   - locale
   - extra
+  - source
   - vm-only
diff --git a/elements/oci/layers/sdk.bst b/elements/oci/layers/sdk.bst
index df6546778..a4ccdc1c9 100644
--- a/elements/oci/layers/sdk.bst
+++ b/elements/oci/layers/sdk.bst
@@ -6,7 +6,9 @@ build-depends:
 config:
   exclude:
   - debug
+  - webkit-debug
   - locale
   - extra
+  - source
   - static-blocklist
   - vm-only
diff --git a/elements/oci/layers/toolbox.bst b/elements/oci/layers/toolbox.bst
index e0e9673aa..baf48051e 100644
--- a/elements/oci/layers/toolbox.bst
+++ b/elements/oci/layers/toolbox.bst
@@ -6,8 +6,10 @@ build-depends:
 config:
   exclude:
   - debug
+  - webkit-debug
   - doc
   - locale
   - extra
+  - source
   - static-blocklist
   - vm-only
diff --git a/elements/sdk/webkit2gtk-4.0.bst b/elements/sdk/webkit2gtk-4.0.bst
index 0aaf8bdde..51d0b50ab 100644
--- a/elements/sdk/webkit2gtk-4.0.bst
+++ b/elements/sdk/webkit2gtk-4.0.bst
@@ -23,3 +23,6 @@ public:
         (>):
         - '%{libdir}/libjavascriptcoregtk-4.0.so'
         - '%{libdir}/libwebkit2gtk-4.0.so'
+      webkit-debug:
+      - '%{debugdir}'
+      - '%{debugdir}/**'
diff --git a/elements/sdk/webkit2gtk-5.0.bst b/elements/sdk/webkit2gtk-5.0.bst
index c88768c9f..0db05b292 100644
--- a/elements/sdk/webkit2gtk-5.0.bst
+++ b/elements/sdk/webkit2gtk-5.0.bst
@@ -21,3 +21,6 @@ public:
         (>):
         - '%{libdir}/libjavascriptcoregtk-5.0.so'
         - '%{libdir}/libwebkit2gtk-5.0.so'
+      webkit-debug:
+      - '%{debugdir}'
+      - '%{debugdir}/**'
diff --git a/elements/vm/filesystem-devel.bst b/elements/vm/filesystem-devel.bst
index efbf2ef4b..2fc4079c9 100644
--- a/elements/vm/filesystem-devel.bst
+++ b/elements/vm/filesystem-devel.bst
@@ -5,6 +5,12 @@ build-depends:
 - vm/initramfs.bst
 - vm/manifest-devel.bst
 
+public:
+  bst:
+    integration-commands:
+    - rm -r %{sourcedir}
+
 config:
   exclude:
-  - debug
+  - webkit-debug
+  - source
diff --git a/elements/vm/filesystem.bst b/elements/vm/filesystem.bst
index 287a113ba..0a75ad5e4 100644
--- a/elements/vm/filesystem.bst
+++ b/elements/vm/filesystem.bst
@@ -5,7 +5,46 @@ build-depends:
 - vm/initramfs.bst
 - vm/manifest.bst
 
+public:
+  bst:
+    integration-commands:
+    # FIXME: we inherit fd.o sources
+    - rm -rv '%{sourcedir}'
+    - rm -rv '%{debugdir}/dwz'
+
+    - rm -rv '%{debugdir}%{libexecdir}/installed-tests'
+    - rm -rv '%{debugdir}%{libexecdir}/gcc'
+
+    # for -devel
+    # - rm -r '%{debugdir}%{libexecdir}/valgrind'
+    # - rm '%{debugdir}%{bindir}/ctest.debug'
+    # - rm '%{debugdir}%{bindir}/cpack.debug'
+    # - rm '%{debugdir}%{bindir}/cmake.debug'
+    # - rm '%{debugdir}%{bindir}/ccmake.debug'
+    # - rm '%{debugdir}%{bindir}/c-index-test.debug'
+    # - rm '%{debugdir}%{bindir}/llvm-exegesis.debug'
+    # - rm '%{debugdir}%{bindir}/gdb.debug'
+    # - rm '%{debugdir}%{bindir}/dwp.debug'
+    # - rm '%{debugdir}%{bindir}/ccache.debug'
+
+    - rm '%{debugdir}%{bindir}/lto-dump.debug'
+    - rm '%{debugdir}%{bindir}/gs.debug'
+    - rm '%{debugdir}%{bindir}/gpcl6.debug'
+    - rm '%{debugdir}%{bindir}/gxps.debug'
+    - rm '%{debugdir}%{bindir}/fish_indent.debug'
+    - rm '%{debugdir}%{bindir}/fish.debug'
+    - rm '%{debugdir}%{bindir}/fish_key_reader.debug'
+    - rm '%{debugdir}%{bindir}/smbtorture.debug'
+    - rm '%{debugdir}%{bindir}/gen_binary_files.debug'
+
+    # FIXME:
+    # /usr/doc/libgfbgraph exists
+    # gtk-doc/html/{gio, glib, gobject, libxml2, orc} still exist, inherited from fd.o?
+    - rm -rv '%{datadir}/gtk-doc'
+
 config:
   exclude:
+  - source
+  - doc
   - devel
-  - debug
+  - webkit-debug
diff --git a/project.conf b/project.conf
index c2307c8b9..0946d381a 100644
--- a/project.conf
+++ b/project.conf
@@ -146,6 +146,15 @@ split-rules:
     - '%{datadir}/installed-tests/**'
     - '%{libexecdir}/installed-tests'
     - '%{libexecdir}/installed-tests/**'
+  doc:
+    (>):
+    - '%{datadir}/gtk-doc'
+    - '%{datadir}/gtk-doc/**'
+  source:
+  - '%{sourcedir}'
+  - '%{sourcedir}/**'
+  - '%{debugdir}/dwz'
+  - '%{debugdir}/dwz/**'
   vm:
   - '%{datadir}/dbus-1/**'
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]