10 files changed, 59 insertions, 3 deletions
diff --git a/external/poky/scripts/postinst-intercepts/delay_to_first_boot b/external/poky/scripts/postinst-intercepts/delay_to_first_boot
index ecdbef95..fa8e1caa 100644
--- a/external/poky/scripts/postinst-intercepts/delay_to_first_boot
+++ b/external/poky/scripts/postinst-intercepts/delay_to_first_boot
@@ -1,2 +1,6 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
+
 exit 1
diff --git a/external/poky/scripts/postinst-intercepts/postinst_intercept b/external/poky/scripts/postinst-intercepts/postinst_intercept
index b18e806d..b91974c8 100755
--- a/external/poky/scripts/postinst-intercepts/postinst_intercept
+++ b/external/poky/scripts/postinst-intercepts/postinst_intercept
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# SPDX-License-Identifier: MIT
+#
 # This script is called from inside postinstall scriptlets at do_rootfs time. It
 # actually adds, at the end, the list of packages for which the intercept script
 # is valid. Also, if one wants to pass any variables to the intercept script from
diff --git a/external/poky/scripts/postinst-intercepts/update_desktop_database b/external/poky/scripts/postinst-intercepts/update_desktop_database
new file mode 100644
index 00000000..8903b496
--- /dev/null
+++ b/external/poky/scripts/postinst-intercepts/update_desktop_database
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
+# Post-install intercept for mime-xdg.bbclass
+
+update-desktop-database $D${desktop_dir}
+
diff --git a/external/poky/scripts/postinst-intercepts/update_font_cache b/external/poky/scripts/postinst-intercepts/update_font_cache
index e0ec4719..46bdb8c5 100644
--- a/external/poky/scripts/postinst-intercepts/update_font_cache
+++ b/external/poky/scripts/postinst-intercepts/update_font_cache
@@ -1,6 +1,11 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
 
 set -e
 
 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${libexecdir}/${binprefix}fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
+
 chown -R root:root $D${fontconfigcachedir}
+find $D -type f -name .uuid -exec chown root:root '{}' +
diff --git a/external/poky/scripts/postinst-intercepts/update_gio_module_cache b/external/poky/scripts/postinst-intercepts/update_gio_module_cache
index d1f01409..c87fa85d 100644
--- a/external/poky/scripts/postinst-intercepts/update_gio_module_cache
+++ b/external/poky/scripts/postinst-intercepts/update_gio_module_cache
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
 
 set -e
 
diff --git a/external/poky/scripts/postinst-intercepts/update_icon_cache b/external/poky/scripts/postinst-intercepts/update_gtk_icon_cache
index 9cf2a72a..99367a28 100644
--- a/external/poky/scripts/postinst-intercepts/update_icon_cache
+++ b/external/poky/scripts/postinst-intercepts/update_gtk_icon_cache
@@ -1,8 +1,12 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
+# Post-install intercept for gtk-icon-cache.bbclass
 
 set -e
 
-# update native pixbuf loaders
+# Update native pixbuf loaders
 $STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
 for icondir in $D/usr/share/icons/*/ ; do
diff --git a/external/poky/scripts/postinst-intercepts/update_gtk_immodules_cache b/external/poky/scripts/postinst-intercepts/update_gtk_immodules_cache
index 39551697..9f07ccca 100644
--- a/external/poky/scripts/postinst-intercepts/update_gtk_immodules_cache
+++ b/external/poky/scripts/postinst-intercepts/update_gtk_immodules_cache
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
 
 set -e
 
diff --git a/external/poky/scripts/postinst-intercepts/update_mime_database b/external/poky/scripts/postinst-intercepts/update_mime_database
new file mode 100644
index 00000000..582d1e16
--- /dev/null
+++ b/external/poky/scripts/postinst-intercepts/update_mime_database
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
+# Post-install intercept for mime.bbclass
+
+echo "Updating MIME database... this may take a while."
+update-mime-database $D${mimedir}
+
diff --git a/external/poky/scripts/postinst-intercepts/update_pixbuf_cache b/external/poky/scripts/postinst-intercepts/update_pixbuf_cache
index ebea07c3..ea128144 100644
--- a/external/poky/scripts/postinst-intercepts/update_pixbuf_cache
+++ b/external/poky/scripts/postinst-intercepts/update_pixbuf_cache
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
 
 set -e
 
diff --git a/external/poky/scripts/postinst-intercepts/update_udev_hwdb b/external/poky/scripts/postinst-intercepts/update_udev_hwdb
index b5cce0a0..102e99b9 100644
--- a/external/poky/scripts/postinst-intercepts/update_udev_hwdb
+++ b/external/poky/scripts/postinst-intercepts/update_udev_hwdb
@@ -1,6 +1,21 @@
 #!/bin/sh
+#
+# SPDX-License-Identifier: MIT
+#
 
 set -e
 
-PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}udevadm hwdb --update --root $D
-chown root:root $D${sysconfdir}/udev/hwdb.bin
+case "${PREFERRED_PROVIDER_udev}" in
+	systemd)
+		UDEV_EXTRA_ARGS="--usr"
+		UDEVLIBDIR="${rootlibexecdir}"
+		;;
+
+	*)
+		UDEV_EXTRA_ARGS=""
+		UDEVLIBDIR="${sysconfdir}"
+		;;
+esac
+
+PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}udevadm hwdb --update --root $D ${UDEV_EXTRA_ARGS}
+chown root:root $D${UDEVLIBDIR}/udev/hwdb.bin