Merge pull request #457 from bcressey/dnf5-compat

fixes for dnf5 compatibility

Author: bcressey

twoliter/embedded/build.Dockerfile

@@ -294,20 +294,23 @@ RUN --mount=target=/host \
       EXTERNAL_KIT_REPOS+=("--repofrompath=${REPO_NAME},${REPO_PATH}" --enablerepo "${REPO_NAME}"); \
     done && \
     echo "${EXTERNAL_KIT_REPOS[@]}" && \
+    mkdir -p /local/rpms && \
+    download_dir_opt="$(dnf install --help | grep -Fwq downloaddir && echo "--downloaddir /local/rpms" ||:)" && \
     dnf -y \
       --disablerepo '*' \
       --repofrompath repo,./rpmbuild/RPMS \
       --enablerepo 'repo' \
       "${KIT_REPOS[@]}" \
       "${EXTERNAL_KIT_REPOS[@]}" \
       --nogpgcheck \
-      --downloadonly \
-      --downloaddir . \
       --forcearch "${ARCH}" \
-      install $(printf "bottlerocket-%s\n" metadata ${PACKAGES}) && \
-    mkdir -p /local/rpms && \
-    mv *.rpm /local/rpms && \
-    createrepo_c /local/rpms && \
+      --setopt=cachedir=/local/rpms \
+      install \
+        --downloadonly \
+	${download_dir_opt} \
+        $(printf "bottlerocket-%s\n" metadata ${PACKAGES}) && \
+    find /local/rpms -mindepth 2 -type f -name '*.rpm' -exec mv -t /local/rpms {} + && \
+    find /local/rpms -mindepth 1 ! -name '*.rpm' -delete && \
     rm /output && \
     rm /bypass && \
     echo ${NOCACHE}

twoliter/embedded/rpm2kmodkit

@@ -45,8 +45,7 @@ popd >/dev/null
 
 # Merge them together into a unified archive.
 pushd "${KIT_DIR}" >/dev/null
-tar cf "${OUTPUT_DIR}/${KMOD_KIT_FULL}.tar" "${KMOD_KIT}"
-xz -T0 "${OUTPUT_DIR}/${KMOD_KIT_FULL}.tar"
+XZ_OPT='-T0' tar cfJ "${OUTPUT_DIR}/${KMOD_KIT_FULL}.tar.xz" "${KMOD_KIT}"
 popd >/dev/null
 
 # Create friendly symlinks.