From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../postinst-intercepts/delay_to_first_boot | 2 + .../scripts/postinst-intercepts/postinst_intercept | 56 ++++++++++++++++++++++ poky/scripts/postinst-intercepts/update_font_cache | 7 +++ .../postinst-intercepts/update_gio_module_cache | 9 ++++ poky/scripts/postinst-intercepts/update_icon_cache | 13 +++++ .../postinst-intercepts/update_pixbuf_cache | 11 +++++ 6 files changed, 98 insertions(+) create mode 100644 poky/scripts/postinst-intercepts/delay_to_first_boot create mode 100755 poky/scripts/postinst-intercepts/postinst_intercept create mode 100644 poky/scripts/postinst-intercepts/update_font_cache create mode 100644 poky/scripts/postinst-intercepts/update_gio_module_cache create mode 100644 poky/scripts/postinst-intercepts/update_icon_cache create mode 100644 poky/scripts/postinst-intercepts/update_pixbuf_cache (limited to 'poky/scripts/postinst-intercepts') diff --git a/poky/scripts/postinst-intercepts/delay_to_first_boot b/poky/scripts/postinst-intercepts/delay_to_first_boot new file mode 100644 index 000000000..ecdbef95d --- /dev/null +++ b/poky/scripts/postinst-intercepts/delay_to_first_boot @@ -0,0 +1,2 @@ +#!/bin/sh +exit 1 diff --git a/poky/scripts/postinst-intercepts/postinst_intercept b/poky/scripts/postinst-intercepts/postinst_intercept new file mode 100755 index 000000000..b18e806d4 --- /dev/null +++ b/poky/scripts/postinst-intercepts/postinst_intercept @@ -0,0 +1,56 @@ +#!/bin/sh +# +# 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 +# the postinstall itself, they will be added immediately after the shebang line. +# +# Usage: postinst_intercept ... +# * intercept_script_name - the name of the intercept script we want to change; +# * package_name - add the package_name to list of packages the intercept script +# is used for; +# * mlprefix=... - this one is needed in order to have separate hooks for multilib. +# * var1=... - var1 will have the value we provide in the intercept script. This +# is useful when we want to pass on variables like ${libdir} to +# the intercept script; +# +[ $# -lt 3 ] && exit 1 + +intercept_script=$INTERCEPT_DIR/$1 && shift +package_name=$1 && shift +mlprefix=$(echo $1 |sed -ne "s/^mlprefix=\(.*\)-/\1/p") && shift + +# if the hook we want to install does not exist, then there's nothing we can do +[ -f "$intercept_script" ] || exit 1 + +# if the postinstall wanting to install the hook belongs to a multilib package, +# then we'd better have a separate hook for this because the default ${libdir} and +# ${base_libdir} will point to the wrong locations +if [ -n "$mlprefix" ]; then + ml_intercept_script=$intercept_script-$mlprefix + # if the multilib hook does not exist, create it from the default one + if [ ! -f "$ml_intercept_script" ]; then + cp $intercept_script $ml_intercept_script + + # clear the ##PKGS: line and the already set variables + [ -x "$ml_intercept_script" ] && sed -i -e "2,$(($#+1)) {/.*/d}" -e "/^##PKGS: .*/d" $ml_intercept_script + fi + + intercept_script=$ml_intercept_script +fi + +chmod +x "$intercept_script" + +pkgs_line=$(grep "##PKGS:" $intercept_script) +if [ -n "$pkgs_line" ]; then + # line exists, add this package to the list only if it's not already there + if [ -z "$(echo "$pkgs_line" | grep " $package_name ")" ]; then + sed -i -e "s/##PKGS:.*/\0${package_name} /" $intercept_script + fi +else + for var in "$@"; do + sed -i -e "\%^#\!/bin/.*sh%a $var" $intercept_script + done + echo "##PKGS: ${package_name} " >> $intercept_script +fi + diff --git a/poky/scripts/postinst-intercepts/update_font_cache b/poky/scripts/postinst-intercepts/update_font_cache new file mode 100644 index 000000000..bf65e19a4 --- /dev/null +++ b/poky/scripts/postinst-intercepts/update_font_cache @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir} \ + -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams} +chown -R root:root $D${fontconfigcachedir} diff --git a/poky/scripts/postinst-intercepts/update_gio_module_cache b/poky/scripts/postinst-intercepts/update_gio_module_cache new file mode 100644 index 000000000..fc3f9d0d6 --- /dev/null +++ b/poky/scripts/postinst-intercepts/update_gio_module_cache @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D${libdir}:$D${base_libdir} \ + $D${libexecdir}/${binprefix}gio-querymodules $D${libdir}/gio/modules/ + +[ ! -e $D${libdir}/gio/modules/giomodule.cache ] || + chown root:root $D${libdir}/gio/modules/giomodule.cache diff --git a/poky/scripts/postinst-intercepts/update_icon_cache b/poky/scripts/postinst-intercepts/update_icon_cache new file mode 100644 index 000000000..9cf2a72a0 --- /dev/null +++ b/poky/scripts/postinst-intercepts/update_icon_cache @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# 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 + if [ -d $icondir ] ; then + gtk-update-icon-cache -fqt $icondir + fi +done + diff --git a/poky/scripts/postinst-intercepts/update_pixbuf_cache b/poky/scripts/postinst-intercepts/update_pixbuf_cache new file mode 100644 index 000000000..5d44075fb --- /dev/null +++ b/poky/scripts/postinst-intercepts/update_pixbuf_cache @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders +export GDK_PIXBUF_FATAL_LOADER=1 + +PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ + $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ + >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ + sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache -- cgit v1.2.3