From 30f15ddde2b285ccb7bf457c43ddaa0367c3a7ee Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Wed, 2 Jan 2019 13:23:45 -0500 Subject: [PATCH] Move symlink creation out of citadel-config package. Gnome icon cache generation was following these symlinks to real filesystem. Moved to a postprocess handler in the image recipe so they get created later. --- .../recipes-citadel/citadel-config/citadel-config.bb | 9 --------- .../recipes-citadel/images/citadel-rootfs-image.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb index c974996..ba130a0 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb @@ -125,15 +125,6 @@ do_install() { install -d ${D}${libdir}/firmware install -d ${D}${datadir}/backgrounds install -d ${D}/opt/share - - ln -sf /opt/share/themes/Adapta ${D}/usr/share/themes/Adapta - ln -sf /opt/share/themes/Adapta-Eta ${D}/usr/share/themes/Adapta-Eta - ln -sf /opt/share/themes/Adapta-Nokto ${D}/usr/share/themes/Adapta-Nokto - ln -sf /opt/share/themes/Adapta-Nokto-Eta ${D}/usr/share/themes/Adapta-Nokto-Eta - ln -sf /opt/share/icons/Paper ${D}/usr/share/icons/Paper - ln -sf /opt/share/icons/Adwaita ${D}/usr/share/icons/Adwaita - ln -sf /opt/share/backgrounds/gnome ${D}/usr/share/backgrounds/gnome - ln -sf /opt/share/gnome-background-properties ${D}/usr/share/gnome-background-properties } FILES_${PN} = "/" diff --git a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb index 183c315..609745e 100644 --- a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb +++ b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb @@ -55,6 +55,15 @@ setup_var() { rm ${IMAGE_ROOTFS}/usr/share/gnome-shell/gnome-shell-theme.gresource ln -sf /opt/share/themes/Adapta/gnome-shell/gnome-shell-theme.gresource ${IMAGE_ROOTFS}/usr/share/gnome-shell/gnome-shell-theme.gresource + ln -sf /opt/share/themes/Adapta ${IMAGE_ROOTFS}/usr/share/themes/Adapta + ln -sf /opt/share/themes/Adapta-Eta ${IMAGE_ROOTFS}/usr/share/themes/Adapta-Eta + ln -sf /opt/share/themes/Adapta-Nokto ${IMAGE_ROOTFS}/usr/share/themes/Adapta-Nokto + ln -sf /opt/share/themes/Adapta-Nokto-Eta ${IMAGE_ROOTFS}/usr/share/themes/Adapta-Nokto-Eta + ln -sf /opt/share/icons/Paper ${IMAGE_ROOTFS}/usr/share/icons/Paper + ln -sf /opt/share/icons/Adwaita ${IMAGE_ROOTFS}/usr/share/icons/Adwaita + ln -sf /opt/share/backgrounds/gnome ${IMAGE_ROOTFS}/usr/share/backgrounds/gnome + ln -sf /opt/share/gnome-background-properties ${IMAGE_ROOTFS}/usr/share/gnome-background-properties + # do_rootfs() will fail otherwise ln -sf ../usr/share/factory/var/lib ${IMAGE_ROOTFS}/var/lib }