| commit | 0010f0e00b877dffe7a9b2c84265558dffb4570c | [log] [tgz] |
|---|---|---|
| author | Mike Frysinger <vapier@chromium.org> | Tue Oct 15 13:07:19 2013 -0400 |
| committer | Mike Frysinger <vapier@chromium.org> | Fri Oct 18 17:21:45 2013 +0000 |
| tree | b28ca0cacb9d3f5d0cd3b7acddeb5e28bce30d2f | |
| parent | 5066026dfb6921f0e3bd7e98e2913f224ae81dc4 [diff] |
daisy_spring: fix appid usage Since spring is a superset of snow, we have to check it first. Otherwise we use the same appid for snow and spring. BUG=chromium:298282 TEST=`emerge-daisy chromeos-bsp-daisy` used appid D851316B-7E57-4805-A7CE-01829AC1443E TEST=`emerge-daisy_spring chromeos-bsp-daisy` used appid ADA16F7B-283C-4907-AE27-ABBF5CA4F7F1 Change-Id: Ie0a2889abb5b9b65ab4b4192ac3165d963d42737 Previous-Reviewed-on: https://chromium-review.googlesource.com/172927 (cherry picked from commit 77b3ecf94f4c55369d6df6aca03dc1acd99ba0a3) Reviewed-on: https://chromium-review.googlesource.com/173616 Reviewed-by: Josafat Garcia <josafat@chromium.org> Tested-by: Josafat Garcia <josafat@chromium.org>
diff --git a/overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1-r41.ebuild b/overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1-r42.ebuild similarity index 100% rename from overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1-r41.ebuild rename to overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1-r42.ebuild
diff --git a/overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1.ebuild b/overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1.ebuild index aeb8225..4bdb20a 100644 --- a/overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1.ebuild +++ b/overlay-daisy/chromeos-base/chromeos-bsp-daisy/chromeos-bsp-daisy-0.0.1.ebuild
@@ -32,10 +32,11 @@ src_install() { # Install the proper appid depending on the board being built. # This would normally be done with board_use_$BOARD USE flags. - if use snow; then - doappid "{D851316B-7E57-4805-A7CE-01829AC1443E}" - elif use spring; then + if use spring; then + # Have to check spring first since it's a superset of snow. doappid "{ADA16F7B-283C-4907-AE27-ABBF5CA4F7F1}" + elif use snow; then + doappid "{D851316B-7E57-4805-A7CE-01829AC1443E}" fi # Install platform specific config file for power_manager