summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf13
-rw-r--r--conf/checksums.ini181
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc2
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc8
-rw-r--r--conf/machine/acern30.conf1
-rw-r--r--conf/machine/amsdelta.conf1
-rw-r--r--conf/machine/asus620.conf1
-rw-r--r--conf/machine/asus730.conf2
-rw-r--r--conf/machine/at91-l9260.conf1
-rw-r--r--conf/machine/at91sam9260ek.conf1
-rw-r--r--conf/machine/at91sam9261ek.conf1
-rw-r--r--conf/machine/at91sam9263ek.conf1
-rw-r--r--conf/machine/aximx50.conf2
-rw-r--r--conf/machine/bd-neon.conf1
-rw-r--r--conf/machine/beagleboard.conf1
-rw-r--r--conf/machine/chumby.conf1
-rw-r--r--conf/machine/cm-x270.conf2
-rw-r--r--conf/machine/cs-e9302.conf1
-rw-r--r--conf/machine/davinci-dvevm.conf1
-rw-r--r--conf/machine/davinci-sffsdr.conf1
-rw-r--r--conf/machine/devkitidp-pxa255.conf1
-rw-r--r--conf/machine/em-x270.conf2
-rw-r--r--conf/machine/ep93xx.conf1
-rw-r--r--conf/machine/er0100.conf1
-rw-r--r--conf/machine/eseries.conf1
-rw-r--r--conf/machine/eteng500.conf1
-rw-r--r--conf/machine/fsg3be.conf2
-rw-r--r--conf/machine/gesbc-9302.conf1
-rw-r--r--conf/machine/ghi270.conf2
-rw-r--r--conf/machine/h1910.conf1
-rw-r--r--conf/machine/h1940.conf1
-rw-r--r--conf/machine/h2200.conf1
-rw-r--r--conf/machine/h3900.conf1
-rw-r--r--conf/machine/h4000.conf1
-rw-r--r--conf/machine/h5000.conf1
-rw-r--r--conf/machine/h6300.conf1
-rw-r--r--conf/machine/htcalpine.conf1
-rw-r--r--conf/machine/htcapache.conf1
-rw-r--r--conf/machine/htcblueangel.conf1
-rw-r--r--conf/machine/htchimalaya.conf1
-rw-r--r--conf/machine/htckaiser.conf6
-rw-r--r--conf/machine/hx4700.conf2
-rw-r--r--conf/machine/include/motorola-ezx-base.inc1
-rw-r--r--conf/machine/include/tune-arm1136jf-s.inc2
-rw-r--r--conf/machine/include/tune-arm920t.inc1
-rw-r--r--conf/machine/include/tune-arm926ejs.inc2
-rw-r--r--conf/machine/include/tune-arm9tdmi.inc1
-rw-r--r--conf/machine/include/tune-armv7.inc1
-rw-r--r--conf/machine/include/tune-athlonmp.inc1
-rw-r--r--conf/machine/include/tune-c3.inc1
-rw-r--r--conf/machine/include/tune-cortexa8.inc1
-rw-r--r--conf/machine/include/tune-ep9312.inc1
-rw-r--r--conf/machine/include/tune-iwmmxt.inc2
-rw-r--r--conf/machine/include/tune-pentium.inc2
-rw-r--r--conf/machine/include/tune-pentiumpro.inc2
-rw-r--r--conf/machine/include/tune-xscale.inc1
-rw-r--r--conf/machine/include/zaurus-2.6.inc1
-rw-r--r--conf/machine/neuros-osd.conf2
-rw-r--r--conf/machine/neuros-osd2.conf2
-rw-r--r--conf/machine/nokia770.conf1
-rw-r--r--conf/machine/nokia800.conf1
61 files changed, 215 insertions, 65 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c5feb09be0..e118245f29 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -142,10 +142,11 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
DEBPV = "${EXTENDPEVER}${PV}-${PR}"
P = "${PN}-${PV}"
-##################################################################
-# Distro default
-##################################################################
-DISTRO_PR ?= ""
+# Base package name
+# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
+# otherwise it is the same as PN and P
+BPN = "${@base_package_name(d)}"
+BP = "${BPN}-${PV}"
# Package info.
@@ -216,7 +217,7 @@ FILES_${PN}-locale = "${datadir}/locale"
export MANIFEST = "${FILESDIR}/manifest"
FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
-FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
##################################################################
@@ -236,7 +237,7 @@ STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}"
WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
T = "${WORKDIR}/temp"
D = "${WORKDIR}/image"
-S = "${WORKDIR}/${P}"
+S = "${WORKDIR}/${BP}"
B = "${S}"
STAGING_DIR = "${TMPDIR}/staging"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5bbcd46816..d6123ebc16 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -546,6 +546,10 @@ sha256=6fd69febfd804437a9d5b610502c6d3c2caabef7a4832a3bcac2357515adaa71
md5=8741490a25b98230973446400971bba9
sha256=c1f29cfd31c335a409bdc530c2e68661d20a1e3c2e5d64454470b6700a40681e
+[http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2]
+md5=cfe660ecf50e9d3b073576bbc4af6ab2
+sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7
+
[http://search.cpan.org/CPAN/authors/id/M/MA/MARKF/Test-Builder-Tester-1.01.tar.gz]
md5=4751252f1e33af4f582c8af4c7b7666f
sha256=62bc416ccb3f01c3911d9744d6c865d9fa4d008bd47dbecc2adde5c3892ce868
@@ -1286,6 +1290,14 @@ sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b
md5=5afcef5d6047f14cd5f65d2fdbd86fb2
sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
+md5=5afcef5d6047f14cd5f65d2fdbd86fb2
+sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
+
+[ftp://ftp.us.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
+md5=5afcef5d6047f14cd5f65d2fdbd86fb2
+sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
+
[ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.9.tar.gz]
md5=2dd8ad238abcbab478db690085554d90
sha256=a9d7ac67598b2b004a53a9e70592e0f274d3c8731ed9395ed704fd0259f0c0af
@@ -1902,6 +1914,10 @@ sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443
md5=9c9f06c2d949c6de844c7bed8eb47064
sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03
+[http://www.busybox.net/downloads/busybox-1.11.3.tar.gz]
+md5=d113f2777e4f508faa8b674ece87a37b
+sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f
+
[http://www.busybox.net/downloads/busybox-1.2.0.tar.gz]
md5=6af69ebbbf8adc874ccb6d67dca95df5
sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0
@@ -2034,6 +2050,10 @@ sha256=7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
md5=c612f581b18903b0751a171685fc38dd
sha256=5268faa116a48a68dd74abb245b26b20f1729d3bd56a8414e429904eb1bae124
+[http://cairographics.org/releases/cairomm-1.2.4.tar.gz]
+md5=5d862facfbd0098c9bae618b61f7c8e6
+sha256=a137ccd4a6cde6c9e9553966534702d2e7f6f44c755dfe128d9fb26ed2697fe7
+
[http://gpephone.linuxtogo.org/download/gpephone/calendar-1.0/calendar-1.0.tar.gz]
md5=eb7be3b85955a1bbe7a0154cbf2f70f9
sha256=7e6425b688a2d4bbeef0904cac52737b232d03fdc4d35866fd03359f2d5f1794
@@ -2070,6 +2090,10 @@ sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435
md5=b8c51a2e3cccb381428426c0fc543244
sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485
+[http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2]
+md5=ebb5fc927d73cd63737a9114481e8957
+sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
+
[http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/ccxstream-1.0.15.tar.gz]
md5=c589fff48ce541f26b394c9d82ccbead
sha256=2dec31ba4a176c921a653c0949a53c2d3497e047737724350897fd2534db18fe
@@ -2274,6 +2298,10 @@ sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
md5=32b0df93b285ee094e053552d9301cb6
sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321
+[http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz]
+md5=d8f3bbfbcc337d9776991d9561f451f3
+sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
+
[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch]
md5=97cdbeb23bc8c8f4fe563d10a0c8c110
sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378
@@ -2862,6 +2890,10 @@ sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
md5=14d2853df66054f83d73f7601bc60c8b
sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
+[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.39-1.diff.gz]
+md5=14d2853df66054f83d73f7601bc60c8b
+sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
+
[ftp://ftp.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
md5=2d29a68f8fb75b3bed7a18f3d0a002bb
sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
@@ -2870,6 +2902,10 @@ sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
md5=2d29a68f8fb75b3bed7a18f3d0a002bb
sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
+[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
+md5=2d29a68f8fb75b3bed7a18f3d0a002bb
+sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
+
[ftp://ftp.gnu.org/gnu/diffutils/diffutils-2.8.1.tar.gz]
md5=71f9c5ae19b60608f6c7f162da86a428
sha256=c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a
@@ -2906,6 +2942,10 @@ sha256=57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
md5=c94091de014b3aaf037d3d0f398d36c2
sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
+[http://savannah.nongnu.org/download/dmidecode/dmidecode-2.9.tar.bz2]
+md5=3dac4b1817012ffebd78671473d8f56c
+sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015
+
[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2]
md5=d80acad88411e7944b9b085463d53302
sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
@@ -3026,6 +3066,10 @@ sha256=677a8cd27d05b1401ddef152270a498fc4d34cb9ba94779c571f2f2794b20811
md5=a2d7803976f82db3edeb374109cba6df
sha256=8ae0026054fb9f437d59a3bb932628fc2915af6697e430325e0950e960ca6c34
+[http://install.tarball.in.source.dir/dsplink_1_60_00_04.tar.gz]
+md5=2b53c067c683266379dddbb38e65cb45
+sha256=b1a0508444241c61585321eaadc32f476ef441f267636fbd0fb2f0c7ebf0fcbb
+
[http://www.jdl.com/pub/software/dtc-20070216.tgz]
md5=8762121262ead127171c4fce40ccc289
sha256=dd687b4f691bf9970f53ca2c84d8481b9f82d857de347375d29bacf648b8da71
@@ -3190,6 +3234,10 @@ sha256=c493b9a22c9580d49fd90d2bb6955435ccba9304ecb382411864041d914c94d6
md5=74c7255a56ffa8e37147a1a0cfe40565
sha256=51eab13f16c48433035e84b8eb6c66afbbf3e48199323d25f4f9a09c8047d078
+[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.24/empathy-2.24.0.tar.bz2]
+md5=89e6dc430ad198c8044f261645d8bc6c
+sha256=5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9
+
[http://download.berlios.de/emul/emul-1.0.5.tar.gz]
md5=f713b4d3c6a733b429de2673e4427483
sha256=b91c7fb6420f6787d34b88b1e0d2e705e1006b5bce17235356f84a3c14329612
@@ -3478,6 +3526,14 @@ sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa
md5=9441c981bfd4e521abcd5d93385f71d8
sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
+md5=9441c981bfd4e521abcd5d93385f71d8
+sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
+
+[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
+md5=9441c981bfd4e521abcd5d93385f71d8
+sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
+
[ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
md5=1c5a2ea659680bdd1e238d7828a857a7
sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -3946,6 +4002,10 @@ sha256=bcf668c1123f4d73a4c503ff189446cf4b30d64466fea49628999cdce8661c67
md5=5eaf8e8d1978ca4bbead5b3f163b23a1
sha256=b8e60157a14739da9382e23e296a0236b0c246b486b4803a1baaa4a73c5bf8d9
+[http://downloads.sourceforge.net/free42/free42.tgz]
+md5=1fc21e04b3b77150846027dc7cb5210d
+sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a
+
[ftp://ftp.freeciv.org/freeciv/stable/freeciv-1.14.1.tar.bz2]
md5=d328f65e7fca5252f27161f5f9e97a03
sha256=8a963570e5c4ea432b0e31d77d3605705bda91a9f97ff377c5c3204ca768e342
@@ -4038,6 +4098,10 @@ sha256=568896b458a4a8682a78a03248463a182bf3a34c18753a72cb9ca2c1bec3498c
md5=e6f102e10f0861c972a250e4fc57fdc2
sha256=d8e6067ae7b24bbb4bd32ea1fadc119d72b58a71dc537bf8fb2635f3122d6906
+[http://www.firestorm.cx/fswebcam/files/fswebcam-20070108.tar.gz]
+md5=f7619566779f4484d3acd806cdc30f5f
+sha256=82dd976a64919383aabccf760257bcef52621e428b0af922a7d4886b54477937
+
[http://www.codemonkey.org.uk/projects/fsx/fsx-linux.c]
md5=0ee07cbdfe8c5f838f653c0fb7328c4d
sha256=fa1b97a6d9d2f7d7699f6b0ccd433ab132c7d10835b449ed14b12b48e7749aad
@@ -4378,6 +4442,10 @@ sha256=176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac
md5=85bb8ee345fc41c218de19dda0164806
sha256=90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89
+[http://downloads.sourceforge.net/giflib/giflib-4.1.6.tar.bz2]
+md5=7125644155ae6ad33dbc9fc15a14735f
+sha256=e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
+
[http://downloads.sourceforge.net/gift/gift-0.11.4.tar.bz2]
md5=decc82159c6723be999b1306a808077f
sha256=68149059b807b2fac505e376c18320e64104fbe0190e359f98059e73a63693dc
@@ -4606,6 +4674,10 @@ sha256=9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
md5=11cf6d3fc86dbe0890b8d00372eb6286
sha256=3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.7.tar.bz2]
+md5=065c5952b439deba40083ccd67bcc8f7
+sha256=4224a522ac4ee0fd89eb337e7505e280dfb05e2fe1ad44339ba8874081c0451a
+
[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2]
md5=e2d892b40d654c523ab26a26b7dd86a1
sha256=2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977
@@ -4618,6 +4690,10 @@ sha256=de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede
md5=503f1315afd808728ebaa75b3d87a7d9
sha256=67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.7.tar.bz2]
+md5=226809992fb1f3dc6ea23e0f26952ea4
+sha256=07de78810a5320d696792b67131c4cf3d6654aee015a6b74820d66fb00799000
+
[ftp://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz]
md5=c766a79a51668d7fa33f175a249655b4
sha256=c027824ee6593a838e0883bdd4bf8bd455b3dcf4ff0aa77fe82452819d882f47
@@ -4642,6 +4718,14 @@ sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
md5=53d88ca624642dd267752ccce77b19d0
sha256=d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.7.tar.bz2]
+md5=eaeb8527b8fa286c2d887157214f9998
+sha256=3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
+
+[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-2.18.0.tar.bz2]
+md5=1a0df362e15e7f850b8361b5102f1f16
+sha256=ca6c46b87748cabd61e7d5ef892f09f433eaea324e63637f7de1f0217465cd31
+
[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2]
md5=952cdde2d6aef201c528d431036d71e1
sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
@@ -4870,6 +4954,10 @@ sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
md5=d8f8e61d99402e8b0a82d3c8d6e873be
sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/gnome-system-monitor-2.24.0.tar.bz2]
+md5=edd7f02e30683054b94a89aa62c74d1e
+sha256=cf2f96f3c91749fdcec39d3eb89273f6d3a47cc7bc0c5faa0915808409c9d563
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.6/gnome-themes-2.6.2.tar.bz2]
md5=4aae39232d77e1497f3180202b501adf
sha256=471191e942fdd1d691095c71fb22c0a645b3644c3b2b1c58a6d6f1a2435fb818
@@ -6242,6 +6330,10 @@ sha256=4b104ab94774ca429aa639a1a6f0adec1ca1443bfd444f2100c063e3cf70e6bb
md5=b53564e553728d4b69f7d366dfeb5299
sha256=1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
+[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/gtkmm-2.14.1.tar.bz2]
+md5=0209b424987a74c956ea6b70fddaaa37
+sha256=f8675340d929346333b5a58cd4d05482dd8b76cf8606fed85b526022bf9c5e47
+
[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-2.4.8.tar.bz2]
md5=c2aee4c259a75fa0dc766d402bef253b
sha256=218420f1c091846fa5f860e5f12c57650d8719f6cf9b922e7c6a69e0505aac32
@@ -7074,6 +7166,10 @@ sha256=0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97
md5=007ff9e08e26504f5c28462d7bbdaa3e
sha256=c682a23faf732203a7de9b82ffb736396e5948e000ab10c1a42b0e936b6cc329
+[http://downloads.sourceforge.net/ivman/ivman-0.6.14.tar.bz2]
+md5=ebef12559268e2c5ea932cbb5aaa789e
+sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
+
[http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2]
md5=e3013bb1e287b495b0668f4b6e2887c7
sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
@@ -7106,6 +7202,10 @@ sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867
md5=c7affcc61d4135ee838121a57b08de0f
sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
+[http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz]
+md5=3f538bab6e1c77aed331e5e71f754f5b
+sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
+
[http://downloads.sourceforge.net/jamvm/jamvm-1.5.0.tar.gz]
md5=a965452442cdbfc94caba57d0dd25a8f
sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
@@ -7378,6 +7478,10 @@ sha256=f532fcd61b012379d3258196a8588fd9d51ecdfb5c795485ab2f78d439b103b4
md5=b6d7ca9e9740286f0ce918da9fb8438b
sha256=0ee6a3caee4812827b8e167d4a07dbf859cb08a00a20f09568c3baae379d6ce8
+[http://downloads.sourceforge.net/lesstif/lesstif-0.95.0.tar.bz2]
+md5=ab895165c149d7f95843c7584b1c7ad4
+sha256=e5ef90ff30897448a7c090c2e31ceb302ed064a60411436e8995580848ed1a63
+
[ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2]
md5=c6d48782cdad4759000bf7cd24555723
sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
@@ -10710,6 +10814,10 @@ sha256=25cba395022c878cf0323da5b2b4aba1cca03001311a4e2d7632d6a199806294
md5=4d0f89a23f77e22f1671a77bf0898955
sha256=2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074
+[http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.4.tar.bz2]
+md5=35394bf3f746a57fba624dba52fdbba3
+sha256=6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontdir-X11R7.0-1.0.1.tar.bz2]
md5=29e6e5e8e7a29ed49abf33af192693cb
sha256=409f2fdfd87b5185ca651197c1d1facc22619bc1399bfb8dda8fda1fbb6205b2
@@ -10718,6 +10826,10 @@ sha256=409f2fdfd87b5185ca651197c1d1facc22619bc1399bfb8dda8fda1fbb6205b2
md5=384ee10787c455c520bcf031989de6f3
sha256=94c4ab96ad858524b64864482f5623bd18f844b98788d7d4be1f8065a4f13a0d
+[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.5.tar.bz2]
+md5=5e6e210b70adfef1264b0212aab1f758
+sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontscale-X11R7.0-1.0.1.tar.bz2]
md5=75bbd1dc425849e415a60afd9e74d2ff
sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
@@ -11130,6 +11242,10 @@ sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
md5=4e4582ed5f84fa074137c1a7ee39a689
sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
+[ftp://ftp.us.debian.org/debian/pool/main/n/netbase/netbase_4.21.tar.gz]
+md5=4e4582ed5f84fa074137c1a7ee39a689
+sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
+
[http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
@@ -11706,6 +11822,10 @@ sha256=4cf04489ff291f3f1835783b8cfa8347d99f6a05d7d9da21c8d737f441bea3ac
md5=91f386893ff483e14dc4571e352150e4
sha256=97cc77b93ce65e4f138e284f799c9ae7153b6f81720553c3c120b7317692b537
+[ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-2.14.0.tar.bz2]
+md5=85be0a654ed521e5594f64efdb3fa7d8
+sha256=211a0092cfd50923eaad75c20630c0a1818e56605d4b6fbc10702d5a34ea7107
+
[http://xlibs.freedesktop.org/release/panoramixext-1.1.tar.bz2]
md5=129f8623dc4f70188a015e3cbd7eae82
sha256=74188aff5f2e5b77515a8cf3979199a598d58da8e4f573462b59cbf94cf1c99d
@@ -11890,6 +12010,10 @@ sha256=5bad39b0d28f294f10690d15bc1e54ba549324a7ce26db1406f3c3a50cd1d504
md5=b5f96d823b1183ba0c4e61516e1a23c0
sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.26/patch-2.6.26-rc4.bz2]
+md5=b5f96d823b1183ba0c4e61516e1a23c0
+sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
+
[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.27-rc1.bz2]
md5=948b25bab0082d1db5bd8c9fac824891
sha256=2b35a35a0ab3b82b77bb2996782ef70ec15a13b9331b15bac814b891ae8f4867
@@ -11998,6 +12122,10 @@ sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
md5=2af38e083fb90ef60fa9eda7cc290e86
sha256=362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
+[http://alioth.debian.org/download.php/2479/pcsc-lite-1.4.102.tar.bz2]
+md5=b97d3a725ab93662adf09acfbc49efeb
+sha256=56fc9e6324539537324b071e5b51c3388df9bfa92fb7e210b989b463122fc333
+
[http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz]
md5=bf27dd51fe03c8b475080b74de043a13
sha256=99d6bc6b360baabd6044e8883d467cc6ed7955f9ab66d8f87f61e3cc757fb97a
@@ -12138,6 +12266,10 @@ sha256=63ed71d9b9c0f0e1283a5345f27e7e95f71a2cda8bab4150e2a4937cd8834b5d
md5=da0da7ed1689469b45c8d62fa2dfb204
sha256=25b84792473fa17d118e69b588f32fe940d13a01c3b3db89290ce6516ad01b2e
+[http://alioth.debian.org/frs/download.php/2247/pmount-0.9.17.tar.gz]
+md5=24a676bf495bec367b2d971cdca1c54c
+sha256=2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f
+
[http://downloads.sourceforge.net/gakusei/pobox-1.2.5.tar.bz2]
md5=d1c988c2ac06d3111f80d59d30bb8bbb
sha256=73bbc333d2a51d0e1cd73030012f2727ac26f5b1d41333994b01a47486fc16db
@@ -13682,6 +13814,10 @@ sha256=96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37
md5=2b53542095a35a8a5731164118643883
sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
+[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.4.tar.bz2]
+md5=6fab3bb176be9e510c5613d054ef1ca4
+sha256=9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/setxkbmap-X11R7.0-1.0.1.tar.bz2]
md5=28b141ab0b1c44a5e90d31ad73bd1078
sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b
@@ -13962,6 +14098,10 @@ sha256=b5817b8629f89e16ba88e1c62dce0321978f3aea038aa77cb61a1ff7fa3e0dbb
md5=d69c74ab8e2d7664a48a09773450dd27
sha256=59e2b9b2244c169c6580cbfffaf5e2bd2f453753f879036487ec6ed116cf851b
+[http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-1.5.4.2.tar.bz2]
+md5=00dce0efb5e6389cacbf15c62d18e413
+sha256=05265dbc948a690dc5b5710da23eb7093fa4eaabbfebd58463a2be4ab9b848b4
+
[http://www.hwaci.com/sw/sqlite/sqlite-2.8.15.tar.gz]
md5=0afa73e107bd106031d046c8ca6a94ab
sha256=8ba158121f3b20b852bd4dae9c32b5b86a6807a5deebb57f07f667a09672ea4c
@@ -14242,6 +14382,10 @@ sha256=d5b4d8a69bf72abcea74a3d02d9bed470abff0d5252c601b73ce8fe933822aea
md5=da9effc847d13f9725b6db043d8283a5
sha256=567a50863c04dc9ccf5def3c62bb9f0494e995357620603dd00bbe035ca7500e
+[http://downloads.sourceforge.net/synergy2/synergy-1.3.1.tar.gz]
+md5=a6e09d6b71cb217f23069980060abf27
+sha256=4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691
+
[http://downloads.sourceforge.net/linux-diag/sysfsutils-1.3.0.tar.gz]
md5=d11c99271531be3c1e6d36b53968cd2b
sha256=03e3dc79fd7b36266372de0d331d792c04d185e57495c6fb1d46a0ea0ed0b04d
@@ -14442,6 +14586,10 @@ sha256=c7cbaa8edec5c9be78aa954938c64b57e6c2c0f13de260c88fefdbf849e94d4d
md5=8b9de30643f759bf2e40ccc833dd2633
sha256=76009d233a69b2d12c2aff94770dfe9fc0558e07071f941b738bab357f8fb7b9
+[http://downloads.sourceforge.net/mission-control/telepathy-mission-control-4.67.tar.gz]
+md5=0a547e7af4a33355bac3638dd2e40859
+sha256=326b82519a49a238a476c028097bde5820c4b58af500dbb5b715cdfd6fe0bfcd
+
[http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-0.15.1.tar.gz]
md5=b3e9bd31393c4cebbd8077b62b2bcd8c
sha256=02a5c752201e016905c75503217af5a25eebe3f6a4e02a75173ed34021401296
@@ -14870,6 +15018,10 @@ sha256=502e6c62fd930639987e34fbb1aaeb7b1456e2743e0d6986faf0990257921435
md5=5d16f569d2a18b6536749cc2b229649d
sha256=43604951abb43246ccd6b6e7b6935f92322f9313ded99044057b241a2a20b07b
+[http://www.unicap-imaging.org/downloads/ucview-0.22.tar.gz]
+md5=1b43c823624962bde3248ae493995750
+sha256=aabf82869707be33ac57cce1db798922b8a9329cfcba876643d49f9807fb32af
+
[http://anymore.nl/ipaq/udc_unbind.patch]
md5=07da0085296fef529ca869a108e07edc
sha256=3ffcdc0e4597046f476ae5d4250783eb563723614bad9f1f58cc0cd9932d0b1d
@@ -14930,6 +15082,10 @@ sha256=0ecaf4e174c5b8eb3c1225cc60917404e14ad613f57fd2ca290d31548f089bcf
md5=cea56d3a1a7e4f1a4d12697330c4526b
sha256=00f40bf3c8e4ed3ca169ec54352fc7499d443e443d91b7460997ddca5448905e
+[http://www.unicap-imaging.org/downloads/unicap-0.9.3.tar.gz]
+md5=69db7c7dacb58c303d44f3b6598653ee
+sha256=bf619a4675aa4b7cec9c3a664e1fcd9d869facf393e4e9e51e52490db98d6585
+
[ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.0.11.tar.gz]
md5=494651fe0cf724c093b4be80e35e857f
sha256=f1df81423a65590ffd20df43f5cd0be14cf6746437eb40c2c924f5f58a6e18a7
@@ -15358,6 +15514,10 @@ sha256=cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36
md5=96830836f64edbb12c248eb84e6b0d18
sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
+[http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
+md5=09b7b76d4a4eedf502f38df9d551d827
+sha256=
+
[ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
md5=e6051f1e1487ec0ebfdbda72bedc70ad
sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
@@ -16194,6 +16354,10 @@ sha256=7a17d709206ef881d1331c55c507f3d74f8d111060b6beae4152c92ee4b45dc5
md5=1fbdd5e9b5508b032c0102f72d1e555c
sha256=060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nsc-2.8.3.tar.bz2]
+md5=f3ffacdc9f19e00b66bdff71b6df9b4e
+sha256=e5c5a2021877b8975bee39c06096316324e04f1eac5261bc882b96353a8b1839
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-nsc-X11R7.0-2.7.6.5.tar.bz2]
md5=ab16611b3ec7d21503b16b0a31addae0
sha256=1f88d5c79cfa34230ed8a9079e6b7df194fce219909b6f7cc232c6511000839a
@@ -16266,6 +16430,10 @@ sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f
md5=559b7eeeb598b38afeb1542db6b48a0a
sha256=eab737423bfd3ecf38ee4a8d4bed86c363bb023ece283a7d515afaa1a11a394a
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.0.tar.bz2]
+md5=331d432dccccca91ec7da39ff6bf1218
+sha256=bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40
+
[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.3.tar.bz2]
md5=e35d817fa4ee7beb6cd5aa744b9c0783
sha256=898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6
@@ -16430,6 +16598,10 @@ sha256=6444f1b61a53b9ea89551d95d32bcf98d4d018d0d3ff9c34626c5c24d1b60507
md5=eaf1ce9fa23363799140602afaa10f37
sha256=1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.1.tar.bz2]
+md5=a5e1f2539b82206e411c3647f10c425f
+sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
md5=4df79349e26add4c23f6be8bec347ad4
sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -16878,6 +17050,10 @@ sha256=6a079872319ac7934578cace787f4f89ea87258f6dd8b33e5b4359be1256e9a3
md5=cc0d64e90eab0b90b38355e841824588
sha256=05c269e322ed1ef54b8a32883c8676f46330ec70d85b0a158dbefc2b0e91ceb8
+[http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.2.tar.bz2]
+md5=28958248590ff60ecd70e8f590d977b7
+sha256=cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsfonts-X11R7.0-1.0.1.tar.bz2]
md5=e8681e5671e7f01922ce6c8f2327e602
sha256=1f8d23d5f7dac0f06bc6c6fe6ed7d8e620fe1b0057654da314e24f7c6faefc6f
@@ -17042,6 +17218,10 @@ sha256=77f3bf12ce006eb06fc79d9c60a13ff69403ca6c28cc2babafb0ae35a2240ead
md5=e0f356e0a7b310b0d4b2976e6b7b74fd
sha256=bb797a384b9acb8209fea572934d1b1484c5de41f062fe152ae99962f52f98ea
+[http://xournal.sourceforge.net/xournal-0.4.1.tar.gz]
+md5=b3d352d08e71606383c31da5790b8d60
+sha256=dff617ca33dc263caecb6afc5d42c109166ef2a1c0fe0afa070ff6691ea0e8d7
+
[http://repository.maemo.org/pool/maemo/ossw/source/x/xpext/xpext_1.0-5.tar.gz]
md5=1b0cb67b6f2bd7c4abef17648b062896
sha256=a3b06f5188fd9effd0799ae31352b3cd65cb913b964e2c1a923ffa9d3c08abbe
@@ -17549,3 +17729,4 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3
[http://downloads.sourceforge.net/zziplib/zziplib-0.10.82.tar.bz2]
md5=a6538f6c44ceeed0ed7e8e356f444168
sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
+
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 097e61f701..9cef972fb8 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,5 +1,5 @@
PREFERRED_VERSION_automake-native = "1.10"
-PREFERRED_VERSION_busybox = "1.11.1"
+PREFERRED_VERSION_busybox = "1.11.3"
PREFERRED_VERSION_cairo = "1.7.6"
PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_dropbear = "0.51"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 6ca62db060..3d3c3858e0 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -117,7 +117,7 @@ PREFERRED_VERSION_btscanner ?= "2.0"
PREFERRED_VERSION_btsco ?= "0.42"
PREFERRED_VERSION_btsco-module ?= "0.42"
PREFERRED_VERSION_btxml ?= "1.0"
-PREFERRED_VERSION_busybox = "1.11.1"
+PREFERRED_VERSION_busybox = "1.11.3"
PREFERRED_VERSION_busybox-static ?= "1.2.1"
PREFERRED_VERSION_bvi ?= "1.3.1"
PREFERRED_VERSION_bwmon ?= "1.3"
@@ -432,7 +432,7 @@ PREFERRED_VERSION_gdb-cross ?= "6.8"
PREFERRED_VERSION_gdb-cross-sdk ?= "6.8"
PREFERRED_VERSION_gdbm ?= "1.8.3"
PREFERRED_VERSION_gdbm-native ?= "1.8.3"
-PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.10.14"
+PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.12.11"
PREFERRED_VERSION_gdm ?= "2.14.9"
PREFERRED_VERSION_geda ?= "20050820"
PREFERRED_VERSION_geda-gattrib ?= "20050820"
@@ -1932,8 +1932,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
PREFERRED_VERSION_util-macros-native ?= "1.1.5"
PREFERRED_VERSION_uucp ?= "1.07"
PREFERRED_VERSION_v4l2apps ?= "20020317"
-PREFERRED_VERSION_vala ?= "0.1.5"
-PREFERRED_VERSION_vala-native ?= "0.1.5"
+PREFERRED_VERSION_vala ?= "0.3.5"
+PREFERRED_VERSION_vala-native ?= "0.3.5"
PREFERRED_VERSION_vde ?= "2.0.2"
PREFERRED_VERSION_vectoroids ?= "1.1.0"
PREFERRED_VERSION_videoplayer ?= "0.1"
diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf
index 22718b806e..add59a4f45 100644
--- a/conf/machine/acern30.conf
+++ b/conf/machine/acern30.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
# Samsung S3C2xxx CPU
require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
index 349dd8eddb..e1ad289b40 100644
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the Amstrad E3
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
index ef7e8a2a39..8ec0d9a999 100644
--- a/conf/machine/asus620.conf
+++ b/conf/machine/asus620.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
index 814641df8f..d4712032db 100644
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -6,7 +6,7 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = "iwmmxt"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf
index 16d0705a24..f95fb2da56 100644
--- a/conf/machine/at91-l9260.conf
+++ b/conf/machine/at91-l9260.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.25"
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index ba0c9f9a70..59ef577480 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 3b9d5188f6..570ff165f7 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 95c7626a63..9fd34f95a0 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index b119a24359..6247c8322c 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -6,7 +6,7 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+PACKAGE_EXTRA_ARCHS = " iwmmxt "
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
index f875d437c7..9578389890 100644
--- a/conf/machine/bd-neon.conf
+++ b/conf/machine/bd-neon.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 5d88adee4a..548cf764d1 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -2,7 +2,6 @@
#@NAME: Beagleboard machine
#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = "xserver-xorg \
diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf
index a1d6d43600..cef6dbc147 100644
--- a/conf/machine/chumby.conf
+++ b/conf/machine/chumby.conf
@@ -7,7 +7,6 @@ TARGET_ARCH = "arm"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi"
GUI_MACHINE_CLASS = "smallscreen"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index aadbea4a5f..e01b37d3e6 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -7,7 +7,7 @@ GUI_MACHINE_CLASS ?= "bigscreen"
PREFERRED_PROVIDER_virtual/kernel = "linux"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = " iwmmxt"
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/cs-e9302.conf b/conf/machine/cs-e9302.conf
index b99b1372be..838dbce62e 100644
--- a/conf/machine/cs-e9302.conf
+++ b/conf/machine/cs-e9302.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for Olimex CS-E9302 Development Platform
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index b279338686..c926c6ff8a 100644
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI Davinci EVM board
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
HOTPLUG = "udev"
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index efaffb088b..4ead8c1508 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Machine configuration for the Lyrtech Small Form Factor SDR board
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
HOTPLUG = "udev"
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index db9f26861c..65f6584662 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -5,7 +5,6 @@
TARGET_ARCH = "arm"
GUI_MACHINE_CLASS = "bigscreen"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index 3cf0a7fab2..f8a5c951b7 100644
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -8,7 +8,7 @@
TARGET_ARCH = "arm"
GUI_MACHINE_CLASS ?= "bigscreen"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+PACKAGE_EXTRA_ARCHS = "iwmmxt "
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 16d8c7097c..268ed52b61 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -4,7 +4,6 @@
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf
index 211091d929..f20d6ae8e3 100644
--- a/conf/machine/er0100.conf
+++ b/conf/machine/er0100.conf
@@ -9,7 +9,6 @@
# CPU: Intel (now Marvell) PXA255
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/eseries.conf b/conf/machine/eseries.conf
index e6552b52d1..48beedd175 100644
--- a/conf/machine/eseries.conf
+++ b/conf/machine/eseries.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
#Compile with armv5te optimizations, incompatible with armv4(t) cpus
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf
index 91e3dbb5a0..e362bdec00 100644
--- a/conf/machine/eteng500.conf
+++ b/conf/machine/eteng500.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
# Samsung S3C2xxx CPU
require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf
index c6859227cb..a2ca95beac 100644
--- a/conf/machine/fsg3be.conf
+++ b/conf/machine/fsg3be.conf
@@ -4,7 +4,7 @@
TARGET_ARCH = "armeb"
-PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+PACKAGE_EXTRA_ARCHS = "ixp4xxbe"
MACHINE_ARCH = "ixp4xxbe"
diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf
index ac4c1ef4b6..db255a670c 100644
--- a/conf/machine/gesbc-9302.conf
+++ b/conf/machine/gesbc-9302.conf
@@ -3,7 +3,6 @@
#@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux ?= "2.6.24"
diff --git a/conf/machine/ghi270.conf b/conf/machine/ghi270.conf
index 3536485cab..af4ddea21c 100644
--- a/conf/machine/ghi270.conf
+++ b/conf/machine/ghi270.conf
@@ -6,7 +6,7 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+PACKAGE_EXTRA_ARCHS = " iwmmxt "
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 439c484970..43d23d8d91 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 99e82d28f4..eec87a3ed5 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -2,7 +2,6 @@
#@NAME: h1940
#@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
TARGET_ARCH = "arm"
# Set preferred providers
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 4c7e413fa0..abc17728b5 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
#Compile with armv5te optimizations, incompatible with armv4(t) cpus
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 8b9b7ee365..a403008a18 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 03dccedccc..f85b2a12ee 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index a55b75cd89..73fbf1708d 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 4657d48b79..08f61b83ea 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -7,7 +7,6 @@
#
TARGET_ARCH = "arm"
BASE_PACKAGE_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
require conf/machine/include/tune-arm9tdmi.inc
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index f7f025413d..a9791dd8ef 100644
--- a/conf/machine/htcalpine.conf
+++ b/conf/machine/htcalpine.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
index b3debb633c..d4a0bd19b8 100644
--- a/conf/machine/htcapache.conf
+++ b/conf/machine/htcapache.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index f95cb70833..a5178d8c90 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 472e5d69e6..384f1f9d14 100644
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -6,7 +6,6 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf
index eba677fae7..1d6cde4536 100644
--- a/conf/machine/htckaiser.conf
+++ b/conf/machine/htckaiser.conf
@@ -2,7 +2,6 @@
#@NAME: HTC Kaiser phone
#@DESCRIPTION: Machine configuration for HTC Kaiser phone
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
@@ -11,10 +10,7 @@ GUI_MACHINE_CLASS = "smallscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
-FEED_ARCH = "armv6"
-BASE_PACKAGE_ARCH = "armv6"
-
+require conf/machine/include/tune-arm1136jf-s.inc
IMAGE_FSTYPES ?= "tar.gz cpio.gz"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 785214409f..ab532e33ff 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -6,7 +6,7 @@
# Hardware-based properties
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+PACKAGE_EXTRA_ARCHS = " iwmmxt "
IMAGE_FSTYPES += "jffs2"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 52c2b04690..296ce6a2ed 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,5 +1,4 @@
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc
index 0f5aef5ea4..e7b8f71c33 100644
--- a/conf/machine/include/tune-arm1136jf-s.inc
+++ b/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,3 +1,5 @@
TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
FEED_ARCH = "armv6"
BASE_PACKAGE_ARCH = "armv6"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6"
+
diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc
index 1f7a04bb3b..47275b8cb4 100644
--- a/conf/machine/include/tune-arm920t.inc
+++ b/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,5 @@
FEED_ARCH = "armv4t"
BASE_PACKAGE_ARCH = "armv4t"
TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t"
diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc
index e80ef10490..f41e460999 100644
--- a/conf/machine/include/tune-arm926ejs.inc
+++ b/conf/machine/include/tune-arm926ejs.inc
@@ -1,5 +1,5 @@
FEED_ARCH = "armv5te"
-
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te"
# For gcc 3.x you need:
#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
# For gcc 4.x you need:
diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc
index 50aaec1320..d788b5304f 100644
--- a/conf/machine/include/tune-arm9tdmi.inc
+++ b/conf/machine/include/tune-arm9tdmi.inc
@@ -1,3 +1,4 @@
FEED_ARCH = "armv4t"
BASE_PACKAGE_ARCH = "armv4t"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t"
TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc
index 96c8c64904..379a3eb011 100644
--- a/conf/machine/include/tune-armv7.inc
+++ b/conf/machine/include/tune-armv7.inc
@@ -3,4 +3,5 @@
# This will NOT compile programs in 'ARM' mode, which is what you really want
TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
FEED_ARCH = "armv7"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7"
BASE_PACKAGE_ARCH = "armv7"
diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc
index 313300d9cd..9526faad7e 100644
--- a/conf/machine/include/tune-athlonmp.inc
+++ b/conf/machine/include/tune-athlonmp.inc
@@ -1,3 +1,4 @@
TARGET_CC_ARCH = "-march=i686"
+PACKAGE_EXTRA_ARCHS += "i386 i486 i586"
BASE_PACKAGE_ARCH = "i686"
FEED_ARCH = "i686"
diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc
index 43849086f4..136efa247c 100644
--- a/conf/machine/include/tune-c3.inc
+++ b/conf/machine/include/tune-c3.inc
@@ -1,3 +1,4 @@
TARGET_CC_ARCH = "-march=c3 -mtune=c3"
+PACKAGE_EXTRA_ARCHS += "i386 i486"
BASE_PACKAGE_ARCH = "i586"
FEED_ARCH = "i586"
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index 4216255102..a2ce7def1a 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -5,4 +5,5 @@
TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
FEED_ARCH = "armv7a"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a"
BASE_PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc
index 7da1cb50c8..39d7f9b797 100644
--- a/conf/machine/include/tune-ep9312.inc
+++ b/conf/machine/include/tune-ep9312.inc
@@ -2,6 +2,7 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
# add "-mfp=maverick" for newer gcc versions > 4.0
#set arch to ep9312 for all generated packages
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t ep9312"
BASE_PACKAGE_ARCH = "ep9312"
FEED_ARCH = "ep9312"
diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc
index aa5aaee901..f7291be805 100644
--- a/conf/machine/include/tune-iwmmxt.inc
+++ b/conf/machine/include/tune-iwmmxt.inc
@@ -2,6 +2,6 @@
# Please use tune-xscale for PXA255/PXA26x based processors.
TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
BASE_PACKAGE_ARCH = "iwmmxt"
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te iwmmxt"
FEED_ARCH = "iwmmxt"
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index 6b8c9b521f..4e5be154dd 100644
--- a/conf/machine/include/tune-pentium.inc
+++ b/conf/machine/include/tune-pentium.inc
@@ -1,4 +1,4 @@
TARGET_CC_ARCH = "-march=pentium"
BASE_PACKAGE_ARCH = "i586"
FEED_ARCH = "i586"
-
+PACKAGE_EXTRA_ARCHS += "i386 i486"
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 88fe7d7445..63dda25f58 100644
--- a/conf/machine/include/tune-pentiumpro.inc
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -1,4 +1,4 @@
TARGET_CC_ARCH = "-march=pentiumpro"
BASE_PACKAGE_ARCH = "i686"
FEED_ARCH = "i686"
-
+PACKAGE_EXTRA_ARCHS += "i386 i486 i586"
diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc
index eb16651ae3..bd445c6385 100644
--- a/conf/machine/include/tune-xscale.inc
+++ b/conf/machine/include/tune-xscale.inc
@@ -2,4 +2,5 @@ FEED_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d,
TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index a688f2f64b..a861195dd1 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
# Additionally, clamshell specific stuff in zaurus-clamshell.inc
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
PACKAGE_EXTRA_ARCHS_collie = ""
MACHINE_KERNEL_VERSION = "2.6"
diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf
index 09a71535c6..5f965286f6 100644
--- a/conf/machine/neuros-osd.conf
+++ b/conf/machine/neuros-osd.conf
@@ -4,8 +4,6 @@
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index 05fb2e19e5..f852a9e82b 100644
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -4,8 +4,6 @@
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 15126d56a9..8d6073353a 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -2,7 +2,6 @@
#@NAME: Nokia 770 internet tablet
#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
PREFERRED_PROVIDER_virtual/bootloader = ""
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index afdf0ac621..69b94301e6 100644
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -2,7 +2,6 @@
#@NAME: Nokia 800 internet tablet
#@DESCRIPTION: Machine configuration for the Nokia 800
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
XSERVER = "xserver-kdrive-xomap"