diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-06-13 18:41:40 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-14 14:53:58 +0100 |
commit | 231c9fe94d5b65bea345ffe9eb5e68b0db11cb07 (patch) | |
tree | fe6c4edad73f58e5100ae861f46c950e398979ba /meta | |
parent | 44c0e8c804146becba4a4bd207c451f610844082 (diff) | |
download | poky-231c9fe94d5b65bea345ffe9eb5e68b0db11cb07.tar.gz |
adwaita-icon-theme: add a patch to speed up the do_install() task
Goes down to 40 seconds from over 4 minutes :)
Note that there is no control over the amount of shell jobs; on my machine
this is not a problem, but if it's a problem on less capable hardware,
we can add some kind of limiter.
(From OE-Core rev: cd9af17028c069f52fb0616074170093dd63c143)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch | 82 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb | 3 |
2 files changed, 84 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch new file mode 100644 index 0000000000..6c38e237f4 --- /dev/null +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From 8dcd73b45a660dbdc560676835ba46f495334f14 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 13 Jun 2017 18:10:06 +0300 | ||
4 | Subject: [PATCH] Run installation commands as shell jobs | ||
5 | |||
6 | This greatly speeds up installation time on multi-core systems. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | src/fullcolor/Makefile.am | 3 ++- | ||
12 | src/spinner/Makefile.am | 5 +++-- | ||
13 | src/symbolic/Makefile.am | 7 ++++--- | ||
14 | 3 files changed, 9 insertions(+), 6 deletions(-) | ||
15 | |||
16 | diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am | ||
17 | index 1c940a5..3998ee6 100644 | ||
18 | --- a/src/fullcolor/Makefile.am | ||
19 | +++ b/src/fullcolor/Makefile.am | ||
20 | @@ -9,9 +9,10 @@ install-data-local: | ||
21 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ | ||
22 | context="`dirname $$file`"; \ | ||
23 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
24 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ | ||
25 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ | ||
26 | done; \ | ||
27 | done; | ||
28 | + wait | ||
29 | |||
30 | ## FIXME we should add a way to remove links generated by icon mapping | ||
31 | uninstall-local: | ||
32 | diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am | ||
33 | index 86f4d7c..3fae8c1 100644 | ||
34 | --- a/src/spinner/Makefile.am | ||
35 | +++ b/src/spinner/Makefile.am | ||
36 | @@ -24,13 +24,14 @@ install-data-local: | ||
37 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ | ||
38 | context="`dirname $$file`"; \ | ||
39 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
40 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ | ||
41 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ | ||
42 | done; \ | ||
43 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ | ||
44 | context="`dirname $$file`"; \ | ||
45 | $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ | ||
46 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ | ||
47 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ | ||
48 | done | ||
49 | + wait | ||
50 | |||
51 | uninstall-local: | ||
52 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ | ||
53 | diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am | ||
54 | index 24aac9b..61ba071 100644 | ||
55 | --- a/src/symbolic/Makefile.am | ||
56 | +++ b/src/symbolic/Makefile.am | ||
57 | @@ -25,18 +25,19 @@ install-data-local: | ||
58 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ | ||
59 | context="`dirname $$file`"; \ | ||
60 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
61 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ | ||
62 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ | ||
63 | done; \ | ||
64 | done | ||
65 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ | ||
66 | context="`dirname $$file`"; \ | ||
67 | $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ | ||
68 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ | ||
69 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ | ||
70 | for size in $(symbolic_encode_sizes); do \ | ||
71 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
72 | - $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
73 | + $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ | ||
74 | done \ | ||
75 | done | ||
76 | + wait | ||
77 | |||
78 | uninstall-local: | ||
79 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ | ||
80 | -- | ||
81 | 2.11.0 | ||
82 | |||
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb index 5fdc71d1e3..d340536f0f 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb | |||
@@ -12,7 +12,8 @@ inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-e | |||
12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
13 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 13 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ |
14 | file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ | 14 | file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ |
15 | " | 15 | file://0001-Run-installation-commands-as-shell-jobs.patch \ |
16 | " | ||
16 | 17 | ||
17 | SRC_URI[md5sum] = "3ccac0d600ffc936d2adfb80e9245bc5" | 18 | SRC_URI[md5sum] = "3ccac0d600ffc936d2adfb80e9245bc5" |
18 | SRC_URI[sha256sum] = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a" | 19 | SRC_URI[sha256sum] = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a" |