rpm2img: use latest rpm release for inventory

bottlerocket-os · Aug 2, 2024 · 712e09b · 712e09b
1 parent 8f074da
commit 712e09b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/twoliter/embedded/rpm2img b/twoliter/embedded/rpm2img
@@ -196,7 +196,12 @@ if [[ -n "${CORE_KIT_VERSION}" && -n "${CORE_KIT_VENDOR}" ]]; then
   CORE_KIT_GIT_SHA="$(dnf --repofrompath \
     core-kit,file://"${CORE_KIT_PATH}" \
     --repo=core-kit repoquery \
-    --queryformat '%{Release}' 2>/dev/null | awk '/^1/{print $1}' | cut -d '.' -f 3)"
+    --queryformat '%{Buildtime} %{Release}' 2>/dev/null | \
+    sort -r -k 1,2 | \
+    head -n 1 | \
+    cut -d ' ' -f 3 | \
+    awk '/^1/{print $1}' | \
+    cut -d '.' -f 3)"
   # Query the bottlerocket-core-kit repo of RPMs for all package names.
   CORE_KIT_INVENTORY_QUERY="%{NAME}"
   # shellcheck disable=SC2312 # Array is validated elsewhere.