diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-30 22:59:52 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-30 22:59:52 +0100 |
| commit | b0ab0545bf361b06d7a22d5106508df299d4ddf3 (patch) | |
| tree | 088fcb4bd290e242b06b6522cc399b4923643e9d /conf | |
| parent | ab3568778b3617ce15811c0004d96a6bc3323bd6 (diff) | |
| parent | 2ec047c78aea8d59e538d826d0c0187ca54e214d (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | conf/machine/include/tune-strongarm.inc | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 061a24eba6..d01c21c3d2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1418,6 +1418,10 @@ sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93 md5=f61c623cdb3c3b2aed05bbc868050ddd sha256=b0d0f723a08372ac0889e44a590ee1f13f8c5487b394181396f978191a627bdd +[http://www.abisource.com/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz] +md5=284fe25289c160c3797b527a8aacad12 +sha256=f51b614b1202cf63a5f7ede093d31d638ece3c8e76da4036cc4aed589a9cd2ec + [http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz] md5=b1ce7ca49a0ee4e04f828e10eaebe6a9 sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2f22a7d91d..715416798d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -232,6 +232,7 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" +SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index 2a583fe6e4..fc4737999d 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -2,8 +2,6 @@ # gcc does not differentiate between the different Strongarm versions, so neither do we # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html -ARM_ABI = "oabi" TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" -FEED_ARCH = "arm-oabi" -PACKAGE_BASE_ARCH = "armv4" -PACKAGE_EXTRA_ARCHS += "armv4 " +FEED_ARCH = "armv4" +BASE_PACKAGE_ARCH = "armv4" |