mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

psplash: update to latest git revision and clean up

Browse Source 
Update SRCREV to pick up:

c359546 Fix psplash-systemd failures
3c0a4f3 Remove generated psplash-poky-img.h

Also:
* set the unit type in psplash-start.service to "notify" to
  complete the psplash-systemd race fix
* remove the rest of the now unnecessary has_png logic bits
* change the generated image header destination to B instead of S
  since that now works after the recent makefile changes, and will
  avoid unnecessarily polluting the source tree

(From OE-Core rev: 6f31da5632220a09ac65b8f361cdc9c64e64ce35)

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Murray
2020-03-02 14:14:26 -05:00
committed by Richard Purdie
parent 57f15632d7
commit bd5635d7ae
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/psplash/files/psplash-start.service
+1
View File
@@ -4,6 +4,7 @@ DefaultDependencies=no
RequiresMountsFor=/run RequiresMountsFor=/run
[Service] [Service]
Type=notify
ExecStart=/usr/bin/psplash ExecStart=/usr/bin/psplash
[Install] [Install]
meta/recipes-core/psplash/psplash_git.bb
+2 -5
View File
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224"
DEPENDS = "gdk-pixbuf-native" DEPENDS = "gdk-pixbuf-native"
SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" SRCREV = "0a902f7cd875ccf018456451be369f05fa55f962"
PV = "0.1+git${SRCPV}" PV = "0.1+git${SRCPV}"
PR = "r15" PR = "r15"
@@ -24,7 +24,6 @@ python __anonymous() {
splashfiles = d.getVar('SPLASH_IMAGES').split() splashfiles = d.getVar('SPLASH_IMAGES').split()
pkgs = [] pkgs = []
localpaths = [] localpaths = []
haspng = False
for uri in splashfiles: for uri in splashfiles:
fetcher = bb.fetch2.Fetch([uri], d) fetcher = bb.fetch2.Fetch([uri], d)
flocal = os.path.basename(fetcher.localpath(uri)) flocal = os.path.basename(fetcher.localpath(uri))
@@ -42,8 +41,6 @@ python __anonymous() {
bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri)) bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri))
else: else:
pkgs.append(outname) pkgs.append(outname)
if flocal.endswith(".png"):
haspng = True
localpaths.append(flocal) 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
@@ -82,7 +79,7 @@ python do_compile () {
# Build a separate executable for each splash image # Build a separate executable for each splash image
workdir = d.getVar('WORKDIR') workdir = d.getVar('WORKDIR')
convertscript = "%s/make-image-header.sh" % d.getVar('S') 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() localfiles = d.getVar('SPLASH_LOCALPATHS').split()
outputfiles = d.getVar('SPLASH_INSTALL').split() outputfiles = d.getVar('SPLASH_INSTALL').split()
for localfile, outputfile in zip(localfiles, outputfiles): for localfile, outputfile in zip(localfiles, outputfiles):