diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/psplash/files/psplash-start.service | 1 | ||||
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index af9d5d6c20..a8c97c7a75 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service | |||
@@ -4,6 +4,7 @@ DefaultDependencies=no | |||
4 | RequiresMountsFor=/run | 4 | RequiresMountsFor=/run |
5 | 5 | ||
6 | [Service] | 6 | [Service] |
7 | Type=notify | ||
7 | ExecStart=/usr/bin/psplash | 8 | ExecStart=/usr/bin/psplash |
8 | 9 | ||
9 | [Install] | 10 | [Install] |
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 875adb13fc..22c71f099b 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+" | |||
6 | LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" | 6 | LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" |
7 | DEPENDS = "gdk-pixbuf-native" | 7 | DEPENDS = "gdk-pixbuf-native" |
8 | 8 | ||
9 | SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" | 9 | SRCREV = "0a902f7cd875ccf018456451be369f05fa55f962" |
10 | PV = "0.1+git${SRCPV}" | 10 | PV = "0.1+git${SRCPV}" |
11 | PR = "r15" | 11 | PR = "r15" |
12 | 12 | ||
@@ -24,7 +24,6 @@ python __anonymous() { | |||
24 | splashfiles = d.getVar('SPLASH_IMAGES').split() | 24 | splashfiles = d.getVar('SPLASH_IMAGES').split() |
25 | pkgs = [] | 25 | pkgs = [] |
26 | localpaths = [] | 26 | localpaths = [] |
27 | haspng = False | ||
28 | for uri in splashfiles: | 27 | for uri in splashfiles: |
29 | fetcher = bb.fetch2.Fetch([uri], d) | 28 | fetcher = bb.fetch2.Fetch([uri], d) |
30 | flocal = os.path.basename(fetcher.localpath(uri)) | 29 | flocal = os.path.basename(fetcher.localpath(uri)) |
@@ -42,8 +41,6 @@ python __anonymous() { | |||
42 | bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri)) | 41 | bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri)) |
43 | else: | 42 | else: |
44 | pkgs.append(outname) | 43 | pkgs.append(outname) |
45 | if flocal.endswith(".png"): | ||
46 | haspng = True | ||
47 | localpaths.append(flocal) | 44 | localpaths.append(flocal) |
48 | 45 | ||
49 | # Set these so that we have less work to do in do_compile and do_install_append | 46 | # Set these so that we have less work to do in do_compile and do_install_append |
@@ -82,7 +79,7 @@ python do_compile () { | |||
82 | # Build a separate executable for each splash image | 79 | # Build a separate executable for each splash image |
83 | workdir = d.getVar('WORKDIR') | 80 | workdir = d.getVar('WORKDIR') |
84 | convertscript = "%s/make-image-header.sh" % d.getVar('S') | 81 | convertscript = "%s/make-image-header.sh" % d.getVar('S') |
85 | destfile = "%s/psplash-poky-img.h" % d.getVar('S') | 82 | destfile = "%s/psplash-poky-img.h" % d.getVar('B') |
86 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() | 83 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() |
87 | outputfiles = d.getVar('SPLASH_INSTALL').split() | 84 | outputfiles = d.getVar('SPLASH_INSTALL').split() |
88 | for localfile, outputfile in zip(localfiles, outputfiles): | 85 | for localfile, outputfile in zip(localfiles, outputfiles): |