From 4ae392ad605fd63f5ffdaaa567608322f77269df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 31 Mar 2020 19:37:09 -0400 Subject: meta-agl-profile-core: update psplash for dunfell Remove local systemd enablement changes for psplash in favor of using upstream support added in dunfell. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray Change-Id: I13a4b2523fe869898b2ccede793afd0cdefbab88 --- .../recipes-core/psplash/psplash_git.bbappend | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend') diff --git a/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend b/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend index bdc196b6f..5a82fc872 100644 --- a/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend +++ b/meta-agl-profile-core/recipes-core/psplash/psplash_git.bbappend @@ -1,27 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://psplash-colors.h \ - file://psplash-start.service \ - file://psplash-quit.service \ - file://psplash-anim \ - " +SRC_URI += "file://psplash-colors.h" SPLASH_IMAGES="file://psplash-poky-img.h;outsuffix=default" -inherit systemd - -SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${PN}', '', d)}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'psplash-start.service psplash-quit.service', '', d)}" - do_configure_append () { - cd ${S} - cp ../psplash-colors.h ./ -} - -do_install_append () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/*.service ${D}/${systemd_unitdir}/system - fi - install -m 755 ${WORKDIR}/psplash-anim ${D}/${bindir} + cp -f ${WORKDIR}/psplash-colors.h ${S} } -- cgit 1.2.3-korg