End of life

Just adding the appdata to the flatpak-runtime-config wasn't sufficient -
we also have to run appstream-compose to get it in the right place for
flatpak build-bundle to find.

container.yaml

@@ -9,12 +9,23 @@ flatpak:
     component: flatpak-sdk
     branch: f31
     runtime: org.fedoraproject.Platform
+    end-of-life: Fedora 31 runtime is no longer supported.
     finish-args: >
         --env=GI_TYPELIB_PATH=/app/lib64/girepository-1.0
         --env=GST_PLUGIN_SYSTEM_PATH=/app/lib64/gstreamer-1.0:/usr/lib64/gstreamer-1.0
         --env=LD_LIBRARY_PATH=/app/lib64
         --env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/share
+    # For applications, appstream-compose is run automatically along with other processing
+    # of the tree. For runtimes, we have to run it manually. flatpak-module-tools local
+    # builds have issues if the cleanup script outputs to stdout, hence the 1>&2
+    # redirection.
     cleanup-commands: |
+        appstream-compose --verbose   \
+            --prefix=/usr             \
+            --basename=org.fedoraproject.Sdk \
+            --origin=flatpak          \
+            org.fedoraproject.Sdk 1>&2
+
         touch -d @0 /usr/share/fonts /usr/share/fonts/*
         fc-cache -rs