summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-11-15 12:58:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:29:18 +0000
commit5423d2fabade45974f20948a6d90a663eead209a (patch)
tree4b8a597d40d37f7ebdf75c086e4f3a3a75b09060
parentda7bf75bcdd5759a0f551dcb7a0326aa2f40921c (diff)
downloadopenembedded-core-5423d2fabade45974f20948a6d90a663eead209a.tar.gz
openembedded-core-5423d2fabade45974f20948a6d90a663eead209a.tar.bz2
openembedded-core-5423d2fabade45974f20948a6d90a663eead209a.zip
screenshot: rename to sato-screenshot
To remove a name conflict with e17's screenshot tool (and possibly other screenshot tools, as screenshot is a generic term), rename screenshot to sato-screenshot. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch (renamed from meta/recipes-sato/screenshot/files/fix_ldadd_order.patch)0
-rw-r--r--meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb (renamed from meta/recipes-sato/screenshot/screenshot_git.bb)2
-rw-r--r--meta/recipes-sato/tasks/task-core-x11.bb2
3 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
index 7d9689e893..7d9689e893 100644
--- a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
+++ b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
diff --git a/meta/recipes-sato/screenshot/screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index 917a27dc22..5e51d3dfd9 100644
--- a/meta/recipes-sato/screenshot/screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -12,7 +12,7 @@ SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
PV = "0.1+git${SRCPV}"
PR = "r0"
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
file://fix_ldadd_order.patch"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb
index 106bc0f7fb..f1b06f9a12 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -61,7 +61,7 @@ RDEPENDS_task-core-apps-x11-core = "\
leafpad \
${FILEMANAGER} \
matchbox-terminal \
- screenshot"
+ sato-screenshot"
RDEPENDS_task-core-apps-x11-games = "\