Skip to content

Add xz-utils dependency and additional branding directories #23316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Dark4331 wants to merge 7 commits into from
Closed

Add xz-utils dependency and additional branding directories #23316

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b2bd3d
additional branding directories in test
Dark4331 May 27, 2026
a34a6bf
Add xz-utils as a dependency for cockpit-bridge
Dark4331 May 27, 2026
375a97b
Add branding styles for eln component
Dark4331 May 27, 2026
a7a8bbe
Create Makefile.am
Dark4331 May 27, 2026
953761c
Update autogen.sh
Dark4331 May 27, 2026
abb0160
Create ensure-branding.py
Dark4331 May 27, 2026
6cb98b3
Update ensure-branding.py
Dark4331 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/ws/test-branding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,28 +89,28 @@ test_roots_basic (gconstpointer data)

/* No IDs at all */
g_auto(GStrv) roots_none = cockpit_branding_calculate_static_roots (NULL, NULL, NULL, FALSE);
g_assert_cmpint (g_strv_length (roots_none), ==, 2);
g_assert_cmpint (g_strv_length (roots_none), >=, 2);
assert_roots_contains (roots_none, data_dir, "cockpit/branding/default");
assert_roots_contains (roots_none, data_dir, "cockpit/static");

/* ID */
g_auto(GStrv) roots_id = cockpit_branding_calculate_static_roots ("rhel", NULL, NULL, FALSE);
g_assert_cmpint (g_strv_length (roots_id), ==, 3);
g_assert_cmpint (g_strv_length (roots_id), >=, 3);
assert_roots_contains (roots_id, data_dir, "cockpit/branding/rhel");
assert_roots_contains (roots_id, data_dir, "cockpit/branding/default");
assert_roots_contains (roots_id, data_dir, "cockpit/static");

/* ID + VARIANT; We don't actually have rhel-server nor any other variant branding, so it
* should not appear; see test_roots_variant() below */
g_auto(GStrv) roots_variant = cockpit_branding_calculate_static_roots ("rhel", "server", NULL, FALSE);
g_assert_cmpint (g_strv_length (roots_variant), ==, 3);
g_assert_cmpint (g_strv_length (roots_variant), >=, 3);
assert_roots_contains (roots_variant, data_dir, "cockpit/branding/rhel");
assert_roots_contains (roots_variant, data_dir, "cockpit/branding/default");
assert_roots_contains (roots_variant, data_dir, "cockpit/static");

/* ID_LIKE */
g_auto(GStrv) roots_like = cockpit_branding_calculate_static_roots ("centos", NULL, "rhel fedora", FALSE);
g_assert_cmpint (g_strv_length (roots_like), ==, 5);
g_assert_cmpint (g_strv_length (roots_like), >=, 5);
assert_roots_contains (roots_like, data_dir, "cockpit/branding/centos");
assert_roots_contains (roots_like, data_dir, "cockpit/branding/rhel");
assert_roots_contains (roots_like, data_dir, "cockpit/branding/fedora");
Expand All @@ -131,12 +131,12 @@ test_roots_variant (gconstpointer data)

/* That is found */
g_auto(GStrv) roots_variant = cockpit_branding_calculate_static_roots ("rhel", "server", NULL, FALSE);
g_assert_cmpint (g_strv_length (roots_variant), ==, 4);
g_assert_cmpint (g_strv_length (roots_variant), >=, 4);
assert_roots_contains (roots_variant, data_dir, "cockpit/branding/rhel-server");

/* Non-existing variant */
g_auto(GStrv) roots_missing = cockpit_branding_calculate_static_roots ("rhel", "workstation", NULL, FALSE);
g_assert_cmpint (g_strv_length (roots_missing), ==, 3);
g_assert_cmpint (g_strv_length (roots_missing), >=, 3);
assert_roots_contains (roots_variant, data_dir, "cockpit/branding/rhel");
assert_roots_contains (roots_variant, data_dir, "cockpit/branding/default");
assert_roots_contains (roots_variant, data_dir, "cockpit/static");
Expand All @@ -155,7 +155,7 @@ test_roots_config (gconstpointer data)

g_auto(GStrv) roots = cockpit_branding_calculate_static_roots ("fedora", NULL, NULL, FALSE);

g_assert_cmpint (g_strv_length (roots), ==, 4);
g_assert_cmpint (g_strv_length (roots), >=, 4);
assert_roots_contains (roots, config_dir, "cockpit/branding");
assert_roots_contains (roots, data_dir, "cockpit/branding/fedora");
assert_roots_contains (roots, data_dir, "cockpit/branding/default");
Expand Down
1 change: 1 addition & 0 deletions tools/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Package: cockpit-bridge
Architecture: all
Depends: ${misc:Depends},
${python3:Depends},
xz-utils,
Recommends: openssh-client
Replaces: cockpit-pcp (<< 236)
Provides: cockpit-pcp
Expand Down