Set unique names for subpackages in kernel-rt spec #13084

harshitgupta1337 · 2025-03-24T14:46:26Z

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

Summary

Currently, the subpackages python3-perf and bpftools are being built both by the kernel-rt and kernel specs. However, they have the same name - irrespective of which spec file they are built from. This causes the python3-perf RPM built against kernel-rt source-code to override the RPM built against kernel source-code (same for bpftools RPM).

Change Log

Rename the bpftool and python3-perf subpackages to be kernel-specific in each of the kernel type's spec file.
Each of these kernel-specific subpackages will all Provide a dependency with same name as the subpackage's name under default kernel rpm. E.g., Provides: python3-perf for the subpkg python3-perf-rt, etc.
To ensure that the subpackage RPM being installed was built against the OS's kernel, add Conflicts with other kernel types in the spec files.

Does this affect the toolchain?

YES

Test Methodology

The proposed changes were tested by ensuring that when an image is built with a given kernel variant and tuned is to be installed, the right variant of the python3-perf subpackage is installed (depending on which kernel is on the image).

RPMs of different kernel specs (in both SPECS and SPECS-EXTENDED) and tuned were built.
https://dev.azure.com/mariner-org/mariner/_build/results?buildId=834792&view=results
The built RPMs were used to build a modified version of the imageconfigs/core-efi.json image with included tuned package as well along with the original ones. The default kernel for the image was set to one of kernel, kernel-rt, kernel-ipe and kernel-lpg-innovate. In each case, when the tuned package was installed, the toolkit installed the correct variant of the python3-perf package based on the kernel type.

cd azurelinux/toolkit

# Fetch the packages built in the buddy build pipeline and populate the build environment
az pipelines runs artifact download --artifact-name drop_buddy_build_amd64_build_amd64 --run-id 834792 --path ./
sudo make hydrate-rpms PACKAGE_ARCHIVE=./build-artifacts/rpms.tar.gz

# Run for different kernel variants
for kernel in kernel kernel-rt kernel-ipe kernel-lpg-innovate; do
      cfg=./imageconfigs/core-efi-${kernel}.json
      # Update the default kernel in the kernel config
      cat imageconfigs/core-efi.json | jq ".SystemConfigs[0].KernelOptions.default=\"${kernel}\"" > $cfg
      sudo make image REBUILD_TOOLS=y REBUILD_PACKAGES=n \
              REBUILD_TOOLCHAIN=n QUICK_REBUILD=n DAILY_BUILD_ID=lkg CONFIG_FILE=$cfg
      # Rename the logfile
      sudo mv /home/ubuntu/git/azurelinux/build/logs/imggen/imager.log imager-${kernel}.log
done

After the above script is run, upon inspection of the imager-kernel-rt.log file, it contains the following logs, indicating that python3-perf-rt package was installed as a dependency for tuned.

time="2025-06-12T19:24:38-07:00" level=debug msg="Executing: [tdnf install --releasever=3.0 --assumeno --nogpgcheck tuned --installroot /installroot]"
time="2025-06-12T19:24:38-07:00" level=debug msg="Error(1032) : Operation aborted."
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: hdparm-9.65-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libXau-1.0.11-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libX11-common-1.8.7-1.azl3.noarch"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: brotli-1.1.0-2.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: gobject-introspection-1.78.1-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: pixman-0.43.2-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libxcb-1.16-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libpng-1.6.40-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libXrender-0.9.11-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libXext-1.3.5-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libX11-1.8.7-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: freetype-2.13.2-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: fontconfig-2.14.2-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: dmidecode-3.6-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: libtraceevent-1.8.2-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-gobject-base-3.46.0-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-cairo-1.24.0-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: cairo-gobject-1.18.0-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: cairo-1.18.0-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: duktape-2.7.0-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: virt-what-1.25-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-schedutils-0.6-13.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-pyudev-0.24.1-1.azl3.noarch"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-perf-rt-6.6.85.1-2.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-linux-procfs-0.6.1-9.azl3.noarch"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-gobject-3.46.0-1.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-decorator-5.1.1-2.azl3.noarch"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: python3-dbus-1.2.16-3.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: polkit-123-2.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: ethtool-6.4-2.azl3.x86_64"
time="2025-06-12T19:24:38-07:00" level=debug msg="Added installedPackages entry for: tuned-2.21.0-2.azl3.noarch"

christopherco · 2025-03-27T17:48:25Z

SPECS/tuned/tuned.spec

@@ -36,7 +36,7 @@ Requires: python3-configobj
 Requires: python3-dbus 
 Requires: python3-decorator
 Requires: python3-linux-procfs
-Requires: python3-perf
+Requires: (python3-perf or python3-perf-rt)


@dmcilvaney what is our graph's behavior for this kind of "or" for one package built in specs and another built in specs-extended, but we're only building our core specs?

I'll double check, but I believe it takes the pessimistic approach and ensures both are built. I'll need to figure out what the scheduler picks though.

So, if one is simply not available (ie extended), it may cause an unresolved package issue.

I queued https://dev.azure.com/mariner-org/mariner/_build/results?buildId=773396&view=results to double check experimentally as well.

I also queued off a buddy build for tuned and it does have an "unresolved dependency" failure on python3-perf-rt missing, even though tuned went ahead and was built.

https://dev.azure.com/mariner-org/mariner/_build/results?buildId=773389&view=logs&j=bac295d9-f2e0-5165-e63e-e76f383e1a27&t=11f6dde0-e75e-52b2-fbf0-d83a00678fa3

christopherco

Change currently causes a build failure. Evaluating alternatives

christopherco · 2025-03-27T18:09:44Z

SPECS/tuned/tuned.spec

@@ -36,7 +36,7 @@ Requires: python3-configobj
 Requires: python3-dbus 
 Requires: python3-decorator
 Requires: python3-linux-procfs
-Requires: python3-perf
+Requires: (python3-perf or python3-perf-rt)


@rlmenge @harshitgupta1337 have you evaluated if we could keep this as Requires: python3-perf and instead do a Provides: python3-perf from within the various kernel specs?

If that method works, it would be more sustainable than always needing to keep this Requires: (<package> or <package2> ...) method for each kernel package added or removed

I agree that the method you propose would be a more sustainable method of managing this dependency of tuned.
However, if we do that - and then try installing tuned from a system running kernel-rt, how would we enforce the selection of python3-perf-rt (part of kernel-rt.spec) and not python3-perf (part of kernel.spec) ?
In the PR created by @rlmenge (#5897 ), each kernel spec has a conflict with every other kernel spec - could be a solution by enforcing that only python3-perf-rt would be installed because installing python3-perf would require kernel which conflicts with already installed kernel-rt.

Hi @christopherco , I have tried the same approach that @rlmenge used in #5897 and tested it with an image build using AzureLinux toolkit with default kernel set to one of kernel, kernel-rt, and kernel-ipe. In each case, the tuned package was installed, which installed the correct type of python3-perf package based on the kernel type. I used the RPMs built by this buddy build pipeline (which failed in the License Check step): https://dev.azure.com/mariner-org/mariner/_build/results?buildId=785103&view=results

SPECS-EXTENDED/kernel-rt/kernel-rt.spec

Copilot

Copilot reviewed 4 out of 11 changed files in this pull request and generated no comments.

Files not reviewed (7)

SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec: Language not supported
SPECS-EXTENDED/kernel-rt/kernel-rt.spec: Language not supported
SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec: Language not supported
SPECS-SIGNED/kernel-signed/kernel-signed.spec: Language not supported
SPECS/kernel-64k/kernel-64k.spec: Language not supported
SPECS/kernel-headers/kernel-headers.spec: Language not supported
SPECS/kernel/kernel.spec: Language not supported

rlmenge

There are recent changes to the OOT specs so these are no longer required to be bumped #13645.

Additionally looking to confirm image builds occcur as expected

harshitgupta1337 · 2025-06-13T16:32:14Z

Change currently causes a build failure. Evaluating alternatives

@christopherco The build failure was likely due to the boolean OR expression in the Requires directive of tuned. With the updated approach, tuned requires simply python3-perf, and each kernel variant produces a subpackage (e.g., python3-perf-ipe, python3-perf-64k that provides python3-perf. The Conflict directives and the dependency of the python3-perf subpackage on its kernel ensure that only the current kernel's matching subpackage is installed to satisfy tuned.

The RPMs build successfully, as evidenced by the following pipeline runs:

[AMD64-2-OneBranch]-Dev-BuildRpms](https://dev.azure.com/mariner-org/mariner/_build/results?buildId=833448&view=results)
OneBranch-Unified-Buddy-Build

Furthermore, I have validated that upon installing tuned, the right subpackage is installed (based on the current kernel). A description of the testing process is in this PR's description.

… subpkgs

harshitgupta1337 · 2025-06-17T00:00:57Z

@christopherco @rlmenge I had to push some new commits due to a rebase. The PR is ready for review.
Please check this comment and the PR description for details about the approach and testing process.

harshitgupta1337 · 2025-06-17T13:18:15Z

Testing after recent rebase:

BuildRpms pipeline succeeds https://dev.azure.com/mariner-org/mariner/_build/results?buildId=838575&view=results
Building core-efi image with tuned package and different kernel variants results in the correct variant of python3-perf subpackage being installed (based on the kernel variant).

dmcilvaney

I think this approach should work. Might want to double check on a VM/Container that it doesn't swap the kernel or something, but otherwise lgtm.

microsoft-github-policy-service bot added Packaging specs-extended PR to fix SPECS-EXTENDED 3.0-dev PRs Destined for AzureLinux 3.0 labels Mar 24, 2025

harshitgupta1337 marked this pull request as ready for review March 24, 2025 23:13

harshitgupta1337 requested review from a team as code owners March 24, 2025 23:13

rlmenge approved these changes Mar 26, 2025

View reviewed changes

christopherco reviewed Mar 27, 2025

View reviewed changes

christopherco requested changes Mar 27, 2025

View reviewed changes

christopherco reviewed Mar 27, 2025

View reviewed changes

PawelWMS reviewed Mar 28, 2025

View reviewed changes

SPECS-EXTENDED/kernel-rt/kernel-rt.spec Outdated Show resolved Hide resolved

harshitgupta1337 force-pushed the guptaharshit/kernel-rt-subpkgs-conflict branch from 2c04318 to 61558cf Compare April 11, 2025 15:50

christopherco requested a review from Copilot April 15, 2025 02:56

Copilot AI reviewed Apr 15, 2025

View reviewed changes

harshitgupta1337 force-pushed the guptaharshit/kernel-rt-subpkgs-conflict branch from 10675b8 to f200d6f Compare April 25, 2025 14:44

rlmenge requested changes Jun 10, 2025

View reviewed changes

harshitgupta1337 force-pushed the guptaharshit/kernel-rt-subpkgs-conflict branch from 1a90328 to 19c1079 Compare June 11, 2025 12:57

rlmenge approved these changes Jun 13, 2025

View reviewed changes

harshitgupta1337 requested a review from christopherco June 13, 2025 19:15

Harshit Gupta added 10 commits June 16, 2025 13:38

Use unique names for subpkgs built in kernel-rt spec

5bc67c2

Revert tuned.spec

0386a38

Add conflicts across kernel specs that build bpftool and python3-perf…

4b4e15e

… subpkgs

Update changelog and requires

29ca509

Bump kernel-headers to match kernel

560d09d

Bump kernel-cross-headers in toolchain manifest

f250eec

Bump signed kernel-64k,kernel

9a8f4d6

Upgrade release of entangled specs

dffe8aa

Add conflicts for kernel-lpg-innovate

19cb16c

Fix rleease mismatch in entangled specs

405cb27

Harshit Gupta added 3 commits June 16, 2025 13:45

Add missing changes in kernel-lpg-innovate.spec

2eec4c5

Remove lingering last-known-kernel variable from OOT specs

fc73bff

Bump kernel-uki-signed

d10c0fa

harshitgupta1337 force-pushed the guptaharshit/kernel-rt-subpkgs-conflict branch from dcb484a to d10c0fa Compare June 16, 2025 20:48

Harshit Gupta added 2 commits June 16, 2025 13:50

Bump kernel-signed release

4cbcfeb

Bump kernel-headers version in toolchain and pkggen manifests

d8081a1

rlmenge approved these changes Jun 17, 2025

View reviewed changes

dmcilvaney approved these changes Jun 17, 2025

View reviewed changes

christopherco approved these changes Jun 17, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Set unique names for subpackages in kernel-rt spec #13084

Set unique names for subpackages in kernel-rt spec #13084

Uh oh!

harshitgupta1337 commented Mar 24, 2025 •

edited

Loading

Uh oh!

christopherco Mar 27, 2025

Uh oh!

dmcilvaney Mar 27, 2025 •

edited

Loading

Uh oh!

dmcilvaney Mar 27, 2025

Uh oh!

christopherco Mar 27, 2025

Uh oh!

christopherco left a comment

Uh oh!

christopherco Mar 27, 2025

Uh oh!

harshitgupta1337 Mar 28, 2025 •

edited

Loading

Uh oh!

harshitgupta1337 Apr 11, 2025 •

edited

Loading

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

rlmenge left a comment

Uh oh!

harshitgupta1337 commented Jun 13, 2025

Uh oh!

harshitgupta1337 commented Jun 17, 2025

Uh oh!

harshitgupta1337 commented Jun 17, 2025

Uh oh!

dmcilvaney left a comment

Uh oh!

Uh oh!

Set unique names for subpackages in kernel-rt spec #13084

Are you sure you want to change the base?

Set unique names for subpackages in kernel-rt spec #13084

Uh oh!

Conversation

harshitgupta1337 commented Mar 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Checklist

Summary

Change Log

Does this affect the toolchain?

Test Methodology

Uh oh!

christopherco Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

dmcilvaney Mar 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmcilvaney Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

christopherco Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

christopherco left a comment

Choose a reason for hiding this comment

Uh oh!

christopherco Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

harshitgupta1337 Mar 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

harshitgupta1337 Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

rlmenge left a comment

Choose a reason for hiding this comment

Uh oh!

harshitgupta1337 commented Jun 13, 2025

Uh oh!

harshitgupta1337 commented Jun 17, 2025

Uh oh!

harshitgupta1337 commented Jun 17, 2025

Uh oh!

dmcilvaney left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

harshitgupta1337 commented Mar 24, 2025 •

edited

Loading

dmcilvaney Mar 27, 2025 •

edited

Loading

harshitgupta1337 Mar 28, 2025 •

edited

Loading

harshitgupta1337 Apr 11, 2025 •

edited

Loading