From 923733e2dd3cd37a93015f8f7a89498cfabf9294 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 15 Jan 2019 12:13:12 -0500 Subject: [PATCH] remove unused file, change shell theme to Adapta-Eta --- .../recipes-citadel/images/citadel-rootfs-image.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb index 07fa239..8bae462 100644 --- a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb +++ b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SYSTEMD_DEFAULT_TARGET = "graphical.target" -ROOTFS_POSTPROCESS_COMMAND += "set_citadel_user_password; write_etc_citadel_channel; symlink_lib64; setup_var; append_os_release;" +ROOTFS_POSTPROCESS_COMMAND += "set_citadel_user_password; symlink_lib64; setup_var; append_os_release;" IMAGE_INSTALL += "\ packagegroup-citadel-base \ @@ -26,10 +26,6 @@ set_citadel_user_password() { sed -i 's%^citadel:!:%citadel:aadg8rGtZzOY6:%' ${IMAGE_ROOTFS}/etc/shadow } -write_etc_citadel_channel() { - echo "${CITADEL_IMAGE_CHANNEL} ${CITADEL_IMAGE_VERSION_rootfs}" > ${IMAGE_ROOTFS}/etc/citadel-channel -} - setup_var() { install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/var install -m 0755 -d ${IMAGE_ROOTFS}/usr/share/factory/home @@ -53,7 +49,7 @@ setup_var() { mv ${IMAGE_ROOTFS}/home/root ${IMAGE_ROOTFS}/usr/share/factory/home 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-Eta/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