diff options
Diffstat (limited to 'meta/recipes-core/psplash/psplash_git.bb')
| -rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 68 |
1 files changed, 39 insertions, 29 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 56734c1582..1be7ece79d 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -3,14 +3,17 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly em HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash" SECTION = "base" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" +LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" +DEPENDS = "gdk-pixbuf-native" -SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" +SRCREV = "0a902f7cd875ccf018456451be369f05fa55f962" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ + file://psplash-start.service \ + file://psplash-systemd.service \ ${SPLASH_IMAGES}" UPSTREAM_CHECK_COMMITS = "1" @@ -19,9 +22,9 @@ SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" python __anonymous() { oldpkgs = d.getVar("PACKAGES").split() splashfiles = d.getVar('SPLASH_IMAGES').split() + mlprefix = d.getVar('MLPREFIX') or '' pkgs = [] localpaths = [] - haspng = False for uri in splashfiles: fetcher = bb.fetch2.Fetch([uri], d) flocal = os.path.basename(fetcher.localpath(uri)) @@ -39,34 +42,33 @@ python __anonymous() { bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri)) else: pkgs.append(outname) - if flocal.endswith(".png"): - haspng = True localpaths.append(flocal) - # Set these so that we have less work to do in do_compile and do_install_append + # Set these so that we have less work to do in do_compile and do_install:append d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) + for p in pkgs: + d.prependVar("PACKAGES", "%s%s " % (mlprefix, p)) - if haspng: - d.appendVar("DEPENDS", " gdk-pixbuf-native") - - d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) - mlprefix = d.getVar('MLPREFIX') or '' pn = d.getVar('PN') or '' for p in pkgs: ep = '%s%s' % (mlprefix, p) epsplash = '%s%s' % (mlprefix, 'psplash') - d.setVar("FILES_%s" % ep, "${bindir}/%s" % p) - d.setVar("ALTERNATIVE_%s" % ep, 'psplash') + d.setVar("FILES:%s" % ep, "${bindir}/%s" % p) + d.setVar("ALTERNATIVE:%s" % ep, 'psplash') d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % p) - d.appendVar("RDEPENDS_%s" % ep, " %s" % pn) + d.appendVar("RDEPENDS:%s" % ep, " %s" % pn) if p == "psplash-default": - d.appendVar("RRECOMMENDS_%s" % pn, " %s" % ep) + d.appendVar("RRECOMMENDS:%s" % pn, " %s" % ep) } S = "${WORKDIR}/git" -inherit autotools pkgconfig update-rc.d update-alternatives +inherit autotools pkgconfig update-rc.d update-alternatives systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" @@ -78,7 +80,7 @@ python do_compile () { # Build a separate executable for each splash image workdir = d.getVar('WORKDIR') convertscript = "%s/make-image-header.sh" % d.getVar('S') - destfile = "%s/psplash-poky-img.h" % d.getVar('S') + destfile = "%s/psplash-poky-img.h" % d.getVar('B') localfiles = d.getVar('SPLASH_LOCALPATHS').split() outputfiles = d.getVar('SPLASH_INSTALL').split() for localfile, outputfile in zip(localfiles, outputfiles): @@ -96,9 +98,22 @@ python do_compile () { shutil.copyfile("psplash", outputfile) } -do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh +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 + + # make fifo for psplash + install -d ${D}/mnt + mkfifo ${D}/mnt/psplash_fifo + fi + + 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} + fi + install -d ${D}${bindir} for i in ${SPLASH_INSTALL} ; do install -m 0755 $i ${D}${bindir}/$i @@ -106,15 +121,10 @@ do_install_append() { rm -f ${D}${bindir}/psplash } +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" + INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask psplash.service - fi -} +FILES:${PN} += "/mnt" |