From 410547010e8ec47297c76a3179b6aa9c244eb664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Sat, 16 Dec 2023 15:48:38 +0100
Subject: [PATCH] fedora: Remove 'ensure-files' logic

Creates a lot of build errors. Let's remove it for now.
---
 fedora/38/Containerfile | 16 ++--------------
 fedora/39/Containerfile | 26 ++------------------------
 fedora/40/Containerfile | 16 ++--------------
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/fedora/38/Containerfile b/fedora/38/Containerfile
index 9785c283..a367a388 100644
--- a/fedora/38/Containerfile
+++ b/fedora/38/Containerfile
@@ -13,7 +13,7 @@ LABEL com.github.containers.toolbox="true" \
 RUN rm /etc/rpm/macros.image-language-conf
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 
-COPY missing-docs extra-packages ensure-files /
+COPY missing-docs extra-packages /
 
 RUN dnf -y upgrade && \
     dnf -y swap coreutils-single coreutils-full && \
@@ -22,16 +22,4 @@ RUN dnf -y upgrade && \
     dnf -y install $(<extra-packages) && \
     dnf clean all
 
-RUN ret_val=0; \
-  while read file; do \
-    if ! compgen -G "$file" >/dev/null; then \
-      echo "$file: No such file or directory" >&2; \
-      ret_val=1; \
-      break; \
-    fi; \
-  done <ensure-files; \
-  if [ "$ret_val" -ne 0 ]; then \
-    false; \
-  fi
-
-RUN rm /missing-docs /extra-packages /ensure-files
+RUN rm /missing-docs /extra-packages
diff --git a/fedora/39/Containerfile b/fedora/39/Containerfile
index 5fcec601..a01ddd43 100644
--- a/fedora/39/Containerfile
+++ b/fedora/39/Containerfile
@@ -13,7 +13,7 @@ LABEL com.github.containers.toolbox="true" \
 RUN rm /etc/rpm/macros.image-language-conf
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 
-COPY missing-docs extra-packages ensure-files /
+COPY missing-docs extra-packages /
 
 RUN dnf -y upgrade && \
     dnf -y swap coreutils-single coreutils-full && \
@@ -22,26 +22,4 @@ RUN dnf -y upgrade && \
     dnf -y install $(<extra-packages) && \
     dnf clean all
 
-RUN ret_val=0; \
-  while read file; do \
-    if ! compgen -G "$file" >/dev/null; then \
-      echo "$file: No such file or directory" >&2; \
-      ret_val=1; \
-      break; \
-    fi; \
-  done <ensure-files; \
-  if [ "$ret_val" -ne 0 ]; then \
-    false; \
-  fi
-
-RUN broken_packages="$(rpm --all --query --state --queryformat "PACKAGE: %{NAME}\n" \
-  | sed --quiet --regexp-extended '/PACKAGE: /{s/PACKAGE: // ; h ; b }; /^not installed/ { g; p }' \
-  | uniq \
-  | sort)"; \
-  if [ "$broken_packages" != "" ]; then \
-    echo "Packages with missing files:" >&2; \
-    echo "$broken_packages" >&2; \
-    false; \
-  fi
-
-RUN rm /missing-docs /extra-packages /ensure-files
+RUN rm /missing-docs /extra-packages
diff --git a/fedora/40/Containerfile b/fedora/40/Containerfile
index d9202137..6e2a740a 100644
--- a/fedora/40/Containerfile
+++ b/fedora/40/Containerfile
@@ -13,7 +13,7 @@ LABEL com.github.containers.toolbox="true" \
 RUN rm /etc/rpm/macros.image-language-conf
 RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
 
-COPY missing-docs extra-packages ensure-files /
+COPY missing-docs extra-packages /
 
 RUN dnf -y upgrade && \
     dnf -y swap coreutils-single coreutils-full && \
@@ -22,16 +22,4 @@ RUN dnf -y upgrade && \
     dnf -y install $(<extra-packages) && \
     dnf clean all
 
-RUN ret_val=0; \
-  while read file; do \
-    if ! compgen -G "$file" >/dev/null; then \
-      echo "$file: No such file or directory" >&2; \
-      ret_val=1; \
-      break; \
-    fi; \
-  done <ensure-files; \
-  if [ "$ret_val" -ne 0 ]; then \
-    false; \
-  fi
-
-RUN rm /missing-docs /extra-packages /ensure-files
+RUN rm /missing-docs /extra-packages