Fix package distribution. Specify OS explicitly #4434
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4434 +/- ##
==========================================
- Coverage 86.49% 85.80% -0.69%
==========================================
Files 56 56
Lines 15508 15508
==========================================
- Hits 13413 13306 -107
- Misses 2095 2202 +107 ☔ View full report in Codecov by Sentry. |
scripts/make-packages.sh
Outdated
| @@ -184,6 +184,12 @@ if [ "$OS" == "linux" ]; then | |||
| FILES="${FILES} ${ARTIFACTS}/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}=/usr/${LIBDIR}/libmsquic.lttng.${LIBEXT}.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" | |||
| fi | |||
|
|
|||
| # XDP means Ubuntu 24.04 which installs libssl3t64 instead of libssl3 | |||
There was a problem hiding this comment.
Is there a case where we build a package for ubuntu 24.04 without depending on XDP?
| } else { | ||
| & $RootDir/scripts/make-packages.sh --output $DistDir --tls $Tls --ubuntu $UbuntuVersion # x64 | ||
| & $RootDir/scripts/make-packages.sh --output $DistDir --tls $Tls --xdp $UseXdp --time64 $Time64Distro # x64 |
There was a problem hiding this comment.
like I said, this is only requirement for armhf for now, but I believe it's fine to keep it as-is, since all architectures of Ubuntu24.04 is already installing libssl3t64 if you try to install libssl3
| } else { | ||
| & $RootDir/scripts/make-packages.sh --output $DistDir --tls $Tls --ubuntu $UbuntuVersion # x64 | ||
| & $RootDir/scripts/make-packages.sh --output $DistDir --tls $Tls --xdp $UseXdp --time64 $Time64Distro # x64 |
There was a problem hiding this comment.
Honestly, I don't see a fundamental difference between UbuntuVersion when it's ubuntu and UseXdp and Time64Distro. They are basically the same thing and make-packages.sh actually assumes that XDP is ubuntu 24.04.
They knobs would make sense if you pass the correct value to them from here.
For example, for arm, we don't pass --xdp but we pass --time64 because we don't build xdp for arm but if $Time64Distro is true, we use the t64 version of libssl3.
The current code basically creates 2 aliases for ubuntu24.04.
* Pass OS information explicitly to package-distribution * libssl3 variants for ubuntu24.04 * detail flag for time64
Description
Checking artifact directory name doesn't work for identifying Ubuntu version for XDP build.
Testing
locally done and used internal repo
Documentation
N/A