summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc21
-rw-r--r--meta/recipes-bsp/uboot/u-boot-omap3_git.bb2
-rw-r--r--meta/recipes-bsp/x-load/x-load_git.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
-rw-r--r--meta/recipes-devtools/opkg/opkg-nogpg_svn.bb2
-rw-r--r--meta/recipes-extended/devicekit/devicekit_git.bb1
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb1
-rw-r--r--meta/recipes-kernel/linux/linux-omap2_git.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-omap3-pm_git.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-omap3_git.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-omap_2.6.29.bb2
12 files changed, 22 insertions, 19 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index b4e294e345..93a955c279 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -29,11 +29,17 @@ SRCREV_pn-connman-gnome ??= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
29SRCREV_pn-contacts ??= "19853893fdb595de6aa59db0d9dc2f9451ed2933" 29SRCREV_pn-contacts ??= "19853893fdb595de6aa59db0d9dc2f9451ed2933"
30SRCREV_pn-dates ??= "514185dc1f6588085fda41eb59898b93d0487dd4" 30SRCREV_pn-dates ??= "514185dc1f6588085fda41eb59898b93d0487dd4"
31SRCREV_pn-dbus-wait ??= "426" 31SRCREV_pn-dbus-wait ??= "426"
32SRCREV_pn-devicekit ??= "014d168ba4bf40c9bae487bacff8bf2aa054b5f6"
32SRCREV_pn-dri2proto ??= "66c56ab10d917e3f47f93178d7eac6430970d3c4" 33SRCREV_pn-dri2proto ??= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
33SRCREV_pn-dtc ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" 34SRCREV_pn-dtc ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
34SRCREV_pn-dtc-native ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" 35SRCREV_pn-dtc-native ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
35SRCREV_pn-eds-dbus ??= "7337d11aed576e7caaa12b4e881ad8d33668799f" 36SRCREV_pn-eds-dbus ??= "7337d11aed576e7caaa12b4e881ad8d33668799f"
36SRCREV_pn-eee-acpi-scripts ??= "df785afdacedf869b20fb88a793c13b539819270" 37SRCREV_pn-eee-acpi-scripts ??= "df785afdacedf869b20fb88a793c13b539819270"
38EGLIBCREV = "10809"
39SRCREV_pn-eglibc ??= "${EGLIBCREV}"
40SRCREV_pn-eglibc-initial ??= "${EGLIBCREV}"
41SRCREV_pn-eglibc-nativesdk ??= "${EGLIBCREV}"
42SRCREV_pn-eglibc-initial-nativesdk ??= "${EGLIBCREV}"
37SRCREV_pn-exmap-console ??= "405" 43SRCREV_pn-exmap-console ??= "405"
38SRCREV_pn-fstests ??= "266" 44SRCREV_pn-fstests ??= "266"
39SRCREV_pn-gaku ??= "399" 45SRCREV_pn-gaku ??= "399"
@@ -69,7 +75,12 @@ SRCREV_pn-libxext ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
69SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" 75SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d"
70SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e" 76SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e"
71SRCREV_pn-libzypp = "4494797d5b0369365b1af63921de45b197ead64f" 77SRCREV_pn-libzypp = "4494797d5b0369365b1af63921de45b197ead64f"
78SRCREV_pn-linux-firmware ??= "85212bf6501da865e570f6b2f6fbd6f212850609"
72SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78" 79SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
80SRCREV_pn-linux-omap ??= "58cf2f1425abfd3a449f9fe985e48be2d2555022"
81SRCREV_pn-linux-omap-zoomsync ??= "015cbaf1035cd9a61d33a27de2a22902555db3c5"
82SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
83SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e"
73SRCREV_pn-linux-omap3-pm ??= "totallybroken" 84SRCREV_pn-linux-omap3-pm ??= "totallybroken"
74SRCREV_machine_pn-linux-wrs_qemuarm ??= "4f4177b4bea5b8858acc1eeb788d80b7af0df962" 85SRCREV_machine_pn-linux-wrs_qemuarm ??= "4f4177b4bea5b8858acc1eeb788d80b7af0df962"
75SRCREV_machine_pn-linux-wrs_qemumips ??= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061" 86SRCREV_machine_pn-linux-wrs_qemumips ??= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061"
@@ -104,6 +115,13 @@ SRCREV_pn-networkmanager ??= "2984"
104SRCREV_pn-ofono ??= "14544d5996836f628613c2ce544380ee6fc8f514" 115SRCREV_pn-ofono ??= "14544d5996836f628613c2ce544380ee6fc8f514"
105SRCREV_pn-oh-puzzles ??= "23" 116SRCREV_pn-oh-puzzles ??= "23"
106SRCREV_pn-ohm ??= "edfe25d49d67884bf004de7ae0724c162bb5e65e" 117SRCREV_pn-ohm ??= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
118OPKGSRCREV = "524"
119SRCREV_pn-opkg ??= "${OPKGSRCREV}"
120SRCREV_pn-opkg-native ??= "${OPKGSRCREV}"
121SRCREV_pn-opkg-nativesdk ??= "${OPKGSRCREV}"
122SRCREV_pn-opkg-nogpg ??= "${OPKGSRCREV}"
123SRCREV_pn-opkg-nogpg-native ??= "${OPKGSRCREV}"
124SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}"
107SRCREV_pn-opkg-utils-native ??= "4747" 125SRCREV_pn-opkg-utils-native ??= "4747"
108SRCREV_pn-opkg-utils ??= "4747" 126SRCREV_pn-opkg-utils ??= "4747"
109SRCREV_pn-oprofileui ??= "197" 127SRCREV_pn-oprofileui ??= "197"
@@ -131,6 +149,7 @@ SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
131SRCREV_pn-trace-cmd ??= "0d252224626bd6926324f023a65f20c165232891" 149SRCREV_pn-trace-cmd ??= "0d252224626bd6926324f023a65f20c165232891"
132SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb" 150SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
133SRCREV_pn-settings-daemon ??= "2059" 151SRCREV_pn-settings-daemon ??= "2059"
152SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80"
134SRCREV_pn-ubootchart ??= "10" 153SRCREV_pn-ubootchart ??= "10"
135SRCREV_pn-webkit-gtk ??= "62027" 154SRCREV_pn-webkit-gtk ??= "62027"
136SRCREV_pn-web-webkit ??= "110" 155SRCREV_pn-web-webkit ??= "110"
@@ -147,7 +166,9 @@ SRCREV_pn-xserver-kdrive-glamo ??= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
147SRCREV_pn-xserver-xf86-dri-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433" 166SRCREV_pn-xserver-xf86-dri-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
148SRCREV_pn-xserver-xf86-dri2-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433" 167SRCREV_pn-xserver-xf86-dri2-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
149SRCREV_pn-xvideo-tests ??= "270" 168SRCREV_pn-xvideo-tests ??= "270"
169SRCREV_pn-x-load ??= "65ed00323f3807197a83abc75d62ed2a8d3f60de"
150SRCDATE_yaffs2-utils-native ??= "20071107" 170SRCDATE_yaffs2-utils-native ??= "20071107"
151SRCDATE_yaffs2-utils ??= "20071107" 171SRCDATE_yaffs2-utils ??= "20071107"
152SRCREV_pn-zaurusd ??= "358" 172SRCREV_pn-zaurusd ??= "358"
153SRCREV_pn-zypper = "9eb0e248e06c8d20ad054be2439149d9ede37531" 173SRCREV_pn-zypper = "9eb0e248e06c8d20ad054be2439149d9ede37531"
174
diff --git a/meta/recipes-bsp/uboot/u-boot-omap3_git.bb b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
index 480780ebfc..a083b16e95 100644
--- a/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
+++ b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
@@ -2,8 +2,6 @@ require u-boot.inc
2 2
3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}" 3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}"
4 4
5SRCREV = "f40f6db278f602b55820693634a7256b0b4e4b80"
6
7PV = "2008.10-rc2+${PR}+git${SRCREV}" 5PV = "2008.10-rc2+${PR}+git${SRCREV}"
8PR="r2" 6PR="r2"
9 7
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb
index 1c1ce128ae..49f867e1ba 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -2,8 +2,6 @@ require x-load.inc
2 2
3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" 3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}"
4 4
5SRCREV = "65ed00323f3807197a83abc75d62ed2a8d3f60de"
6
7PV = "1.42+${PR}+git${SRCREV}" 5PV = "1.42+${PR}+git${SRCREV}"
8PR="r12" 6PR="r12"
9 7
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 6518f43f85..999b0b07da 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3DEPENDS += "gperf-native" 3DEPENDS += "gperf-native"
4FILESPATHPKG =. "eglibc-svn:" 4FILESPATHPKG =. "eglibc-svn:"
5PR = "r8" 5PR = "r8"
6SRCREV="10809" 6
7EGLIBC_BRANCH="eglibc-2_12" 7EGLIBC_BRANCH="eglibc-2_12"
8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ 8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
9 file://eglibc-svn-arm-lowlevellock-include-tls.patch \ 9 file://eglibc-svn-arm-lowlevellock-include-tls.patch \
diff --git a/meta/recipes-devtools/opkg/opkg-nogpg_svn.bb b/meta/recipes-devtools/opkg/opkg-nogpg_svn.bb
index aa16b551fe..e1b9f24cca 100644
--- a/meta/recipes-devtools/opkg/opkg-nogpg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg-nogpg_svn.bb
@@ -3,8 +3,6 @@ require opkg_svn.bb
3DEPENDS = "curl" 3DEPENDS = "curl"
4PROVIDES += "opkg" 4PROVIDES += "opkg"
5 5
6SRCREV = "${SRCREV_pn-opkg}"
7
8EXTRA_OECONF += "--disable-gpg" 6EXTRA_OECONF += "--disable-gpg"
9 7
10DEFAULT_PREFERENCE = "-1" 8DEFAULT_PREFERENCE = "-1"
diff --git a/meta/recipes-extended/devicekit/devicekit_git.bb b/meta/recipes-extended/devicekit/devicekit_git.bb
index 74b639f6c1..9845a34d56 100644
--- a/meta/recipes-extended/devicekit/devicekit_git.bb
+++ b/meta/recipes-extended/devicekit/devicekit_git.bb
@@ -6,7 +6,6 @@ SRC_URI = "git://anongit.freedesktop.org/DeviceKit/DeviceKit;protocol=git \
6 6
7PV = "002+git${SRCREV}" 7PV = "002+git${SRCREV}"
8PR = "r2" 8PR = "r2"
9SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6"
10 9
11S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
12 11
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 81583fc40b..14cfc9c752 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -5,8 +5,6 @@ LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
5 5
6PROVIDES += "linux-firmware-sd8686" 6PROVIDES += "linux-firmware-sd8686"
7 7
8SRCREV = "85212bf6501da865e570f6b2f6fbd6f212850609"
9
10PV = "0.0+git${SRCREV}" 8PV = "0.0+git${SRCREV}"
11 9
12SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;protocol=git" 10SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;protocol=git"
diff --git a/meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb b/meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb
index 50dea004ed..eef22df3a1 100644
--- a/meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb
+++ b/meta/recipes-kernel/linux/linux-omap-zoomsync_2.6.32.bb
@@ -8,7 +8,6 @@ COMPATIBLE_MACHINE = "zoom2"
8DEFAULT_PREFERENCE = "-1" 8DEFAULT_PREFERENCE = "-1"
9DEFAULT_PREFERENCE_zoom2 = "1" 9DEFAULT_PREFERENCE_zoom2 = "1"
10 10
11SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5"
12OEV = "oe1+gitr${SRCREV}" 11OEV = "oe1+gitr${SRCREV}"
13 12
14PV = "2.6.32.7-${OEV}" 13PV = "2.6.32.7-${OEV}"
diff --git a/meta/recipes-kernel/linux/linux-omap2_git.bb b/meta/recipes-kernel/linux/linux-omap2_git.bb
index 4d4692dbb2..39d08b714e 100644
--- a/meta/recipes-kernel/linux/linux-omap2_git.bb
+++ b/meta/recipes-kernel/linux/linux-omap2_git.bb
@@ -2,8 +2,6 @@ require linux-omap2.inc
2 2
3FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git" 3FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git"
4 4
5SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
6
7PV = "2.6.26" 5PV = "2.6.26"
8#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" 6#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
9PR = "r53" 7PR = "r53"
diff --git a/meta/recipes-kernel/linux/linux-omap3-pm_git.bb b/meta/recipes-kernel/linux/linux-omap3-pm_git.bb
index 45bc492d8e..4acf7934a1 100644
--- a/meta/recipes-kernel/linux/linux-omap3-pm_git.bb
+++ b/meta/recipes-kernel/linux/linux-omap3-pm_git.bb
@@ -6,8 +6,6 @@ inherit kernel
6 6
7FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PN}-git/${MACHINE}" 7FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PN}-git/${MACHINE}"
8 8
9SRCREV = "${AUTOREV}"
10
11PV = "2.6.31-rc7+pm+${PR}+git${SRCREV}" 9PV = "2.6.31-rc7+pm+${PR}+git${SRCREV}"
12PR = "r3" 10PR = "r3"
13 11
diff --git a/meta/recipes-kernel/linux/linux-omap3_git.bb b/meta/recipes-kernel/linux/linux-omap3_git.bb
index d728efa0d2..f25c2c72fb 100644
--- a/meta/recipes-kernel/linux/linux-omap3_git.bb
+++ b/meta/recipes-kernel/linux/linux-omap3_git.bb
@@ -2,8 +2,6 @@ require linux-omap2.inc
2 2
3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap3-git/${MACHINE}" 3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap3-git/${MACHINE}"
4 4
5SRCREV = "de1121fdb899f762b9e717f44eaf3fae7c00cd3e"
6
7PV = "2.6.27-rc6+${PR}+git${SRCREV}" 5PV = "2.6.27-rc6+${PR}+git${SRCREV}"
8PR = "r30" 6PR = "r30"
9 7
diff --git a/meta/recipes-kernel/linux/linux-omap_2.6.29.bb b/meta/recipes-kernel/linux/linux-omap_2.6.29.bb
index f0769f8556..3829aef2c0 100644
--- a/meta/recipes-kernel/linux/linux-omap_2.6.29.bb
+++ b/meta/recipes-kernel/linux/linux-omap_2.6.29.bb
@@ -9,8 +9,6 @@ DEFAULT_PREFERENCE = "-1"
9DEFAULT_PREFERENCE_overo = "1" 9DEFAULT_PREFERENCE_overo = "1"
10DEFAULT_PREFERENCE_beagleboard = "1" 10DEFAULT_PREFERENCE_beagleboard = "1"
11 11
12SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022"
13
14# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc 12# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
15PR_append = "+gitr${SRCREV}" 13PR_append = "+gitr${SRCREV}"
16 14