diff options
Diffstat (limited to 'meta/recipes-core/psplash/psplash_git.bb')
| -rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 9532ed1534..30cf61a2cb 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -6,17 +6,17 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" DEPENDS = "gdk-pixbuf-native" -SRCREV = "44afb7506d43cca15582b4c5b90ba5580344d75d" -PV = "0.1+git${SRCPV}" +SRCREV = "ecc1913756698d0c87ad8fa10e44b29537f09ad1" +PV = "0.1+git" -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \ +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \ file://psplash-init \ file://psplash-start.service \ file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" -SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" +SPLASH_IMAGES = "file://psplash-poky-img.png;outsuffix=default" python __anonymous() { oldpkgs = d.getVar("PACKAGES").split() @@ -65,9 +65,12 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig update-rc.d update-alternatives systemd -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} progress-bar fullscreen" PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[fullscreen] = "--enable-img-fullscreen" +PACKAGECONFIG[startup-msg] = ",--disable-startup-msg" +PACKAGECONFIG[progress-bar] = ",--disable-progress-bar" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -77,7 +80,7 @@ python do_compile () { import subprocess # Build a separate executable for each splash image - workdir = d.getVar('WORKDIR') + workdir = d.getVar('UNPACKDIR') convertscript = "%s/make-image-header.sh" % d.getVar('S') destfile = "%s/psplash-poky-img.h" % d.getVar('B') localfiles = d.getVar('SPLASH_LOCALPATHS').split() @@ -100,7 +103,7 @@ python do_compile () { do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh + install -m 0755 ${UNPACKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh # make fifo for psplash install -d ${D}/mnt @@ -109,8 +112,8 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_system_unitdir} - install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/psplash-start.service ${D}/${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/psplash-systemd.service ${D}/${systemd_system_unitdir} fi install -d ${D}${bindir} |