From 02445fca7b6d222c94a6bb3efd35d094025ae5fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 7 Oct 2010 21:24:11 +0100 Subject: poky-default-revisions.inc: Move SRCREV settings into this file Signed-off-by: Richard Purdie --- meta/conf/distro/include/poky-default-revisions.inc | 21 +++++++++++++++++++++ meta/recipes-bsp/uboot/u-boot-omap3_git.bb | 2 -- meta/recipes-bsp/x-load/x-load_git.bb | 2 -- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-devtools/opkg/opkg-nogpg_svn.bb | 2 -- meta/recipes-extended/devicekit/devicekit_git.bb | 1 - .../linux-firmware/linux-firmware_git.bb | 2 -- .../linux/linux-omap-zoomsync_2.6.32.bb | 1 - meta/recipes-kernel/linux/linux-omap2_git.bb | 2 -- meta/recipes-kernel/linux/linux-omap3-pm_git.bb | 2 -- meta/recipes-kernel/linux/linux-omap3_git.bb | 2 -- meta/recipes-kernel/linux/linux-omap_2.6.29.bb | 2 -- 12 files changed, 22 insertions(+), 19 deletions(-) (limited to 'meta') 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" SRCREV_pn-contacts ??= "19853893fdb595de6aa59db0d9dc2f9451ed2933" SRCREV_pn-dates ??= "514185dc1f6588085fda41eb59898b93d0487dd4" SRCREV_pn-dbus-wait ??= "426" +SRCREV_pn-devicekit ??= "014d168ba4bf40c9bae487bacff8bf2aa054b5f6" SRCREV_pn-dri2proto ??= "66c56ab10d917e3f47f93178d7eac6430970d3c4" SRCREV_pn-dtc ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" SRCREV_pn-dtc-native ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" SRCREV_pn-eds-dbus ??= "7337d11aed576e7caaa12b4e881ad8d33668799f" SRCREV_pn-eee-acpi-scripts ??= "df785afdacedf869b20fb88a793c13b539819270" +EGLIBCREV = "10809" +SRCREV_pn-eglibc ??= "${EGLIBCREV}" +SRCREV_pn-eglibc-initial ??= "${EGLIBCREV}" +SRCREV_pn-eglibc-nativesdk ??= "${EGLIBCREV}" +SRCREV_pn-eglibc-initial-nativesdk ??= "${EGLIBCREV}" SRCREV_pn-exmap-console ??= "405" SRCREV_pn-fstests ??= "266" SRCREV_pn-gaku ??= "399" @@ -69,7 +75,12 @@ SRCREV_pn-libxext ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" SRCREV_pn-libxext-nativesdk ??= "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e" SRCREV_pn-libzypp = "4494797d5b0369365b1af63921de45b197ead64f" +SRCREV_pn-linux-firmware ??= "85212bf6501da865e570f6b2f6fbd6f212850609" SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78" +SRCREV_pn-linux-omap ??= "58cf2f1425abfd3a449f9fe985e48be2d2555022" +SRCREV_pn-linux-omap-zoomsync ??= "015cbaf1035cd9a61d33a27de2a22902555db3c5" +SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3" +SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e" SRCREV_pn-linux-omap3-pm ??= "totallybroken" SRCREV_machine_pn-linux-wrs_qemuarm ??= "4f4177b4bea5b8858acc1eeb788d80b7af0df962" SRCREV_machine_pn-linux-wrs_qemumips ??= "81f3cd467b9d51fa1dfa2d5939337cc756ae8061" @@ -104,6 +115,13 @@ SRCREV_pn-networkmanager ??= "2984" SRCREV_pn-ofono ??= "14544d5996836f628613c2ce544380ee6fc8f514" SRCREV_pn-oh-puzzles ??= "23" SRCREV_pn-ohm ??= "edfe25d49d67884bf004de7ae0724c162bb5e65e" +OPKGSRCREV = "524" +SRCREV_pn-opkg ??= "${OPKGSRCREV}" +SRCREV_pn-opkg-native ??= "${OPKGSRCREV}" +SRCREV_pn-opkg-nativesdk ??= "${OPKGSRCREV}" +SRCREV_pn-opkg-nogpg ??= "${OPKGSRCREV}" +SRCREV_pn-opkg-nogpg-native ??= "${OPKGSRCREV}" +SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}" SRCREV_pn-opkg-utils-native ??= "4747" SRCREV_pn-opkg-utils ??= "4747" SRCREV_pn-oprofileui ??= "197" @@ -131,6 +149,7 @@ SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65" SRCREV_pn-trace-cmd ??= "0d252224626bd6926324f023a65f20c165232891" SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb" SRCREV_pn-settings-daemon ??= "2059" +SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80" SRCREV_pn-ubootchart ??= "10" SRCREV_pn-webkit-gtk ??= "62027" SRCREV_pn-web-webkit ??= "110" @@ -147,7 +166,9 @@ SRCREV_pn-xserver-kdrive-glamo ??= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" SRCREV_pn-xserver-xf86-dri-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433" SRCREV_pn-xserver-xf86-dri2-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433" SRCREV_pn-xvideo-tests ??= "270" +SRCREV_pn-x-load ??= "65ed00323f3807197a83abc75d62ed2a8d3f60de" SRCDATE_yaffs2-utils-native ??= "20071107" SRCDATE_yaffs2-utils ??= "20071107" SRCREV_pn-zaurusd ??= "358" SRCREV_pn-zypper = "9eb0e248e06c8d20ad054be2439149d9ede37531" + 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 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}" -SRCREV = "f40f6db278f602b55820693634a7256b0b4e4b80" - PV = "2008.10-rc2+${PR}+git${SRCREV}" PR="r2" 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 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" -SRCREV = "65ed00323f3807197a83abc75d62ed2a8d3f60de" - PV = "1.42+${PR}+git${SRCREV}" PR="r12" 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 DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PR = "r8" -SRCREV="10809" + EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ 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 DEPENDS = "curl" PROVIDES += "opkg" -SRCREV = "${SRCREV_pn-opkg}" - EXTRA_OECONF += "--disable-gpg" DEFAULT_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 \ PV = "002+git${SRCREV}" PR = "r2" -SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6" S = "${WORKDIR}/git" 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" PROVIDES += "linux-firmware-sd8686" -SRCREV = "85212bf6501da865e570f6b2f6fbd6f212850609" - PV = "0.0+git${SRCREV}" SRC_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" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_zoom2 = "1" -SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5" OEV = "oe1+gitr${SRCREV}" PV = "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 FILESPATH = "${@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" -SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3" - PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" PR = "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 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PN}-git/${MACHINE}" -SRCREV = "${AUTOREV}" - PV = "2.6.31-rc7+pm+${PR}+git${SRCREV}" PR = "r3" 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 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap3-git/${MACHINE}" -SRCREV = "de1121fdb899f762b9e717f44eaf3fae7c00cd3e" - PV = "2.6.27-rc6+${PR}+git${SRCREV}" PR = "r30" 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" DEFAULT_PREFERENCE_overo = "1" DEFAULT_PREFERENCE_beagleboard = "1" -SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022" - # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc PR_append = "+gitr${SRCREV}" -- cgit 1.2.3-korg