Bumping mircommon, miral, and mirserver sonames for mircookie work #3178

mattkae · 2024-01-09T16:27:34Z

No description provided.

AlanGriffiths

Thanks for trying, but you're not done yet!

For the libs you've touched, there need to be changes to libmiral6.symbols

And there are more libs to touch: I think that mircore is the only ABI that isn't being broken.

For example, miroil depends on mircommon. So a process needs to be able to load a consistent versions of both libraries. That is only possible with a bump to the miroil .soname.

The same applies to, for example, platforms

AlanGriffiths · 2024-01-09T16:57:19Z

src/miral/regenerate-miral-symbols-map.py

@@ -81,7 +81,7 @@ def _report(publish, symbol):
    else:
        print('NOPUBLISH: {}'.format(symbol))

-OLD_STANZAS = '''MIRAL_4.0 {
+OLD_STANZAS = '''MIRAL_4.1 {


We should be going to MIRAL_5.0

AlanGriffiths · 2024-01-09T17:01:43Z

src/miral/regenerate-miral-symbols-map.py

 global:'''

 END_NEW_STANZA = '''
-} MIRAL_4.0;
+} MIRAL_4.1;


We need to clear these symbols from the script and let it fill in the current stanza. See 8e3130d for an example

AlanGriffiths · 2024-01-09T17:02:39Z

src/server/symbols.map

-MIR_SERVER_2.15 {
+MIR_SERVER_2.16 {


MIR_SERVER_2.17 - 2.16 has already been released

Cool! Why did it say 2.15? Because we didn't introduce any new symbols on the prev release?

Exactly - the stanza is the release the symbol was introduce to the current .soname

AlanGriffiths · 2024-01-09T17:03:22Z

src/common/symbols.map

@@ -1,4 +1,4 @@
-MIR_COMMON_2.8 {
+MIR_COMMON_2.15 {


MIR_SERVER_2.17 - 2.15 has already been released

AlanGriffiths · 2024-01-09T17:03:45Z

src/CMakeLists.txt

 set(MIRAL_VERSION_MAJOR 4)
-set(MIRAL_VERSION_MINOR 1)
+set(MIRAL_VERSION_MINOR 2)


5.0, not 4.2

mattkae · 2024-01-09T19:07:21Z

For the libs you've touched, there need to be changes to libmiral6.symbols

Do I do this part by hand?

For example, miroil depends on mircommon. So a process needs to be able to load a consistent versions of both libraries. That is only possible with a bump to the miroil .soname.

The same applies to, for example, platforms

Kk makes sense!

mattkae · 2024-01-09T19:12:35Z

@AlanGriffiths does that include mirwayland?

AlanGriffiths · 2024-01-10T09:32:19Z

@AlanGriffiths does that include mirwayland?

target_link_libraries(mirwayland
  PUBLIC
    mircore
    PkgConfig::WAYLAND_SERVER
  PRIVATE
    mircommon
)

AlanGriffiths · 2024-01-10T09:42:28Z

For the libs you've touched, there need to be changes to libmiral6.symbols

Do I do this part by hand?

The check-and-update-debian-symbols.py (runs as part of a build) adds missing symbols. So just strip all the symbols and cmake -B ....

codecov · 2024-01-10T18:46:05Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (63f79d9) 77.80% compared to head (9f79f3b) 77.81%.

❗ Current head 9f79f3b differs from pull request most recent head f58f79c. Consider uploading reports for the commit f58f79c to get more accurate results

Additional details and impacted files

@@                    Coverage Diff                     @@
##           feature/remove_mir_cookie    #3178   +/-   ##
==========================================================
  Coverage                      77.80%   77.81%           
==========================================================
  Files                           1062     1062           
  Lines                          74626    74650   +24     
==========================================================
+ Hits                           58063    58087   +24     
  Misses                         16563    16563

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

AlanGriffiths

We also need to bump the platform ABIs

MIR_SERVER_INPUT_PLATFORM_ABI
MIR_SERVER_GRAPHICS_PLATFORM_ABI

AlanGriffiths · 2024-01-11T09:25:45Z

src/miroil/symbols.map

There's a regenerate-miroil-symbols-map.py (and build target) too

RAOF · 2024-01-12T08:19:32Z

I am confused by the failures here. It looks like miroil symbols used to be just ignored (libmiroil3.symbols when the library was libmiroil.so.4), and the miroil symbols diff is removing and then adding back the same symbols.

I'll have another look on Monday if this still fails. Hopefully I'll be fresher then!

AlanGriffiths

I think part of the problem is #3184

src/miroil/symbols.map

AlanGriffiths · 2024-01-12T12:51:02Z

@mattkae leave this a bit. I'm debugging the helper stuff

AlanGriffiths · 2024-01-12T14:29:15Z

@mattkae I have to dive into #3185 now, so good luck. (I've fixed some things, but the proof will be in CI. )

Some useful incantations for running the symbol (re)generation scripts:

cmake --build cmake-build-release --target regenerate-miral-symbols-map
cmake --build cmake-build-release --target regenerate-miral-debian-symbols

cmake --build cmake-build-release --target regenerate-miroil-symbols-map
cmake --build cmake-build-release --target check-miroil-symbols

mattkae · 2024-01-12T20:23:29Z

@AlanGriffiths Ok i think this is good to go again. The symbols that were bumped are:

miral
miroil
mircommon
mirserver
mirwayland
mir-platform-graphics-*
mir-platform-rendering
mir-platform-input-*

Am I missing anything?

AlanGriffiths

Am I missing anything?

target_link_libraries(mirplatform
  PRIVATE
    mircommon
    ${MIR_PLATFORM_REFERENCES}
  PUBLIC
    PkgConfig::EPOXY
)

So, libmirplatform also needs an soname bump

Bumping mircommon, miral, and mirserver sonames for mircookie work

893217d

mattkae requested a review from AlanGriffiths January 9, 2024 16:36

mattkae marked this pull request as ready for review January 9, 2024 16:36

AlanGriffiths requested changes Jan 9, 2024

View reviewed changes

pr feedback

3aaa619

mattkae added 3 commits January 10, 2024 11:37

bump to libmiral7

3938bda

miroil + wayland symbols

6d65377

libwayland

4bc086e

mattkae force-pushed the feature/remove_mir_cookie_sonames branch from 5e7bf68 to 4bc086e Compare January 10, 2024 16:52

Update control files

8b8c86a

debian rules referencing libmiral6

7f54fb7

AlanGriffiths requested changes Jan 11, 2024

View reviewed changes

src/miroil/symbols.map

Copy link

Collaborator

AlanGriffiths Jan 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a regenerate-miroil-symbols-map.py (and build target) too

mattkae added 8 commits January 11, 2024 09:29

Bumping graphics + input versions

31ce40c

tools/update_package_abis.sh

24c8ecb

Miroil proper versioning

76c1130

bump back down to 3.0 my bad

5bc41a7

Bump to v 17

f4f3345

Fixing one debian symbol

389f69c

Going to miroil 5 because that is indeed next

94b1340

5 to 7 for miral

c89e3ce

AlanGriffiths requested changes Jan 12, 2024

View reviewed changes

src/miroil/symbols.map Show resolved Hide resolved

AlanGriffiths added 2 commits January 12, 2024 13:02

Update miroil symbols stanza

7fb7cd8

Fix check-miroil-symbols

4f2744c

AlanGriffiths added 3 commits January 12, 2024 13:04

regenerate mir{a,oi}l symbols.map

85b0364

regenerate libmiroil5.symbols

163d109

regenerate libmiral7.symbols

9f79f3b

mattkae requested a review from AlanGriffiths January 12, 2024 20:25

AlanGriffiths requested changes Jan 16, 2024

View reviewed changes

AlanGriffiths mentioned this pull request Jan 16, 2024

feature: remove mir cookie #3176

Merged

bumping libmirplatform to 28

f58f79c

AlanGriffiths merged commit 34d87fd into feature/remove_mir_cookie Jan 16, 2024
23 of 24 checks passed

AlanGriffiths deleted the feature/remove_mir_cookie_sonames branch January 16, 2024 17:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bumping mircommon, miral, and mirserver sonames for mircookie work #3178

Bumping mircommon, miral, and mirserver sonames for mircookie work #3178

mattkae commented Jan 9, 2024

AlanGriffiths left a comment

AlanGriffiths Jan 9, 2024

AlanGriffiths Jan 9, 2024

AlanGriffiths Jan 9, 2024

mattkae Jan 9, 2024

AlanGriffiths Jan 10, 2024

AlanGriffiths Jan 9, 2024

AlanGriffiths Jan 9, 2024

mattkae commented Jan 9, 2024

mattkae commented Jan 9, 2024

AlanGriffiths commented Jan 10, 2024

AlanGriffiths commented Jan 10, 2024

codecov bot commented Jan 10, 2024 •

edited

Loading

AlanGriffiths left a comment

AlanGriffiths Jan 11, 2024

RAOF commented Jan 12, 2024

AlanGriffiths left a comment

AlanGriffiths commented Jan 12, 2024

AlanGriffiths commented Jan 12, 2024

mattkae commented Jan 12, 2024

AlanGriffiths left a comment

		MIR_SERVER_2.15 {
		MIR_SERVER_2.16 {

		@@ -1,4 +1,4 @@
		MIR_COMMON_2.8 {
		MIR_COMMON_2.15 {

Bumping mircommon, miral, and mirserver sonames for mircookie work #3178

Bumping mircommon, miral, and mirserver sonames for mircookie work #3178

Conversation

mattkae commented Jan 9, 2024

AlanGriffiths left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mattkae commented Jan 9, 2024

mattkae commented Jan 9, 2024

AlanGriffiths commented Jan 10, 2024

AlanGriffiths commented Jan 10, 2024

codecov bot commented Jan 10, 2024 • edited Loading

Codecov Report

AlanGriffiths left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RAOF commented Jan 12, 2024

AlanGriffiths left a comment

Choose a reason for hiding this comment

AlanGriffiths commented Jan 12, 2024

AlanGriffiths commented Jan 12, 2024

mattkae commented Jan 12, 2024

AlanGriffiths left a comment

Choose a reason for hiding this comment

codecov bot commented Jan 10, 2024 •

edited

Loading