diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-10-17 16:13:06 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-17 16:13:06 +0200 |
| commit | 0c14e65143ff50b2de8dcd5e25112f055b3f8cb7 (patch) | |
| tree | adf040702685683bd939f65a378227eb498ce12e | |
| parent | 38f6b8d09068b79a011840ce32ad93df72546a8d (diff) | |
| parent | 6ec5c4c167832805032ffc2e17d76ee6fc1e027f (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 3 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko_2.6.24+git.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-xserver/xorg-xserver-common.inc | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index e4c41a77f9..a4072a35bd 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4166,6 +4166,10 @@ sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a md5=4afa0290cc3a41ac8822666f1110de98 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] +md5=5dfac5da961ecd5f227c3175859a486d +sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 + [ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index a66b1e4ac7..48cbb49d2c 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -57,6 +57,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc # We don't want to keep OABI compat ARM_KEEP_OABI = "0" +# Do keep OABI compat for om-gta01 to keep the gllin binary working +ARM_KEEP_OABI_pn-linux-openmoko_om-gta01 = "1" + #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb index 7c65d6c112..524b22a311 100644 --- a/packages/linux/linux-openmoko_2.6.24+git.bb +++ b/packages/linux/linux-openmoko_2.6.24+git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.24" KERNEL_VERSION = "${KERNEL_RELEASE}" PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}" -FILE_PR = "r9" +FILE_PR = "r10" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \ diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 666946b71a..2c16eeacc9 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" -RDEPENDS_${PN} = "hal" +RECOMMENDS_${PN} = "hal" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ |