poky-default-revisions.inc: Move SRCREVs to correct locations, fix whitespace

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 9b661d2fb8ed7771e5101ad8f052050718521204..62d0b27298f15042317d77ee8f4b403214ddea81 100644 (file)
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -66,6 +66,7 @@ SRCREV_pn-libxcb-nativesdk ??= "625ed596cae6dd8175aeb6cb6f26784928042f22"
 SRCREV_pn-libxext ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
 SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
 SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e"
+SRCREV_pn-libzypp = "4494797d5b0369365b1af63921de45b197ead64f"
 SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
 SRCREV_pn-linux-omap3-pm ??= "totallybroken"
 SRCREV_pn-linux-wrs_machine_qemuarm ??= "4aa0da110cecac871b4ac8de9f4281568d6612a1"
@@ -120,6 +121,7 @@ SRCREV_pn-qemu-nativesdk ??= "${QEMUSRCREV}"
 SRCREV_pn-qemu ??= "${QEMUSRCREV}"
 SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
 SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
+SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc"
 SRCREV_pn-screenshot ??= "292"
 SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf"
 SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
@@ -145,4 +147,4 @@ SRCREV_pn-xvideo-tests ??= "270"
 SRCDATE_yaffs2-utils-native ??= "20071107"
 SRCDATE_yaffs2-utils ??= "20071107"
 SRCREV_pn-zaurusd ??= "358"
-
+SRCREV_pn-zypper = "9eb0e248e06c8d20ad054be2439149d9ede37531"

diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 61a140050de1a5b9f8127c382fcec187a7688a67..a2856d147571aa5be3d50341d61fc5aca0e1ff3a 100644 (file)
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -8,12 +8,10 @@ inherit cmake
 
 DEPENDS  = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev"
 
-S       = "${WORKDIR}/git"
-PV      = "0.0-git${SRCPV}"
+S = "${WORKDIR}/git"
+PV = "0.0-git${SRCPV}"
 PR = "r0"
 
-SRCREV = "4494797d5b0369365b1af63921de45b197ead64f"
-
 SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
            file://no-doc.patch \
            file://rpm5.patch"

diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index b14325ae447a5f4ef05458577b27f0f93c1e00ac..343b2f342115fc27830e9e1d60bf352f8cb086f1 100644 (file)
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -9,8 +9,6 @@ DEPENDS = "libcheck rpm zlib expat"
 PV = "0.0-git${SRCPV}"
 PR = "r0"
 
-SRCREV = "aa799f7bae0ec055e0e527203635001bb7346dbc"
-
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://cmake.patch \
            file://rpm5.patch"

diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index b7adb0f60277c4e95a54d4d8be669ecfc82b7e3e..09778f80a3c904bb1443843dc35efbfb121c4f72 100644 (file)
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -9,11 +9,9 @@ PR = "r0"
 
 inherit cmake
 
-SRCREV = "9eb0e248e06c8d20ad054be2439149d9ede37531"
-
 SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \
            file://cmake.patch \
           "
-S       = "${WORKDIR}/git"
+S = "${WORKDIR}/git"
 
-PV      = "1.4.7-git${SRCPV}"
+PV = "1.4.7-git${SRCPV}"