diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-06 14:56:35 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-06 14:56:57 +0100 |
commit | 95b2d9395e62a770f976b97175247d4e7522d9b6 (patch) | |
tree | 2e377250fb47f8d3541e844b7b9c524fdee61c4d | |
parent | b78d5368ccd333587ec475be3f3fe058ec9045f2 (diff) | |
download | poky-95b2d9395e62a770f976b97175247d4e7522d9b6.tar.gz |
poky-default-revisions.inc: Move SRCREVs to correct locations, fix whitespace
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 4 | ||||
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/zypper/zypper_git.bb | 6 |
4 files changed, 7 insertions, 11 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 9b661d2fb8..62d0b27298 100644 --- 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" | |||
66 | SRCREV_pn-libxext ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" | 66 | SRCREV_pn-libxext ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" |
67 | SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" | 67 | SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" |
68 | SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e" | 68 | SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e" |
69 | SRCREV_pn-libzypp = "4494797d5b0369365b1af63921de45b197ead64f" | ||
69 | SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78" | 70 | SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78" |
70 | SRCREV_pn-linux-omap3-pm ??= "totallybroken" | 71 | SRCREV_pn-linux-omap3-pm ??= "totallybroken" |
71 | SRCREV_pn-linux-wrs_machine_qemuarm ??= "4aa0da110cecac871b4ac8de9f4281568d6612a1" | 72 | SRCREV_pn-linux-wrs_machine_qemuarm ??= "4aa0da110cecac871b4ac8de9f4281568d6612a1" |
@@ -120,6 +121,7 @@ SRCREV_pn-qemu-nativesdk ??= "${QEMUSRCREV}" | |||
120 | SRCREV_pn-qemu ??= "${QEMUSRCREV}" | 121 | SRCREV_pn-qemu ??= "${QEMUSRCREV}" |
121 | SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" | 122 | SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" |
122 | SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" | 123 | SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" |
124 | SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc" | ||
123 | SRCREV_pn-screenshot ??= "292" | 125 | SRCREV_pn-screenshot ??= "292" |
124 | SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" | 126 | SRCREV_pn-table ??= "4b267533ce16656cba4104fc39dc12709c1bdddf" |
125 | SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65" | 127 | SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65" |
@@ -145,4 +147,4 @@ SRCREV_pn-xvideo-tests ??= "270" | |||
145 | SRCDATE_yaffs2-utils-native ??= "20071107" | 147 | SRCDATE_yaffs2-utils-native ??= "20071107" |
146 | SRCDATE_yaffs2-utils ??= "20071107" | 148 | SRCDATE_yaffs2-utils ??= "20071107" |
147 | SRCREV_pn-zaurusd ??= "358" | 149 | SRCREV_pn-zaurusd ??= "358" |
148 | 150 | SRCREV_pn-zypper = "9eb0e248e06c8d20ad054be2439149d9ede37531" | |
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 61a140050d..a2856d1475 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb | |||
@@ -8,12 +8,10 @@ inherit cmake | |||
8 | 8 | ||
9 | DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" | 9 | DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | PV = "0.0-git${SRCPV}" | 12 | PV = "0.0-git${SRCPV}" |
13 | PR = "r0" | 13 | PR = "r0" |
14 | 14 | ||
15 | SRCREV = "4494797d5b0369365b1af63921de45b197ead64f" | ||
16 | |||
17 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ | 15 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ |
18 | file://no-doc.patch \ | 16 | file://no-doc.patch \ |
19 | file://rpm5.patch" | 17 | 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 b14325ae44..343b2f3421 100644 --- 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" | |||
9 | PV = "0.0-git${SRCPV}" | 9 | PV = "0.0-git${SRCPV}" |
10 | PR = "r0" | 10 | PR = "r0" |
11 | 11 | ||
12 | SRCREV = "aa799f7bae0ec055e0e527203635001bb7346dbc" | ||
13 | |||
14 | SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ | 12 | SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ |
15 | file://cmake.patch \ | 13 | file://cmake.patch \ |
16 | file://rpm5.patch" | 14 | file://rpm5.patch" |
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb index b7adb0f602..09778f80a3 100644 --- a/meta/recipes-extended/zypper/zypper_git.bb +++ b/meta/recipes-extended/zypper/zypper_git.bb | |||
@@ -9,11 +9,9 @@ PR = "r0" | |||
9 | 9 | ||
10 | inherit cmake | 10 | inherit cmake |
11 | 11 | ||
12 | SRCREV = "9eb0e248e06c8d20ad054be2439149d9ede37531" | ||
13 | |||
14 | SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \ | 12 | SRC_URI = "git://gitorious.org/opensuse/zypper.git;protocol=git \ |
15 | file://cmake.patch \ | 13 | file://cmake.patch \ |
16 | " | 14 | " |
17 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
18 | 16 | ||
19 | PV = "1.4.7-git${SRCPV}" | 17 | PV = "1.4.7-git${SRCPV}" |