diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-14 14:19:55 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-14 14:19:55 +0400 |
| commit | d4a2ec9e83d5a0da21bde9a62f36c0b1b3879262 (patch) | |
| tree | 7460a79b520f6541b71ead884ea5d709c1e85162 /conf/distro | |
| parent | f7ee7a19617c177760e3533f2ca93673953549c4 (diff) | |
| parent | 5c5e0a1bc249a49514809462e0c921a9afce2217 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 15 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
3 files changed, 7 insertions, 13 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index a466834968..bb50220f29 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -17,8 +17,8 @@ #DISTRO_VERSION = "2009.X" DISTRO_VERSION = "2009.X-test-${DATE}" -DISTRO_REVISION = "1" -DISTRO_PR = ".1" +DISTRO_REVISION = "2" +DISTRO_PR = ".2" #build staging from packages INHERIT += "packaged-staging" @@ -46,7 +46,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)} # set feed path variables -FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/" +FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback @@ -99,9 +99,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" # Blackfin has its on gcc ANGSTROM_GCC_VERSION_bfin = "4.1.2" -ANGSTROM_GCC_VERSION_486sx = "4.3.3" -ANGSTROM_GCC_VERSION_armv7a = "4.3.3" - # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53" @@ -109,10 +106,10 @@ ANGSTROM_GCC_VERSION_armv7a = "4.3.3" ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" #Everybody else can just use this: -ANGSTROM_GCC_VERSION ?= "4.2.4" +ANGSTROM_GCC_VERSION ?= "4.3.3" -#2.19.51.0.3 -ANGSTROM_BINUTILS_VERSION ?= "2.18.50.0.7" +ANGSTROM_BINUTILS_VERSION ?= "2.18" +ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index d8c3cd78df..7e921bf06a 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -32,9 +32,6 @@ require conf/distro/include/angstrom-${LIBC}.inc # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" -ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb" ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 49326f4806..bd78008dd0 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -253,7 +253,7 @@ SRCREV_pn-webkit-gtk ?= "43434" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" -SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77" +SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" |