summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/checksums.ini144
-rw-r--r--conf/distro/angstrom-2008.1.conf2
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc8
-rw-r--r--conf/distro/include/kaeilos-2009-preferred-versions.inc72
-rw-r--r--conf/distro/include/kaeilos.inc6
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc6
-rw-r--r--conf/distro/include/sane-srcrevs.inc6
-rw-r--r--conf/distro/include/slugos.inc9
-rw-r--r--conf/distro/kaeilos.conf9
-rw-r--r--conf/distro/minimal-uclibc.conf4
-rw-r--r--conf/distro/minimal.conf2
-rw-r--r--conf/distro/sharprom-compatible.conf9
-rw-r--r--conf/licenses.conf2
-rw-r--r--conf/machine/calamari.conf31
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/include/tune-ppce500v2.inc4
-rw-r--r--conf/machine/omapzoom2.conf54
-rw-r--r--conf/machine/tx25.conf2
21 files changed, 348 insertions, 30 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 4f00be73e6..8b6956453b 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -608,6 +608,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
ENTERPRISE_DISTRO ?= "0"
# Pre-build configuration output
+
+BUILDCFG_HEADER = "Build Configuration:"
BUILDCFG_VARS ?= "BB_VERSION METADATA_BRANCH METADATA_REVISION TARGET_ARCH TARGET_OS MACHINE DISTRO DISTRO_VERSION"
BUILDCFG_VARS_append_arm = " TARGET_FPU"
BUILDCFG_VARS_append_armeb = " TARGET_FPU"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index f1a79720f2..f4255eef2f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -54,6 +54,10 @@ sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
md5=4469d6336f9659f1725fedd4a52261ad
sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
+[http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz]
+md5=f13ab353b11329ce3d605b6f40e77fa6
+sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30
+
[http://sense.net/zc/free42/42c_skins.tgz]
md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
@@ -1422,6 +1426,10 @@ sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833
md5=de60df7541fafe8c6a3397e0f105ff0e
sha256=c487645d32b8124b9ae224b8929e5aa45e581bd8d8c8da666add423cf927d1ea
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2]
+md5=73db3666c211e5fb023bb77450cf430d
+sha256=32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886
+
[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.20.tar.bz2]
md5=6e9080ba1faa5d3739d14dd76c62d8dc
sha256=15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
@@ -1454,6 +1462,10 @@ sha256=35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560
md5=4a798b47ba10c17aed66dff234d31b24
sha256=deb7652a3c1360febbbffb5d0150e5ad8547063d37969ad24d13359f75a424ba
+[ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.19.tar.bz2]
+md5=29ae9cac05423cf6a49f66eeb1a79eb6
+sha256=67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100
+
[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.11.tar.bz2]
md5=ba9b8010120701d0f6daf061d392cfa2
sha256=4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
@@ -1478,6 +1490,14 @@ sha256=6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125
md5=0a6b26d27cc2adfd591d91d8c155fdb7
sha256=ea0ae914cc8d46254dc02ca2b227d379d0eb1d76a3960907e57f26f2ec584aef
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2]
+md5=5ff0379c707c1a29083233edc9ab4e06
+sha256=1f4924f5ae7857ce64a3d6ecbeb98133c74ff1ead2b0f48187623d6e4b838cad
+
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.20.tar.bz2]
+md5=6837e673ef19da96d8bd2f9e18cd9574
+sha256=07f08286b3860f60d1794cc0de4407a53adcd4b6f065531d6dcef02b0c56a0cf
+
[http://www.panix.com/~gesslein/am.tgz]
md5=df7535050d4bbe57c5d1243c8ec2479e
sha256=13ab5d2045d902b627725e7cf4fc82df3ec2e714e85e42b93bd48af7af9bffdc
@@ -2194,6 +2214,10 @@ sha256=926688080fd75a8d6eab6c6ea1168dc03c591625c21af492ec0c13d816573516
md5=851db68728ed9adea615eb2f249fa1ee
sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b
+[http://pawsa.fedorapeople.org/balsa/balsa-2.4.0.tar.bz2]
+md5=47d68219a5ee768f1ebd2502a9c3c6f2
+sha256=f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea
+
[ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
md5=5afcef5d6047f14cd5f65d2fdbd86fb2
sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
@@ -5662,6 +5686,10 @@ sha256=5046f573e7dd77f689c33c5f0aa0f2b7f96c79e0b37d6ecc78bae74c094fb4c6
md5=9cd0026f5bc89c96cafbd6d1d3500a3b
sha256=4a2a9f54f3fc68250a92eab43a030b6b96c4b6e251b698b3378bfee751f1cbd8
+[http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-4.0.2212.tar.gz]
+md5=3eeb43af8c6bc0a30b46739707e27259
+sha256=8b5499c26860c8a11750e9e03b9a7d70dd8e7ffce16457e9ee9d7850d554e7ab
+
[http://downloads.sourceforge.net/ettercap/ettercap-0.6.b.tar.gz]
md5=f665cf82347a91f216184537f8f2c4bd
sha256=2b6b0d1af5b8af63eb5edf7052fdc9f46c55b6f7b607c8772b18927cb481ecf9
@@ -6742,6 +6770,10 @@ sha256=bd54e294c056c6d52b2037e91d7b2782d6805b24a74923dc80e1c9107acac707
md5=6106c8d0aba37563b7ca9ccc94bc6c95
sha256=44b7e18ba9ae5667dd64c89f7b04627bda5807a3a90255a125702d63c0c4ee17
+[http://fping.sourceforge.net/download/fping.tar.gz]
+md5=d5e8be59e307cef76bc479e1684df705
+sha256=9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f
+
[http://downloads.sourceforge.net/free42/free42.tgz]
md5=1fc21e04b3b77150846027dc7cb5210d
sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a
@@ -7838,6 +7870,10 @@ sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
md5=05188e560dbd8bddd568e24ce10dd003
sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.4.tar.bz2]
+md5=346916673c0eab72191cf44b4afe535f
+sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9
+
[ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
md5=a45db7d82480da431f6cd00ea041a534
sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -8062,6 +8098,14 @@ sha256=69d8553b351c461a8e36ed633aa2da14fdb79423b9ce0e6d3174e5ace09fadd8
md5=ed99c382471294896f576e5f77694142
sha256=39ef812217a76982947a7ac3b4a97e8303466a3dd93709366d1559e0a7ec8a46
+[http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.2/gmime-2.2.23.tar.bz2]
+md5=9f254eb989e0506243da6fde7f164998
+sha256=d5420eef50372d24eaecde93ea4c8ec55f5bf24c9e0f6abbded76e5dbd6a2d76
+
+[http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-2.4.7.tar.bz2]
+md5=0fb23dbb1ed6934ab577e90269cd901f
+sha256=bf75214018bb1ae82c797e79d52db2c37a8d3d9f002a737f12960fa2b1022dbd
+
[http://download.gna.org/getfem/stable/gmm-3.0.tar.gz]
md5=e543571d8812357374699491014abd58
sha256=f7fad050ce4641a43c2249fd691e514a0ee6afc09b4ec54c8c30038d0c2783d1
@@ -8562,6 +8606,10 @@ sha256=f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb
md5=c1eb3de26b67ddc08a61a7c2fc636203
sha256=36480bce862b6d424f4b34bbfeed838b80bcbb484602dee43c412a7d0dc4b42b
+[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.1.tar.gz]
+md5=f0721c5dce7cb02c75ac4e7bb9cc0ec9
+sha256=a12b0fcd08508a85ee7ec7003ec0f3418378d479304ce85e8453d46bacc0ce9f
+
[ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.tar.gz]
md5=9d91d0f8f2cb35bc86435784fa8e72d8
sha256=a780490056b1f1f95c7bf91e175773e00f4be23e1b7e5147ccd507b6f32097af
@@ -10002,6 +10050,10 @@ sha256=efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09
md5=139528802794287427fd4d18875b5cf5
sha256=ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
+[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.4.tar.bz2]
+md5=d666f9f5a544e9d4d45804d88b1b5c4d
+sha256=afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88
+
[http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
md5=c6697665e06cad01e87c2cf8d0913725
sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -11626,6 +11678,10 @@ sha256=bc4f62cbac4716c2c1a25cf53b73343a03883964576d9dd590a9e4c7a70f465a
md5=a746183ea41aebc27a0f771036f668e1
sha256=1b8f50169bc2d827c6efe6bc98bbef2161f615219e4e8921e68227888fd50a9e
+[http://iij.dl.sourceforge.jp/julius/37582/julius-4.1.2.tar.gz]
+md5=886a114b391aa1992567019213efc63e
+sha256=542c7f1042679c8484dc2f5f5536ed0c79fa79b2b9dd6cf6881278a6fdb37a84
+
[http://osdn.dl.sourceforge.jp/julius/37582/julius-4.1.2.tar.gz]
md5=886a114b391aa1992567019213efc63e
sha256=542c7f1042679c8484dc2f5f5536ed0c79fa79b2b9dd6cf6881278a6fdb37a84
@@ -14846,6 +14902,10 @@ sha256=c9bdc5820bc283dcfefba4d4f632c9083adffe5a06c21e089ee123209d229ecf
md5=8fb0e066678a0d294894b5b2969cb4b3
sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45
+[http://downloads.sourceforge.net/libusb/libusb-1.0.2.tar.bz2]
+md5=dc8865eaff167aabe78e5799762b8067
+sha256=9f5737019f3e4c14f68a2f829deb690330e89b634d1337683e453b94137669f1
+
[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2]
md5=3d9f7c3966d24c6e2d58becac96e4e27
sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49
@@ -14866,6 +14926,10 @@ sha256=4ab03b0d1d41db6a5c4e10c6dd819ad90876e712fd66a2de2b824a2fd3ce7dee
md5=652e1d9e6c6912fd924a5ad204f6d48b
sha256=69ad5d62946885a60368381a3354b8fd19597bc6fc9ee25b4598977771429b8d
+[http://downloads.sourceforge.net/libusb/libusb-compat-0.1.2.tar.bz2]
+md5=efcef8350b47bd63bee65d42a796e14b
+sha256=476eb0d48981ea05e2f82955d59a3445e32be41c0afeb8a2827b9361bb560560
+
[http://people.atrpms.net/~hdegoede/libv4l-0.5.7.tar.gz]
md5=a5056dcf337e240e5370984f95d9ad68
sha256=676840669a82763ccc7b46ba033a6a01df815c46486f7b30916951769331b6d6
@@ -15558,6 +15622,10 @@ sha256=8bc1c6cfc6a9c312c8f5b8cc79b501e26b438c96a2d245f42e50bfb353617716
md5=1101c44d542807a4f9f5e33349b5bf56
sha256=d6e68935e69c82bba091cb102bbc4b63428eb8deb94c7d00e14ea3b673e10712
+[http://downloads.sourceforge.net/lirc/lirc-0.8.5.tar.gz]
+md5=a9e44df2adbd71be586e0df6304605cc
+sha256=ab5752e9af2df5f4cd2bd6d4f13872fbb519d7fa1bd3f187cc14dcb163440234
+
[http://lisa-home.sourceforge.net/src/lisa-0.2.2.tar.bz2]
md5=cba116a4880f77205e0813d93bf14310
sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db
@@ -15578,6 +15646,10 @@ sha256=ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9
md5=6f15406664ef31172c68d46567569bb8
sha256=9532b981c9b8974ceedd3d25a8f9a0e167a92c9da0dece47f34a4ec34e34b1cf
+[http://www.live555.com/liveMedia/public/live.2009.06.02.tar.gz]
+md5=088f848b64cef1d54034bc24cfa3c156
+sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
+
[http://llvm.org/releases/1.9/llvm-1.9.tar.gz]
md5=866ba97420f5ce978b6a6b1cb4338890
sha256=17b82323151925ff5a7ad09a21781a0fa50ead4b87a339cee262271e4ededa13
@@ -15734,6 +15806,10 @@ sha256=361a2861a5cd5bc7bd3320b60165c3bede06056ade7d75ab370d13a6b203d629
md5=d9504bb4251d4e5b32cb379debda634d
sha256=67cad76c18a138b9b55bf6ff88a5796128371cf9339b3761b36f79fb4e7459d7
+[http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.4.3.tar.gz]
+md5=7ca8bf7c2313d7b7f27088c373d195e2
+sha256=db252747e974b6be3e31d1b11089dc6aec3780989083df9bd75d76ddae7fb613
+
[http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/lowlevel_topas910.tar.bz2]
md5=3959ea1a2acaae196173b0283541c428
sha256=b1f136a1d89daa4b1b9711eb81ad120b53c9357d159f262021b84ef8c9d128be
@@ -17570,6 +17646,10 @@ sha256=e42d3b3f30de0c1ad0a86aa039b35cf2bf64c7f64c29ee333cbf934784639973
md5=0e942f22864e601406a994420231075b
sha256=28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497
+[ftp://ftp.netperf.org/netperf/netperf-2.4.4.tar.bz2]
+md5=0e942f22864e601406a994420231075b
+sha256=28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497
+
[ftp://ftp.debian.org/debian/pool/non-free/n/netperf/netperf_2.3.orig.tar.gz]
md5=b50e49d5f0d3780438af0027a182b997
sha256=0578f4fafb309adf3413c9f56076b1b16476cb71e83c02ff7efafad172d91adb
@@ -18614,6 +18694,10 @@ sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150
md5=7bc6c884d847cabc613e4c6d663771f5
sha256=f3617f8f32c45c57f19c0aa1d7334e1dc979b9b54e5bb4e78fba8ec80193c23c
+[http://ftp.gnome.org/pub/GNOME/sources/pango/1.24/pango-1.24.4.tar.bz2]
+md5=f2eeaf183930e00ed28fca3a6ed1deb0
+sha256=adbd11f182ec63939d6364cbb59e86991a48582e7d3641cda80529b40b399559
+
[ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
md5=39868e0da250fd4c00b2970e4eb84389
sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
@@ -18894,6 +18978,10 @@ sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
md5=cd69d16ea42bbf20d0a505690be45868
sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.30/patch-2.6.30-rc4.bz2]
+md5=1672a3064a2bfe049715a1103f03561c
+sha256=25a9aff47cc568e4bcaa4377cacbcae11ea454aeeea9519aa3a1b6dbffea713c
+
[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2]
md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
@@ -19158,6 +19246,10 @@ sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
md5=7380ffecebd95c6edb317ef861229ebd
sha256=1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
+[http://us2.php.net/distributions/php-5.3.0.tar.bz2]
+md5=846760cd655c98dfd86d6d97c3d964b0
+sha256=83c9d86f830f8b188c70d3554d07b7416af90fd9e06d84340ffda58c09e58357
+
[http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz]
md5=21865bf2891222082afc44afdd80aeaa
sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6
@@ -19186,6 +19278,10 @@ sha256=13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
md5=4abc4ce9e1ad62bbf098f05f305147d7
sha256=912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
+[http://downloads.sourceforge.net/pidgin/pidgin-2.5.8.tar.bz2]
+md5=c207407dca71c6357c82135875e472f0
+sha256=2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21
+
[ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
md5=75af127948cc0c701d424d22d621f792
sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
@@ -20234,6 +20330,10 @@ sha256=1cd8e9bb0a011317862aec90a03e562bebbbf7fcf865a8ff12992548cdda746d
md5=c69c2e5e86a8f21a5773df20e265fc3a
sha256=dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60
+[ftp://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.6/pygtksourceview-2.6.0.tar.bz2]
+md5=5587a1865bd5c785c6f34095c57cc96b
+sha256=77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178
+
[http://downloads.sourceforge.net/pyid3lib/pyid3lib-0.5.1.tar.bz2]
md5=49818a591430e08057c27a11e4c40aef
sha256=2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169
@@ -20370,6 +20470,10 @@ sha256=7d17f07aa470cac6afc1b7e68745c1bf1767913ce52b401296e21cab245fe26b
md5=8a7763e31e4cc3fdf9154c793dda3bc0
sha256=7d17f07aa470cac6afc1b7e68745c1bf1767913ce52b401296e21cab245fe26b
+[http://pypi.python.org/packages/source/p/python-cjson/python-cjson-1.0.5.tar.gz]
+md5=4d55b66ecdf0300313af9d030d9644a3
+sha256=85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714
+
[http://labix.org/download/python-constraint/python-constraint-1.1.tar.bz2]
md5=975e5449d6670dd19498bb9ec4856d39
sha256=0d904161351a8e55b272ed9691b12dca4278bed62fde53ba2a36f479996db910
@@ -20678,6 +20782,10 @@ sha256=4f6319c6031af47ef81fef08f465e4db61c0f169f5eb9bbc8f060cc3db3ffafa
md5=43e7384c59625af0830032348f672a1d
sha256=f525ad885675f4c2413d67d9a5efaf7c34862d88c796fe7e7e2d05a42a1a66c8
+[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.2.tar.bz2]
+md5=62186345c609a72b89f16d83bc7a130f
+sha256=272301a27e2f7bcd44c8d09f496e1c749c80b86d9489ea9c30bb265bf2dd02fc
+
[ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
md5=05d04688c0c0230ed54e89102d689ca4
sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
@@ -20734,6 +20842,10 @@ sha256=61831af6b71c7bd4e1ef542071225835d8c741fa8e079bceab8c83f712e396a1
md5=f81a94e2ab7713b2d375d4e5cfc8e051
sha256=aa3f5a459d042681a321f33e8d99468337a00674d68b8a512e0078625c1f51da
+[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.2.tar.gz]
+md5=d8bcc070a58db25c228b7729ffad4550
+sha256=4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+
[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
md5=9519eccf0638c9962f73a7b20da77e0e
sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
@@ -22550,10 +22662,18 @@ sha256=2172bfed8fdeab4279dad7712390fd98ae0a993c42c2c4eec98cf3d30d1a11aa
md5=6b981c63bb5d8b23b43831ece79884e6
sha256=254ac13ceeba17749ff6416b33fd038f8db7aaf6fab2e0a9d2303dd07314b186
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.84.6.tar.bz2]
+md5=1747f7f35519b273e6c27bbcd8513d4b
+sha256=f5db9c1caf5cd57abfccb12ab1f5ba508cbf0f90ec9bad03de3fb38063775b83
+
[http://dev.laptop.org/pub/sugar/sources/sugar-artwork/sugar-artwork-0.82.0.tar.bz2]
md5=3d271bf9f0d412afb9a5618ba5496fb8
sha256=dbe36fa758a49dd8526885e2025b51d6e1e6e32458168e420c955b633ee3b100
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/sugar-artwork-0.84.1.tar.bz2]
+md5=d28b847a24aa23a1b6949aa6a7873560
+sha256=2dc71acc88da545e6a217fd4749dc39a9d59e9f2f768bd67ea201999e55f302a
+
[http://dev.laptop.org/pub/sugar/sources/sugar-base/sugar-base-0.82.0.tar.bz2]
md5=5c568166761af4839cbc78db5dcd0061
sha256=124db55b59cdf5731096276e30d07b3537bc217ae63607f1394c2bb118cfe694
@@ -22566,10 +22686,18 @@ sha256=430b27a0510a50fb66ee211e35565be7e1e522bcde7d1adde5c63a1d18ad7f1d
md5=0f05d95eaf0f8e3174a3b3e3b0afe995
sha256=64ece8bb8e6eddb4c7b8b4ce0aa30f07f00a86ed7b113a7957661e73616a8dc3
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.84.1.tar.bz2]
+md5=0ef47ff5a8931e0e7c732d22a514d297
+sha256=e67eab2d058a3410d8fe82a2161d0c268b6445648c5901a8bd2c26690c45addd
+
[http://dev.laptop.org/pub/sugar/sources/sugar-datastore/sugar-datastore-0.82.0.tar.bz2]
md5=7a6bbb387c1f7cd3ddd6663869df3b88
sha256=3fc7ed937865773089d146f0fce72ee556f0655c612ae840a08dbd1a13d92d39
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-0.84.0.tar.bz2]
+md5=e57580e9fd44ecc2cb7a947dd8854817
+sha256=6049dddd3863110b95ec7c7b53c15f6ef8c7b627e3a04f0e9053978685a699db
+
[http://dev.laptop.org/pub/sugar/sources/sugar-presence-service/sugar-presence-service-0.82.1.tar.bz2]
md5=361bf10937908a638442b562ebb26d0b
sha256=6aceb2140c44ada61c9deba9215a12b9a1025fabecc07907edfdcf0ba8ca341b
@@ -22578,6 +22706,10 @@ sha256=6aceb2140c44ada61c9deba9215a12b9a1025fabecc07907edfdcf0ba8ca341b
md5=0b50a2467e4e9eedd22f51bf2fe6e6f3
sha256=3b33c9689fb9faaeaf4308cd66794b02951249253ac96df99bd308c4b6d38850
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/sugar-presence-service-0.84.0.tar.bz2]
+md5=bf292605b6c2d0ef3761a957acc8a95e
+sha256=15afba51ef2c34b86ae2c4b8ecfe612e37a7024ae9ccf42a3b612d70e3034d48
+
[http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-0.82.1.tar.bz2]
md5=885bd339331209d2771ca614723518a3
sha256=68f1a10298f34ea133a679085b3b54bdb990c49324779f79e40aff0f274b6a9a
@@ -22590,6 +22722,10 @@ sha256=a0fae53f396c6223365c28c8cda0538f2cb20c660bffd9cfcc37ee00b57c2a7b
md5=f6882ee56ed327c6680738133e911bf3
sha256=243a9d699af072b4cb79334b62638463d9f39437e7a886a14a95b7a8250983bd
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.84.4.tar.bz2]
+md5=5ad76015d382ec4125c2ef01022dc898
+sha256=bc489eb0feacfd68cd29f1556e2d1c4b4eb8f01c9add7ceb878b605521eb9f92
+
[http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz]
md5=05787c6553316940873e8bce192a4fe0
sha256=ab958a3cc04858ab72f3fe2844362f249897c3bb2149208be22da2ce5d46c9c0
@@ -24798,6 +24934,10 @@ sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
md5=fc805051f0fe505c7a4b1b5c8db9b9e3
sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
+[http://www.oligarchy.co.uk/xapian/1.0.13/xapian-core-1.0.13.tar.gz]
+md5=5442e7ffc75abd853d1ab1d12667a3e9
+sha256=a474be06657bd83200231d938d48d4d2a83cff0252c618421f835604c5548dce
+
[http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-1.0.5.tar.gz]
md5=5fbfec7f23b0f539d32b50de4a278b95
sha256=277e30cbd4a4d9355e9b2c02489d34cbaed87754bbdeb8956e5463e9fb592658
@@ -26830,6 +26970,10 @@ sha256=b968a10f52b0c5e807ec4c2c106f3aea301cf0ac00d04299b6961370c82c66d8
md5=3537cfd58d253b4be20a4975e7086e38
sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
+[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.3.tar.bz2]
+md5=4f508abf088cf427a731f85634c8260d
+sha256=d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52
+
[http://downloads.sourceforge.net/xine/xine-lib-1.1.16.tar.bz2]
md5=acd1a210c5a6444e8fd44696469352bb
sha256=27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index f0b8a040ea..470c31a788 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -88,6 +88,8 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.30"
PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom"
PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
+PREFERRED_PROVIDER_virtual/gail ?= "gtk+"
#powerpc needs additional patches to gcc
ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 28de7667d5..5bf5b30d4c 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -6,12 +6,12 @@ PREFERRED_VERSION_cairo = "1.8.0"
PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.6.0"
-PREFERRED_VERSION_glib-2.0 = "2.20.0"
+PREFERRED_VERSION_glib-2.0 = "2.20.4"
PREFERRED_VERSION_glib-2.0-native = "2.18.0"
PREFERRED_VERSION_glibmm = "2.18.0"
-PREFERRED_VERSION_glproto = "1.4.9"
+PREFERRED_VERSION_glproto = "1.4.9"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.16.0"
+PREFERRED_VERSION_gtk+ = "2.16.4"
PREFERRED_VERSION_gtkmm = "2.14.1"
PREFERRED_VERSION_hal = "0.5.12"
PREFERRED_VERSION_libgemwidget = "1.0"
@@ -23,7 +23,7 @@ PREFERRED_VERSION_libtool-cross = "2.2.4"
PREFERRED_VERSION_libtool-sdk = "2.2.4"
PREFERRED_VERSION_libx11 = "1.2"
PREFERRED_VERSION_mesa = "7.2"
-PREFERRED_VERSION_pango = "1.24.2"
+PREFERRED_VERSION_pango = "1.24.4"
PREFERRED_VERSION_pixman = "0.13.2"
PREFERRED_VERSION_pkgconfig = "0.23"
PREFERRED_VERSION_pkgconfig-native = "0.23"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
new file mode 100644
index 0000000000..ba8d587241
--- /dev/null
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -0,0 +1,72 @@
+#@--------------------------------------------------------------------
+#@FILE: conf/distro/include/kaeilos-2009-preferred-versions.inc
+#@TYPE: Distribution
+#@NAME: KaeilOS(R) - http://www.kaeilos.com
+#@DESCRIPTION: KaeilOS Linux Distribution preferred version
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+#@VERSION: 01-07-2009
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
+#@--------------------------------------------------------------------
+
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_automake-native = "1.10.2"
+PREFERRED_VERSION_busybox = "1.13.2"
+PREFERRED_VERSION_cairo = "1.8.0"
+PREFERRED_VERSION_dbus = "1.2.1"
+PREFERRED_VERSION_dropbear = "0.51"
+PREFERRED_VERSION_fontconfig = "2.6.0"
+PREFERRED_VERSION_glib-2.0 = "2.20.0"
+PREFERRED_VERSION_glib-2.0-native = "2.18.0"
+PREFERRED_VERSION_glibmm = "2.18.0"
+PREFERRED_VERSION_glproto = "1.4.9"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gtk+ = "2.16.0"
+PREFERRED_VERSION_gtkmm = "2.14.1"
+PREFERRED_VERSION_hal = "0.5.12"
+PREFERRED_VERSION_libgemwidget = "1.0"
+PREFERRED_VERSION_libgpephone = "0.4"
+PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libtool = "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross = "2.2.4"
+PREFERRED_VERSION_libtool-sdk = "2.2.4"
+PREFERRED_VERSION_libx11 = "1.2"
+PREFERRED_VERSION_mesa = "7.2"
+PREFERRED_VERSION_pango = "1.24.2"
+PREFERRED_VERSION_pixman = "0.13.2"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.15"
+PREFERRED_VERSION_samba = "3.3.0"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+
+PREFERRED_VERSION_udev = "141"
+UDEV_GE_141 = "1"
+
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_util-macros-native = "1.2.1"
+PREFERRED_VERSION_util-macros = "1.2.1"
+PREFERRED_VERSION_wpa-supplicant = "0.6.7"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.6.1"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
+
+
diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc
index de7dca7534..fc0348da28 100644
--- a/conf/distro/include/kaeilos.inc
+++ b/conf/distro/include/kaeilos.inc
@@ -56,15 +56,15 @@ THUMB_INTERWORK = "yes"
#Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
+ANGSTROM_URI ?= "http://www.kaeilos.com"
#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
# usefull for derivative distros and local testing
# As this is runtime we can't and won't use virtual/feed-configs
ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
-#Set the default maintainer to angstrom-dev
-MAINTAINER = "KaeilOS Developers <info@koansoftware.com>"
+#Set the default maintainer of kaeilos
+MAINTAINER = "KaeilOS Mantainer <m.cavallini@koansoftware.com>"
#use debian style naming
INHERIT += "debian"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 803d436bbf..5eff3db83b 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1429,7 +1429,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
PREFERRED_VERSION_php ?= "5.2.0"
PREFERRED_VERSION_php-native ?= "5.2.0"
PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.5.3"
+PREFERRED_VERSION_pidgin ?= "2.5.8"
PREFERRED_VERSION_pine ?= "4.64"
PREFERRED_VERSION_pipeman ?= "1.0.0"
PREFERRED_VERSION_pipepanic ?= "0.1.1"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 992235a4b9..0eae85b686 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -63,11 +63,5 @@ PREFERRED_VERSION_udev ?= "118"
##################### Stuff with special notes, and broken stuff:
-# Hack alert - selecting this version of libusb effectively selects
-# the use of libusb1 and libusb-compat in the case that something
-# still depends on libusb. This is required because otherwise
-# libusb will overwrite libusb-compat in staging.
-PREFERRED_VERSION_libusb ?= "0.0.0"
-
# boost 1.36 won't build
PREFERRED_VERSION_boost ?= "1.33.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 470bace2b8..0e1a25a4b7 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -202,9 +202,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "209"
-SRCREV_pn-opkg-native ?= "209"
-SRCREV_pn-opkg-sdk ?= "209"
+SRCREV_pn-opkg ?= "215"
+SRCREV_pn-opkg-native ?= "215"
+SRCREV_pn-opkg-sdk ?= "215"
SRCREV_pn-opkg-utils ?= "4578"
SRCREV_pn-opkg-utils-native ?= "4595"
SRCREV_pn-oprofileui ?= "173"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index b1b89b9870..903e5ed602 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -127,9 +127,11 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
-# Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-SRCDATE_diet-x11 ?= "20060106"
+# Select the appropriate x11 library provider. The diet-x11 libraries are
+# much smaller, but may not be as current as the standard x11 libraries; by
+# default we will select the standard libraries and permit the use of an
+# override if the user wishes (and has the correct PREFERRED_VERSIONs set).
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
# Ensure consistency across all SlugOS builds for the provider of a relational
# database - use the latest version of the SleepyCat Berkeley database
@@ -159,6 +161,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
PREFERRED_PROVIDER_avahi ?= "avahi"
PREFERRED_PROVIDER_gconf ?= "gconf"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
# Include any package preferred versions and srcrevs:
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index b7add998c7..5bec2d4d48 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,10 @@
#@NAME: KaeilOS(R) - http://www.kaeilos.com
#@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 23-06-2009 - B
+#@VERSION: 01-07-2009
+#
+# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
+# Product website : http://www.KaeilOS.com
#
# Use this at your own risk, we welcome bugreports filed at
# http://bugs.openembedded.net
@@ -12,14 +15,14 @@
#DISTRO_VERSION = "2009.1"
DISTRO_VERSION = "2009.1-test-${DATE}"
DISTRO_REVISION = "1"
-DISTRO_PR = ".2"
+DISTRO_PR = ".3"
#build staging from packages
INHERIT += "packaged-staging"
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
-require conf/distro/include/angstrom-2008-preferred-versions.inc
+require conf/distro/include/kaeilos-2009-preferred-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 34f92119b2..257d364292 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -31,7 +31,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"
-PREFERRED_VERSION_uclibc = "0.9.30"
-PREFERRED_VERSION_uclibc-initial = "0.9.30"
+PREFERRED_VERSION_uclibc = "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
require conf/distro/minimal.conf
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index f9c4670c67..8b834d0f4a 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -24,7 +24,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
# Use bluetooth 4.0
DISTRO_BLUETOOTH_MANAGER = "bluez4"
# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
#############################################################################
# LIBRARY NAMES
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 93077e1025..bd3b93ec17 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -25,6 +25,15 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
#DEBUG_OPTIMIZATION = "-O -g3"
#DEBUG_BUILD = "1"
+# We are still using 2.4 embedix kernels
+COMPATIBLE_MACHINE_pn-c7x0-kernels = "(c7x0|corgi|husky|shepherd)"
+COMPATIBLE_MACHINE_pn-collie-kernels = "collie"
+COMPATIBLE_MACHINE_pn-poodle-kernels = "(poodle|poodle255)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa27x = "(akita|spitz|borzoi)"
+COMPATIBLE_MACHINE_pn-openzaurus-pxa = "(c7x0|corgi|husky|shepherd|poodle|poodle255|tosa)"
+COMPATIBLE_MACHINE_pn-openzaurus-sa = "collie"
+
+
#
# Base
#
diff --git a/conf/licenses.conf b/conf/licenses.conf
index c0676275fa..3da47f9d00 100644
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -2,4 +2,4 @@ SRC_DISTRIBUTE_LICENSES += "GPL GPLv2 GPLv3 LGPL LGPLv2.1 LGPLv3"
SRC_DISTRIBUTE_LICENSES += "BSD Apache-2.0 QPL AFL CUPS"
SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl"
-SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers"
+SRC_DISTRIBUTE_LICENSES += "Info-ZIP tcp-wrappers Stanford"
diff --git a/conf/machine/calamari.conf b/conf/machine/calamari.conf
new file mode 100644
index 0000000000..2f4af15d9b
--- /dev/null
+++ b/conf/machine/calamari.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine