merge of '1415f32ae312fabcfb6f1452dbd7ce897665ca88'

and '6a04f6b10c819319120eee8f1e058fe39a818c6f'
author: OpenEmbedded Project <openembedded-devel@lists.openembedded.org> 2008-10-09 17:36:26 +0000
committer: OpenEmbedded Project <openembedded-devel@lists.openembedded.org> 2008-10-09 17:36:26 +0000
commit: 4fc0350debb067af2293141903b692c2f05a20b1 (patch)
tree: 4c9096cd991275ad89b074de5b274fabb65bd06c
parent: 8e57ba12981ecc58d174d0c3c1a8a0cc69490896 (diff)
parent: 227d3062aa5ab07b3b05ea219a658a4f9aba5962 (diff)
31 files changed, 1499 insertions, 413 deletions
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass
index a1e00e72c1..bc0a1dfaba 100644
--- a/classes/gettext.bbclass
+++ b/classes/gettext.bbclass
@@ -1,3 +1,4 @@
+DEPENDS =+ "gettext-native"
 def gettext_after_parse(d):
     import bb
     # Remove the NLS bits if USE_NLS is no.
@@ -14,3 +15,4 @@ python () {
 
 DEPENDS =+ "gettext-native"
 EXTRA_OECONF += "--enable-nls"
+
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 872e6720dc..bd0698e091 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2,6 +2,10 @@
 md5=c6a2705f6210d8ede50a947b375f1c0b
 sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
 
+[http://www.nopcode.org/0xFFFF/get/0xFFFF-0.2.tar.gz]
+md5=31cd82986ccfabdf01a6a99aa00f975b
+sha256=6d061f8431b76ba1dd09401880c7029e490be8c04cac14ba89db7ea7d0ab77bf
+
 [http://daemonizer.de/prism54/prism54-fw/fw-fullmac/1.0.3.0.arm]
 md5=1f0a68fbe45963f76e525c9789f5609c
 sha256=56524bd14b2bd3318824312f1272ed417de726110ef1d5e99c2a1171f65482fa
@@ -94,6 +98,10 @@ sha256=125941749103c08a5263f2ace01aac1533420d2ff6741d2bdde79689e5d02a05
 md5=da30fa2748c7501913c8832a83e654ab
 sha256=0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a
 
+[http://www.directfb.org/downloads/Old/DirectFB-1.2.3.tar.gz]
+md5=caea8bcfc9c1d391e56d85e437005a5d
+sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
+
 [http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz]
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
@@ -678,6 +686,10 @@ sha256=85847b8e25d56f7d3af29207d6878601390e97dc5119e4d35bd0b096c27a478d
 md5=af4411ee10875b96c0d61f903018f438
 sha256=bed27a4ec5b71acc08333368e842a1248e83328018b582caf644985539967c5d
 
+[http://www.antigrain.com/agg-2.5.tar.gz]
+md5=0229a488bc47be10a2fee6cf0b2febd6
+sha256=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
+
 [ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c]
 md5=727e5fc3566837b3ea72f887d048769b
 sha256=3f32e5a1ef0ae84794cfdf7d60bd595a2b3c3995bb91bf79c2b96eb6be7e5529
@@ -1134,6 +1146,10 @@ sha256=d095165d256771c918b80f836feaf837aedc1362b2d67171013d3ab7ac5ee47f
 md5=851db68728ed9adea615eb2f249fa1ee
 sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b
 
+[ftp://ftp.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
@@ -1426,6 +1442,10 @@ sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
 md5=c17f964fd5504b88b07a183420de25e3
 sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1
 
+[ftp://ftp.gnu.org/gnu/bison/bison-2.3.tar.gz]
+md5=22327efdd5080e2b1acb6e560a04b43a
+sha256=52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ecda293e
+
 [http://download.berlios.de/bitbake/bitbake-1.6.2.tar.gz]
 md5=1e80b2a4e0d17aba3e377b3ee140ab5e
 sha256=a226f7b37694669aa6efe6c30462e2d44f5881ca70604dac15c23fce66992872
@@ -1534,6 +1554,10 @@ sha256=3eb55f212f554bdd6f41c10df8966e4ae90d89154756ffad396027c859d1e7b6
 md5=4b3403f1c61f7b7758cabf1ac5cb5092
 sha256=04ad733f88662470906a6f0d9894f670a07573f7f7d2698c5ada70b3ae1ba3da
 
+[http://bluez.sourceforge.net/download/bluez-libs-3.36.tar.gz]
+md5=8c2ca546c0e7bb73dbd0e906fce7f6b1
+sha256=692f994d8479143c18e781f9afa6c8265770a5affbf2e6147edc70b78aa3bfae
+
 [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
 md5=8b73b0ccbcef6a4270468487b1309990
 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
@@ -1574,6 +1598,10 @@ sha256=9ffeaa94b862edb7e753a2f97f50b872435a7d5fe9135f24690733a777e85ecb
 md5=2e02aabd1a48998a48a22797f59ccf14
 sha256=c9e8f3aa3a34a558293faa1cb2b2204061852d045aaa5311bb1481f89751ab1d
 
+[http://bluez.sourceforge.net/download/bluez-utils-3.36.tar.gz]
+md5=4fc292b635ba7b442c7aaf5680199012
+sha256=d5781c9b6604c63720020169df4081c364f3f8e79df951db0421e89667fb891d
+
 [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
 md5=f63b440396baee7dee9259395a205d48
 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
@@ -1846,6 +1874,10 @@ sha256=e6f900f10cec90b905588dff17b3c80b0fab928b93b4cd7520d39b5e3490d2bf
 md5=a198d509f9e3a35b78de8bb02174ebb9
 sha256=7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
 
+[http://cairographics.org/snapshots/cairo-1.7.6.tar.gz]
+md5=c612f581b18903b0751a171685fc38dd
+sha256=5268faa116a48a68dd74abb245b26b20f1729d3bd56a8414e429904eb1bae124
+
 [http://gpephone.linuxtogo.org/download/gpephone/calendar-1.0/calendar-1.0.tar.gz]
 md5=eb7be3b85955a1bbe7a0154cbf2f70f9
 sha256=7e6425b688a2d4bbeef0904cac52737b232d03fdc4d35866fd03359f2d5f1794
@@ -2318,6 +2350,14 @@ sha256=45c69529126b6ff50e7ebe2c2b8157a4ecb405174a1349234903021e9ac5c87b
 md5=3e50dd887d6a354be312d874e1d3426c
 sha256=300561ef53ee5971b304142d8570a91f879228c2016e74a142fa3421dfcd3672
 
+[http://curl.haxx.se/download/curl-7.18.2.tar.bz2]
+md5=c389be5b0525276e58865956b7465562
+sha256=b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
+
+[http://curl.haxx.se/download/curl-7.19.0.tar.bz2]
+md5=c299c5e0f20f633791b4c4f7ced4effe
+sha256=a0e28b019f022942650ffa4bdf46e4c09bd8ec18e6ca5f08ad273668115f51f7
+
 [http://www.blackie.dk/Zaurus/custominput/custominput-1.1.0.tgz]
 md5=7a0f97339a1caed5695715581306b83e
 sha256=9af88287720701691b58ee13898d248dd9afc63d9c593eb79c1149cc2a7f4e92
@@ -3042,6 +3082,10 @@ sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
 md5=f3354751f7e293c03ffb9f26bd00b17f
 sha256=6faf0aaf8a44ad119baa921a634eb8dd2d02c4f501af176f294164f7d49dca5e
 
+[http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.24/epiphany-2.24.0.tar.bz2]
+md5=d46089988045c17adaa70af963b3e47a
+sha256=aafb7b16fd23e34315d511c0568e8c4d680be93e2547e8f18dfa4471bc0a6a0b
+
 [http://enlightenment.freedesktop.org/files/epsilon-0.3.0.007.tar.gz]
 md5=408d3c63f9efa06e93e29a691c28985e
 sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
@@ -3230,6 +3274,10 @@ sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
 md5=95c0c78c734b9782ec8d47e99c8e3fc8
 sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa
 
+[ftp://ftp.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
@@ -4066,6 +4114,10 @@ sha256=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694
 md5=44b19442d06f6dc68c7211d66029d826
 sha256=8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2
 
+[http://ftp.belnet.be/packages/ggzgamingzone/ggz/0.0.14.1/ggz-client-libs-0.0.14.1.tar.gz]
+md5=299eaa93721b1d867b5bf7dc6ac764b0
+sha256=0a7bec1a381a450f650890b36253893df0001873ba1f414573a4247298107680
+
 [http://www.wardriving.ch/hpneu/blue/perl/ghettotooth.pl]
 md5=dc94cb07c6e43fc8c4745b728b0ce32b
 sha256=71e285da2f8f03dd0c6f6a969d1f541ab2a2f1a9d91e26f6f60779897d68824e
@@ -4246,6 +4298,14 @@ sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
 md5=039f02d47d4071322a3f00abf031e5d9
 sha256=cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-2.18.0.tar.bz2]
+md5=06e5afe4ce055085dc5fd9fdab527bf7
+sha256=624b9cfccc14781e699c9a3b2e332a51d63bba392c82d57b510d07a3f702362e
+
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-2.18.1.tar.bz2]
+md5=51a9a33f49a4896d4d95d8e980666b9e
+sha256=57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0
+
 [http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
 md5=aa214a10d873b68ddd67cd9de2ccae55
 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
@@ -4450,6 +4510,10 @@ sha256=56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1
 md5=98de3b7d0da690da8b94cddc74f3914b
 sha256=8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.24/gnome-desktop-2.24.0.tar.bz2]
+md5=a2cc0424619f271bf1a65cc0fbe782f0
+sha256=7ebe5b0c2bb296386f1d62c3a5d30ed50e353c8d9dc390b77e0b5fdf56e4dad9
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.7/gnome-desktop-2.7.90.tar.bz2]
 md5=16691f6bdc7c09445c457387adaba1f1
 sha256=6a1499a1e50ac89210a9a1fdb36bc070ef6d1a02764a0f8d90de314dba01972e
@@ -4462,6 +4526,10 @@ sha256=6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
 md5=21fe881ab473fdc9246c36bd8ef929b0
 sha256=5b51e0dfae64e7f48883fce6657fcf47a03f6429e2c67024203e31cc29032a22
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.24/gnome-games-2.24.0.tar.bz2]
+md5=23bf4e795725a74ebb37daacda784adb
+sha256=3105dfb490c187adbe1c14582daa5a134ec672c396af3dd4e0e29cc9fbb4a6ea
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-2.6.1.tar.bz2]
 md5=6ea145547bfd8aa828b22cbbe34cbedf
 sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086
@@ -4474,6 +4542,10 @@ sha256=9d31e7ff0ebed5c7213bf45c5a810656b079ad03ebe3cc8fb952d984a52d6ddb
 md5=a4c03092da28ad53ed3867aef83f29d9
 sha256=98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.24/gnome-icon-theme-2.24.0.tar.bz2]
+md5=17ba571e5dd83434dc5b2b06ada7b56e
+sha256=b71f89f9ead65a7d3ccb92f6a6c2fb1719be25d6661dd67a14b5d820ee6831b2
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.2/gnome-keyring-0.2.1.tar.bz2]
 md5=2fe5fb39cc18d1a6792fd3281223dfff
 sha256=1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612
@@ -4502,6 +4574,10 @@ sha256=f77192ca0b909000f675ad3cd520c313431ee117d554102c7ea486f76f396f6b
 md5=a5c467abe68003d23ec09a795ebfd29f
 sha256=72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.24/gnome-menus-2.24.0.tar.bz2]
+md5=1816a0d21ef99d5b3a8bcd033c88f732
+sha256=f19ac5af961be1d6244f9526311af8a67518c7403ef71209dcee94b68f77d58e
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2]
 md5=541858188f80090d12a33b5a7c34d42c
 sha256=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
@@ -4526,10 +4602,18 @@ sha256=61a01f535b50ca0a4c35b4b59513287f17e0665c0b678952cae663b883b13827
 md5=6c325f5b5f9f424faa494665720bcfb9
 sha256=c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.24/gnome-panel-2.24.0.tar.bz2]
+md5=0d246880611a4c58fe2ff99614b96918
+sha256=6d6d0f013594f1d5f685bc9d35ad2c64d7817339a932d8e17eede5b8a3c8196a
+
 [http://downloads.sourceforge.net/gnome-power/gnome-power-0.0.5.tar.gz]
 md5=db310dadcc958a781a2752a6a7748e60
 sha256=78f7dc6946e178513202f06afc19496c8ac1e3ac6c43c56c40f4db1a23762179
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.23/gnome-python-desktop-2.23.0.tar.bz2]
+md5=d8f8e61d99402e8b0a82d3c8d6e873be
+sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.6/gnome-themes-2.6.2.tar.bz2]
 md5=4aae39232d77e1497f3180202b501adf
 sha256=471191e942fdd1d691095c71fb22c0a645b3644c3b2b1c58a6d6f1a2435fb818
@@ -4974,6 +5058,10 @@ sha256=0fead38b9078842f847cfcc49fc903637d8185a0eca0be493078adfba799b7bf
 md5=cb537b8091f91e5d6776f5435c26d2cf
 sha256=6dd6f9b558ef7306578b4be1a83712e1080104570499fa9329072973bd2ed50f
 
+[http://gpe.linuxtogo.org/download/source/gpe-login-0.95.tar.bz2]
+md5=4e6dfd761f62764f98b9f6c2c09f3715
+sha256=8bea38af14c98354b1ee023475315ae3ba462d33b136a73cde9d83303b659d84
+
 [http://stag.mind.be/gpe-mini-browser-0.11.tar.bz2]
 md5=ebdb2eebb1ca1a5cb8ca7f1e4e3bb817
 sha256=372836198e10982525f01e8bf9d959777ab66f93d0688274c43200c4b8c959f8
@@ -5710,6 +5798,10 @@ sha256=9e364df3d7368c1e69dab1b2352a68bc8ac07e35bf647bf23f3445d902bb4a4c
 md5=57132c4a921ef00e241a0fc991787556
 sha256=ef1be6d109b8a4a05c604944616043a4647510f5c1ff5eb84a1eaecc3d5425d3
 
+[http://download.gnome.org/sources/gtk+/2.14/gtk+-2.14.2.tar.bz2]
+md5=b693a2c1c2dd95457b87d0d042aa5bba
+sha256=efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -5746,6 +5838,10 @@ sha256=9c72b0b3a42c2db05e245706d2345e5d529775ddaf029864fc1dc22ae0a190ef
 md5=8f17f5ab09f9f8e17db3101c0133b811
 sha256=fa0b33c43cc5bc48fba031d4d801e0e80b751cc1b3db9f5e3cc274653a1f57a1
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.15/gtk-engines-2.15.4.tar.bz2]
+md5=060ea25c471e5f4cf5c1baeac27d0345
+sha256=0d8b6630c546327ddc67c700859731036eebdf77e51ad8b71e4d19d28ca2ff2c
+
 [http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.2/gtk-engines-2.2.0.tar.bz2]
 md5=78e9276c28b509f3203de4873c20a263
 sha256=140541cae8b003d2f7210e2ef060ac328d7e45a04e2cf5fa943fff73c9955dd6
@@ -6298,6 +6394,10 @@ sha256=9c8a1d037135642ab85391f92332fdfc22ceeb3ad1f2c0c9911ac5a62a12ee7d
 md5=76e6afde567bd17b4fe095aa0ec90531
 sha256=87fe398d5f4853400afb6afbb41835db3cde954845369e406d739d66b3058056
 
+[http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz]
+md5=4abe604721ce2ccb67f451aa7ceb44d6
+sha256=1cb49ce6a04626939893a447da696f20003903d61bd80c6d74d29dd79ca340d2
+
 [ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz]
 md5=6243f7a19e03e05403ce84e597510d4c
 sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041
@@ -6426,6 +6526,10 @@ sha256=62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6
 md5=a0f0d8cf6fbf0db8ba3937d0cc16138d
 sha256=627119ff21391314b88e5f34da837473151a54ab980d2f76d7f3c6bd3d560d4a
 
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.4.tar.bz2]
+md5=3a532379f226c34b36a5c585999f75e4
+sha256=63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5
+
 [http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.tar.gz]
 md5=3faf4bc1e2bb9353590d7b1fe50ec306
 sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
@@ -6486,6 +6590,10 @@ sha256=b27763c368ceb6744bf687ba371566697a2828d11b576cd4ac853f0a582b0845
 md5=860d392f04299c2740d0752501639c3b
 sha256=76cceaaaf188dfac032b21eb5dc4c7d231efe7ff180dee85dbf5e18bc5d27fe7
 
+[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40/intltool-0.40.3.tar.bz2]
+md5=7adee54938b22d32c63ecb5223fd4249
+sha256=f30cbb62345310a27f74a43fef17f146d99203c097c6460002da0a22d969a594
+
 [http://www.iozone.org/src/current/iozone3_263.tar]
 md5=44fd88df361ec4508e10c8d6615245fa
 sha256=920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461
@@ -6646,6 +6754,10 @@ sha256=18b269b1bfad7230384681e89189c6af18584e19cddbf92208c0acef814046ab
 md5=5a82751b50391eb092c906ce64f3b6bf
 sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
 
+[http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip]
+md5=a342b2b4495b3e1394e161eb5d85d754
+sha256=6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
+
 [http://www.rpsys.net/openzaurus/patches/archive/jffs2_longfilename-r1.patch]
 md5=1e30c4f6d5148d8462c41b7f58738531
 sha256=f01a8f0975905597aaccd2d6647331aac14615b67a37ccf626bb2ea45db13294
@@ -7642,6 +7754,10 @@ sha256=e0089d1b643bf70626159bfacb367118015f69a589740458ec10000e40b9508e
 md5=01a1e1ee0268a2403db42fa630036ab2
 sha256=f8c711427fea50845811360c92f6350ff3dacb9533741470d54ae5d0a2f6848e
 
+[http://dri.freedesktop.org/libdrm/libdrm-2.3.1.tar.bz2]
+md5=620fe7dd02c3236c3e9881a3a238173d
+sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c
+
 [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz]
 md5=47612d2f8a4d4dee746a166d8b7f6f77
 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
@@ -7818,6 +7934,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844
 md5=95d269ad7e7cb7d3032498ad2e47643b
 sha256=b8a1da871aa34362caf0c76dcbd3df42aef7313a4ed08f38eddcb159b80302c5
 
+[http://ftp.belnet.be/packages/ggzgamingzone/ggz/0.0.14.1/libggz-0.0.14.1.tar.gz]
+md5=603739504648833779aa13b0327a1c3d
+sha256=54301052a327f2ff3f2d684c5b1d7920e8601e13f4f8d5f1d170e5a7c9585e85
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-2.0.1.tar.bz2]
 md5=4d93f6b01510013ae429e91af432cfe2
 sha256=6386901d84cb41fb8a584f7aa1b54c984e0590f36f45ee016ef30aa45554194d
@@ -7870,6 +7990,10 @@ sha256=78a2d66bea1d856f06fbd3348abceded8975f09c767a17f58e1d9cd8011ab710
 md5=73426589d7c6fa3266fe4e8f3be2f5b5
 sha256=53e3b241343c7ea9c4a8db4ca898fd7020c281f1400826d899b841d760dd5ba9
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.24/libgnome-2.24.0.tar.bz2]
+md5=35a2b6f214ddd9b6732b3b361140115a
+sha256=aaff55f25077f4e4b1264d561a724e8d98a8842cd7d00ab7973c59bd040554ee
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.6/libgnome-2.6.1.1.tar.bz2]
 md5=8fb8d073987cb4c5d9bfe577550d11c2
 sha256=eda475bdbc875fcb2c0b53acdb6de0f403bafc7941dd42f076353366d4f348b2
@@ -7898,6 +8022,10 @@ sha256=fd117570a94e527f76241bc54d2dd53cbea5e17455f5795b5e52afee25eccaca
 md5=959d5524fe9c37efb55ccfa02e3a063b
 sha256=f70599274dbb575fbbc83bb58179b757800e5d87e59e35f5d95e618c7ec31444
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.18/libgnomeprint-2.18.5.tar.bz2]
+md5=c325baf4487335259e050619185787b1
+sha256=0ead99d6e227192d09902bdb37ec6aac25555a453ff4c338b49700fc477070c5
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.6/libgnomeprint-2.6.2.tar.bz2]
 md5=f742bb321fab833b67270f7b86af0fdb
 sha256=4c8c61d56cded77108d74467a4312e7b9d3bb5236fd1e09f6c3b1205ef5d3d32
@@ -7906,6 +8034,10 @@ sha256=4c8c61d56cded77108d74467a4312e7b9d3bb5236fd1e09f6c3b1205ef5d3d32
 md5=8361c4e1bc3d87b91435807d0c06a3e4
 sha256=155ea46d59a2f366f8c72f97ed3e2f64f6afd259f1049f1d6da93f64ed503389
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.3.tar.bz2]
+md5=f2c5796f15d6b6701bfa224d856098ce
+sha256=4f7c75e54474a76eff41b6e3da15afadd2d5207a04bc82d85b728395563cf747
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.6/libgnomeprintui-2.6.2.tar.bz2]
 md5=b26f7f70eb67fe29f20f6312d4f3085e
 sha256=7869603bbda88f35652d9b70af178836ca7612119ab36084ccc35f2d51c83f13
@@ -7930,6 +8062,10 @@ sha256=552c34d20f30847429e342e6c6ddeece707b69a5abe9aeeafcfeb65cec2eebd7
 md5=dbdb274517ad643d9397dd6868788631
 sha256=d6eef491e70fcc2c1e5b94f6a8dbb3774443b3b76b1ca5d62bfb5b802df14120
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.24/libgnomeui-2.24.0.tar.bz2]
+md5=7d50e1fc4c1ee3c268b26e8dfe7e677b
+sha256=9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.6/libgnomeui-2.6.1.1.tar.bz2]
 md5=16e6717b5d7da982db00fea6167188ef
 sha256=0c6c91a59e411d196fe56c814bd368224b04e11a341a8ad552398035e8f19d93
@@ -8110,6 +8246,14 @@ sha256=1964a9fb46e5f57bda75bfc37e19036b32c6a7d57bf13020776dfaaca348920b
 md5=fa1c82cd9fd2fafd7ff10d78eb5781c5
 sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgtop/2.24/libgtop-2.24.0.tar.bz2]
+md5=f0e3584b9157d3425184a9e21e3ac482
+sha256=af9643abf15887c9cb501a4dcc6f432ec0896b7087ef8739526f284ed1461a18
+
+[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.24/libgweather-2.24.0.tar.bz2]
+md5=d006328ec5cebc5dbf3a18834db95bba
+sha256=0abae1eef7210e4decab7f89ea5b3a012c06859e91923a7212ca50856bffd500
+
 [http://www.handhelds.org/~mmp/files/libhal-nm-0.0.2.tar.gz]
 md5=2f0882a711759113b2388a790abe8fd8
 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981
@@ -8366,6 +8510,10 @@ sha256=deb6530d40ecad2b849d68912500e6d03bab4ac63de7a97340d05af1d7cf0ad4
 md5=7a9f719e50656b795c06c0167012a84f
 sha256=a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f
 
+[http://liboil.freedesktop.org/download/liboil-0.3.15.tar.gz]
+md5=11dd39b1ca13ce2e0618d4df8303f137
+sha256=ae5e3b03a72dd4d12accbe7a6022e4e8570fa309defec9846341384d0a657fd4
+
 [http://liboil.freedesktop.org/download/liboil-0.3.9.tar.gz]
 md5=5d139b1fb16f0e93f0c84290ad2aaff8
 sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90
@@ -8562,6 +8710,10 @@ sha256=f5e1037be2cb2a47a7f50181a42fac289a662e78d0ec4c68971f557d5451b8c2
 md5=1e676c5cc7dfa4ef78affe8fb8f1011d
 sha256=502bbf08f55dc5a3fed9740881930e3b98230004b9f09f6d14f01736d5c4a04d
 
+[http://downloads.sourceforge.net/libpng/libpng-1.2.31.tar.bz2]
+md5=78d2f8c4e0d64f8948819563587302d3
+sha256=24b354dcd8843274a20e1625e04d618d43f9851082254cb9dae6f33f15c2a5cd
+
 [http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
 md5=00cea4539bea4bd34cbf8b82ff9589cd
 sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
@@ -8886,6 +9038,10 @@ sha256=e881c527398904f450f3983dcebb71094b5f558f823fe57d0af5a4c1fa6f6f7f
 md5=cb2da2795f517c713ec98560d078a102
 sha256=ce959b7349de056205e992b05c9c914994bc269d2b1d02de85eacd398263aab6
 
+[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.24/libwnck-2.24.0.tar.bz2]
+md5=860cd0ddce03c41a328e580d4efd4654
+sha256=8cf49cf1d882ceb0b7b3a984ec350e5e2e4d608fec97911a0b0acf36a18d4df4
+
 [http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.8/libwnck-2.8.1.tar.bz2]
 md5=c0a5a8478064287e167c15e3ec0e82a1
 sha256=e9d15538a0bb97f6a440b23a5b372c41387773065dac69cab9fd1dc1d22a432b
@@ -9002,6 +9158,10 @@ sha256=d7549485c55e55041ad5a5e531b17935d89ebf474ae8bc98a51ea31eeeb876e9
 md5=8b99b6e8b08e838438d9e6b639d79ebd
 sha256=e34a19e0b9d7ac03874acffd624f181c85a98fb976dc84411d6cd1bdda965992
 
+[ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz]
+md5=2621d322c16f0257e30f0ff2b13384de
+sha256=1b4428b879afcaae3c2013b21283baad040661fbd502e893e83adc3d15c85d53
+
 [ftp://xmlsoft.org/libxml2/old/libxml2-2.6.9.tar.gz]
 md5=41e9ccf94c1cacb8b1d127b01fba8c38
 sha256=06e4be5214166e1de11715c8b58c61d1a1930df1b6bea035ee6b6a227054ae5b
@@ -9974,6 +10134,10 @@ sha256=3b449713a164d574031843ca38f37be12e3ac40804995b3e5a252562a598482f
 md5=aa9c10bbf6fe3502a65633c4fac0fb80
 sha256=36c20ca7c59e6c35deb04a9febde8aa8040c78c6ba21f595442b94ab78ec137c
 
+[http://goodies.xfce.org/releases/midori/midori-0.0.21.tar.bz2]
+md5=0b9298d00c598137431beb51dbe1f302
+sha256=e561f66262eaf6b9cbd8e84688184b7f3ba6cba0e34e9791e578bdef9adc7731
+
 [http://downloads.sourceforge.net/midpath/midpath-0.1.tar.gz]
 md5=afed8ebe979ce2ea189b117062aaa011
 sha256=556729f60cf2de79a20627dd3f448a7b8dc164331576497f876a4a5c9179544f
@@ -10610,6 +10774,10 @@ sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
 
+[http://downloads.sourceforge.net/openobex/obexftp-0.22.tar.bz2]
+md5=d167cfdea244e3a5f973a7b16864419c
+sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
+
 [http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz]
 md5=edb66ba97fe6c84b6160c670c4bcdea8
 sha256=341c6865aa392b6cf056e1bd9cda53d2f31a942460087ad22d6f6dc91bb0bd0e
@@ -10646,6 +10814,10 @@ sha256=b3404a5a5dd78c0e1ba12b8aa1445589fa7861fa4d9ecafb53b38be760876913
 md5=9d478031be34232e988f3d5874396499
 sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
 
+[http://downloads.sourceforge.net/opencvlibrary/opencv-1.0.0.tar.gz]
+md5=146a05005f2d2c16c4ee10ebd7f1dd58
+sha256=3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
+
 [http://downloads.sourceforge.net/openjade/openjade-1.3.2.tar.gz]
 md5=7df692e3186109cc00db6825b777201e
 sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
@@ -10990,6 +11162,10 @@ sha256=420e3508c74873f9b4c106d7c4d1b0800c138e8f3c07d1ec57aa5995f126899b
 md5=4a9862b5151f16dcad8e30dd6ef08549
 sha256=a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
 
+[http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/pango-1.22.0.tar.bz2]
+md5=37a185a3cb5c1a39ade7fdc3e6c75349
+sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
 md5=39868e0da250fd4c00b2970e4eb84389
 sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
@@ -11154,6 +11330,10 @@ sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c
 md5=0c1c5d6d8cd82e18d62406d2f34d1d38
 sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1
 
+[http://kernel.org//pub/linux/kernel/projects/rt/older/patch-2.6.25.4-rt6.bz2]
+md5=be6ff6fc5eb746e66a1a15629d05bedd
+sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186
+
 [http://kernel.org//pub/linux/kernel/projects/rt/patch-2.6.25.4-rt6.bz2]
 md5=be6ff6fc5eb746e66a1a15629d05bedd
 sha256=513dd1ef58c6f3b2668731f078fb16df2e2152f5a7b66d153c2d41c4dca5b186
@@ -11254,6 +11434,10 @@ sha256=7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41
 md5=3f07c926875f6c5dcb83240f39725177
 sha256=6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
 
+[http://kernel.org//pub/linux/utils/kernel/pcmcia/pcmciautils-015.tar.bz2]
+md5=9e12435c8b6cf7bf59894e90e480b4aa
+sha256=4847485c412b47e3d88fa83ef811229e0e7941217303bc8449c30a3dc2128b6e
+
 [ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.4.tar.bz2]
 md5=89fc389191d9611b314c3fc23235377b
 sha256=1849733ce494a51334bd1cbf4cc96c63b037256ddab8cb2dc3672db916bb3094
@@ -11338,6 +11522,10 @@ sha256=6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823
 md5=2d10f9b6a5f0162cf88016ea2ca0a36d
 sha256=3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f
 
+[http://downloads.sourceforge.net/pidgin/pidgin-2.5.1.tar.bz2]
+md5=f76c269c02fafee9b45cc2a50b43b1f3
+sha256=13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
+
 [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
 md5=75af127948cc0c701d424d22d621f792
 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
@@ -11362,6 +11550,10 @@ sha256=48625f6b5ce130672942503c683d306d957ee40f59f8e59be6ca30a245ad47d0
 md5=8c8afc259af61d42aa9b3d8ec5a9a03b
 sha256=d034f4afb4329c38e8789a5a7a384194c7402094b4c2b7600d2d86d8589e8571
 
+[http://cairographics.org/releases/pixman-0.12.0.tar.gz]
+md5=09357cc74975b01714e00c5899ea1881
+sha256=2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.5.tar.bz2]
 md5=f9fea77e46ec7a3a16e925e137f146e7
 sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
@@ -11646,6 +11838,10 @@ sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc
 md5=3cc5c2407c213aadfd154c8df80efd6c
 sha256=672b753f911bfb7cbf996ece57f46dd91d3bac9aa852178e3a56b5e111672aa9
 
+[http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/proxy-libintl-20080418.zip]
+md5=63047fcbe5ff853db0d04981dd9f1888
+sha256=b8519dfd77939b23ca599a724b536f48340f2c795552aa2a600155230571141c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/proxymngr-X11R7.0-1.0.1.tar.bz2]
 md5=0d2ca6876d84302f966fd105a3b69a8e
 sha256=f1ce23f66ed90c4be505f23c5b659ce48578099521663e788733315f3c36fdb2
@@ -12658,6 +12854,10 @@ sha256=fc5cd165ecc07d2e254412f39a17a26a753bf081a0e02ed5db0b02d2f6bacc6f
 md5=45f8d0efd9b76579a005e4ffe7f96ac3
 sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0
 
+[http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.5.tar.gz]
+md5=55596c41572c5efcf4b2cae9c68c2152
+sha256=bbb73ebc3a22f53e75dfbaa1718eebcc5a3619bb200b50df42d5377b99ebf4d4
+
 [http://downloads.sourceforge.net/scons/scons-0.96.1.tar.gz]
 md5=45b1c346edd8a0970210aeb1e82557c9
 sha256=67ea186c1c6270178da0c3411f8c94fcb6a070eb68c3d43f08f282b0728d0c7d
@@ -13134,6 +13334,10 @@ sha256=47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
 md5=903c9e935c538af392364a9172a3d98d
 sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
 
+[http://www.sqlite.org/sqlite-3.6.2.tar.gz]
+md5=46f92e42243bc51aaa3871645ce78bd5
+sha256=cb07a9801a128e2f42cf49b7e9d577b092ab54aa05242655af93491a73a91a1f
+
 [http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch]
 md5=cfdb5caec0326a3ced8b4159f602c94f
 sha256=a7e784b151b25ca724bb7c9611b07cd9a9f3de12014ee80fcada7dd9a8248f53
@@ -13158,6 +13362,10 @@ sha256=f80f713105fc0747197b6e5d2440cd77205cb1febe25b7b4fe08809ab67ace26
 md5=957e6fff08625fe34f4fc33d0925bbc9
 sha256=2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5
 
+[http://downloads.sourceforge.net/stalonetray/stalonetray-0.7.6.tar.bz2]
+md5=eebb46182b64d75b89776bbfc867f470
+sha256=35043df77437b66ade4a07b69f31aaa8c157ddc2833899eeb8a4794399a9e061
+
 [http://handhelds.org/~skyhusker/starling-0.1.tar.bz2]
 md5=4762b45291ff5f71691f187ee87a449e
 sha256=7a0002c9247b46ff61b44ecc800bec8b6239279475f9a359b35daf11e58c1406
@@ -13686,6 +13894,22 @@ sha256=12535d584e611ce21921e5bb063b21a8c47d7117570f9f1b5fd91fa42439ed69
 md5=e005e843829657fad1a80dda76f6fa25
 sha256=b7a2c39bcf8d0024519c3297c4b7dadf334bcac2c62198a2de330ff0d1ab0a7b
 
+[http://ftp.gnome.org/pub/GNOME/sources/totem/2.23/totem-2.23.4.tar.bz2]
+md5=e90839bbac5b7b663a1ddc74646ded99
+sha256=b0bc44f22ac05d490d607282f40986027a1cda2996adad56203dfed8faa815d9
+
+[http://ftp.gnome.org/pub/GNOME/sources/totem/2.24/totem-2.24.2.tar.bz2]
+md5=e85064c48fe28e8e87c1da04a06173df
+sha256=776ddf74b657da5709d8f3d1c800b8203aa82a5f06f1c6d2d0f23a0a5f6685f7
+
+[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.23/totem-pl-parser-2.23.3.tar.bz2]
+md5=c163dfd840c6a522e6cd852b379e89cd
+sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75
+
+[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.24/totem-pl-parser-2.24.1.tar.bz2]
+md5=fa658ae2f20458d3c5d3effba3b2dd7e
+sha256=3193c3446d211db2bd3c169c86f6d433666669336bd589a20c87f1483295cf2a
+
 [http://downloads.sourceforge.net/transconnect/transconnect-1.2.tar.gz]
 md5=c255ff48387ea6a7092707ba992237e7
 sha256=47d6cc44f78fc6d4cdb1dfee02fe6e0f4d8aae0ce2e3e92567667f0475736617
@@ -15678,6 +15902,14 @@ sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
 md5=05ae7771d2245bf325ff30b13da92666
 sha256=c15dd54ad64e660d5a3e8c1ea0d14e50ba1127aab2e3211b82e3ee1e6c7045a4
 
+[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.3.tar.bz2]
+md5=2fbcae1323c266edf5b6c61751f2e343
+sha256=0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
+
+[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.5.tar.bz2]
+md5=6cc96c3e4ed5d9802fe717beac008f19
+sha256=204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbcomp-X11R7.0-1.0.1.tar.bz2]
 md5=46d1e015897200d4dfed64990abaa8b9
 sha256=35825e80fa1905111302b5c069f5419f5fe63b370f9c437adb8c901fc10cfd16
@@ -15690,6 +15922,10 @@ sha256=d6ac3fdf1ad297b8d3a2cff3089feaa53e3ad34bb2c1a977873f9bcd01006d7a
 md5=56271e79da101bbc31e5384a9499853d
 sha256=04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
 
+[http://www.angstrom-distribution.org/unstable/sources/xkbd-0.8.15-CVS.tar.gz]
+md5=56271e79da101bbc31e5384a9499853d
+sha256=04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xkbdata-X11R7.0-1.0.1.tar.bz2]
 md5=1f706f92334ee65818512b3b45d7be65
 sha256=37af4603fa399760a055cc994c61b25778febf676af3fcfad84577f484a174e6
@@ -15710,6 +15946,10 @@ sha256=d2e9c3c28e23010441ce40c48bda7adabd338a256cb9b99848be6ed937fc10e7
 md5=798502eca0c6c3e8c02d76fabb910532
 sha256=8178a1c45af6e844ca0adcfe72fbddcbaebf3f305452a83e39768373981be92f
 
+[http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.3.tar.bz2]
+md5=d9e9f69f9c6ef5c5a8255cfbe6a57d51
+sha256=49f02ed7b0b246a640fb129fcb3d24d7560305bb6f04e69b09739554857f79f5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkill-X11R7.0-1.0.1.tar.bz2]
 md5=35f47fd58d75c1ea5f414b21a10bdbf3
 sha256=fe59dfdcd43faf8efa778f9b2390525a606a62dcd7a70774982bc19301f6a3ce
@@ -15842,6 +16082,10 @@ sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
 md5=bb16e969850dbb5d3805cb88d35656d0
 sha256=b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.2.tar.bz2]
+md5=fa2915ae377f61c340a18ebef484b64b
+sha256=829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
+
 [http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.4.99.901.tar.bz2]
 md5=e548512ece2f2fd32e438fbbd8f5b857
 sha256=8c5b0f58a7f4382f052df0f4fb352c26953402d3298ee69d2d7077b510e09099
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 54f1c6667c..097e61f701 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.9.2"
+PREFERRED_VERSION_busybox 	= "1.11.1"
 PREFERRED_VERSION_cairo		= "1.7.6"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_dropbear      = "0.51"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 811c20e945..72a7c625c8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -81,8 +81,8 @@ SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "bc2caff9cdef8a16297a2cb196306f88fa5ea2c2"
-SRCREV_pn-linux-openmoko-devel ?= "8119fb41bf9cfd12964fa5e987ff6dbaf5729f75"
+SRCREV_pn-linux-openmoko ?= "a2ef813d2f439a3e9f377d33a2e5baad098afb7e"
+SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -196,7 +196,7 @@ SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "36520"
+EFL_SRCREV ?= "36540"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index 3187b9b12a..f9a45e74df 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -6,7 +6,23 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
 
+PR = "r2"
+
 inherit autotools
 acpaths=""
 
 EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
+
+do_stage() {
+
+#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
+	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/
+	install -d ${STAGING_INCDIR}/beecrypt
+	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
+	do
+		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
+	done
+
+}
+
diff --git a/packages/portabase/beecrypt/.mtn2git_empty b/packages/busybox/busybox-1.11.1/angstrom/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/portabase/beecrypt/.mtn2git_empty
+++ b/packages/busybox/busybox-1.11.1/angstrom/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.11.1/angstrom/defconfig b/packages/busybox/busybox-1.11.1/angstrom/defconfig
new file mode 100644
index 0000000000..f3130caca8
--- /dev/null
+++ b/packages/busybox/busybox-1.11.1/angstrom/defconfig
@@ -0,0 +1,855 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.11.1
+# Thu Oct  9 14:15:08 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_DESKTOP is not set
+CONFIG_FEATURE_ASSUME_UNICODE=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_FEATURE_DIFF_MINIMAL=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_CRYPTPW=y
+CONFIG_CHPASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_DEPMOD is not set
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+# CONFIG_FEATURE_DEPMOD_ALIAS is not set
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+# CONFIG_FINDFS is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_VOLUMEID=y
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MAN is not set
+# CONFIG_MICROCOM is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+CONFIG_READAHEAD=y
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TTYSIZE is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_TELNETD=y
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+# CONFIG_APP_DHCPRELAY is not set
+CONFIG_APP_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.1.bb
index e170a20512..4d488218e2 100644
--- a/packages/busybox/busybox_1.11.1.bb
+++ b/packages/busybox/busybox_1.11.1.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch
new file mode 100644
index 0000000000..29edaeb93c
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch
@@ -0,0 +1,13 @@
+Index: e2fsprogs-libs-1.41.2/MCONFIG.in
+===================================================================
+--- e2fsprogs-libs-1.41.2.orig/MCONFIG.in	2008-09-12 15:28:13.000000000 +0200
++++ e2fsprogs-libs-1.41.2/MCONFIG.in	2008-10-08 01:01:49.539806918 +0200
+@@ -64,7 +64,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = @MKDIR_P@
+ 
+ #
+ # Library definitions
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
new file mode 100644
index 0000000000..87bc2d7e6a
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
@@ -0,0 +1,14 @@
+require e2fsprogs-libs.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+	   file://mkinstalldirs.patch;patch=1 \
+	  "
+
+EXTRA_OECONF=" --enable-elf-shlibs "
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb
index c6daf7b782..5d44db5a62 100644
--- a/packages/gettext/gettext-native_0.17.bb
+++ b/packages/gettext/gettext-native_0.17.bb
@@ -1,4 +1,5 @@
 require gettext_${PV}.bb
+PR = "r2"
 
 DEPENDS = ""
 PROVIDES = ""
@@ -56,4 +57,11 @@ do_stage_append() {
 		fi
 		install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
 	done
+
+	# config.rpath is needed by some configure macros and needs to be autoinstalled.
+        # automake will do this but config.rpath needs to be visible to automake
+        for i in `ls -d ${STAGING_DATADIR}/automake*`
+        do
+                cp ${STAGING_DATADIR}/gettext/config.rpath $i
+        done
 }
diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb
index 7beaee1294..3dac87a09b 100644
--- a/packages/gettext/gettext_0.17.bb
+++ b/packages/gettext/gettext_0.17.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
 PR = "r1"
-DEFAULT_PREFERENCE = "-1"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 PROVIDES = "virtual/libintl"
 
diff --git a/packages/linux/linux-omap/fix-irq33.diff b/packages/linux/linux-omap/fix-irq33.diff
new file mode 100644
index 0000000000..709f042ab7
--- /dev/null
+++ b/packages/linux/linux-omap/fix-irq33.diff
@@ -0,0 +1,111 @@
+From: "Nathan Monson" <nmonson@gmail.com>
+To: "linux-omap@vger.kernel.org List" <linux-omap@vger.kernel.org>
+Subject: Re: omapfb: help from userspace
+Cc: "TK, Pratheesh Gangadhar" <pratheesh@ti.com>
+
+On Wed, Oct 8, 2008 at 11:36 AM, Nathan Monson <nmonson@gmail.com> wrote:
+> "Felipe Contreras" <felipe.contreras@gmail.com> writes:
+>> irq -33, desc: c0335cf8, depth: 0, count: 0, unhandled: 0
+>
+> On the BeagleBoard list, Pratheesh Gangadhar said that mapping I/O
+> regions as Strongly Ordered suppresses this problem:
+> http://groups.google.com/group/beagleboard/browse_thread/thread/23e1c95b4bfb09b5/70d12dca569ca503?show_docid=70d12dca569ca503
+
+Pratheesh helped me make a patch against the latest linux-omap git to
+try this.
+
+With this patch, my IRQ -33 problems with the DSP have disappeared.
+Before, I would end up in IRQ -33 loop after 10 invocations of the DSP
+Bridge 'ping.out' utility.  I just finished running it 50,000 times
+without error.
+
+As stated before, this patch is just a workaround for testing
+purposes, not a fix.  Who knows what performance side effects it
+has...
+
+---
+diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
+index 9eb936e..5cb4f5f 100644
+--- a/arch/arm/include/asm/mach/map.h
++++ b/arch/arm/include/asm/mach/map.h
+@@ -25,6 +25,7 @@ struct map_desc {
+ #define MT_HIGH_VECTORS		8
+ #define MT_MEMORY		9
+ #define MT_ROM			10
++#define MT_MEMORY_SO		11
+
+ #define MT_NONSHARED_DEVICE	MT_DEVICE_NONSHARED
+ #define MT_IXP2000_DEVICE	MT_DEVICE_IXP2000
+diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
+index adbe21f..c11c0e8 100644
+--- a/arch/arm/mach-omap2/io.c
++++ b/arch/arm/mach-omap2/io.c
+@@ -119,13 +119,13 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
+ 		.virtual	= L3_34XX_VIRT,
+ 		.pfn		= __phys_to_pfn(L3_34XX_PHYS),
+ 		.length		= L3_34XX_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= L4_34XX_VIRT,
+ 		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
+ 		.length		= L4_34XX_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= L4_WK_34XX_VIRT,
+@@ -137,19 +137,19 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
+ 		.virtual	= OMAP34XX_GPMC_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),
+ 		.length		= OMAP34XX_GPMC_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= OMAP343X_SMS_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),
+ 		.length		= OMAP343X_SMS_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= OMAP343X_SDRC_VIRT,
+ 		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),
+ 		.length		= OMAP343X_SDRC_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ 	{
+ 		.virtual	= L4_PER_34XX_VIRT,
+@@ -161,7 +161,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
+ 		.virtual	= L4_EMU_34XX_VIRT,
+ 		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),
+ 		.length		= L4_EMU_34XX_SIZE,
+-		.type		= MT_DEVICE
++		.type		= MT_MEMORY_SO
+ 	},
+ };
+ #endif
+diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
+index a713e40..d5f25ad 100644
+--- a/arch/arm/mm/mmu.c
++++ b/arch/arm/mm/mmu.c
+@@ -245,6 +245,10 @@ static struct mem_type mem_types[] = {
+ 		.prot_sect = PMD_TYPE_SECT,
+ 		.domain    = DOMAIN_KERNEL,
+ 	},
++	[MT_MEMORY_SO] = {
++		.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_UNCACHED,
++		.domain    = DOMAIN_KERNEL,
++	},
+ };
+
+ const struct mem_type *get_mem_type(unsigned int type)
+--
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index a81cec89aa..14de954e7c 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
 
 PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -35,6 +35,7 @@ SRC_URI_append = " \
            file://mru-256MB.diff;patch=1 \
            file://musb-fix-endpoints.diff;patch=1 \
            file://dvb-fix-dma.diff;patch=1 \
+           file://fix-irq33.diff;patch=1 \
 "
 
 
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index c68b5c2e69..dac670abf9 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -5,21 +5,14 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for the Openmoko Neo Smartphones
 
 DEFAULT_PREFERENCE = "-1"
 
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.26"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
-PR = "r4"
+PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}"
+PR = "r0"
 
 SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy \
-  \
-  file://0001-squashfs-with-lzma.patch;patch=1 \
-  file://0002-squashfs-initrd.patch;patch=1 \
-  file://0003-squashfs-force-O2.patch;patch=1 \
-  file://0004-squashfs-Kconfig.patch;patch=1 \
-  file://0005-squashfs-Makefile.patch;patch=1 \
-  \
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \
   file://defconfig-oe \
 "
 S = "${WORKDIR}/git"
diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index 99bf6496d8..eefe72f1e5 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
@@ -35,8 +35,8 @@ KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb_default.dts"
 # use here. -- Leon Woestenberg
 
 SRC_URI_append_mpc8315e-rdb = " \
-${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.7.bz2;patch=1;p=1 \
-${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.24.7-rt3.bz2;patch=1;p=1 \
+${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.24.3.bz2;patch=1;p=1 \
+${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.24.3-rt3.bz2;patch=1;p=1 \
 http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-platform-support.patch;patch=1 \
 http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-add-all-interrupts.patch;patch=1 \
 http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-Realtek-821x-phy.patch;patch=1 \
@@ -77,4 +77,3 @@ http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-MPC8315ERDB-default-configuratio
 #http://www.bitshrine.org/gpp/linux-2.6.24-Openswan-2.4.12.patch;patch=1 \
 #http://www.bitshrine.org/gpp/linux-fsl-2.6.24.3-openswan-sysctl.patch;patch=1 \
 #"
-
diff --git a/packages/makedevs/makedevs_1.0.0.bb b/packages/makedevs/makedevs_1.0.0.bb
index a80a518709..249e1a47c4 100644
--- a/packages/makedevs/makedevs_1.0.0.bb
+++ b/packages/makedevs/makedevs_1.0.0.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "A tool to make device nodes"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
+
 SRC_URI = "file://makedevs.c"
 S = "${WORKDIR}/makedevs-${PV}"
-PR = "r5"
+
+PR = "r6"
+
+inherit update-alternatives
 
 do_configure() {
 	install -m 0644 ${WORKDIR}/makedevs.c ${S}/
@@ -16,5 +20,12 @@ do_compile() {
 
 do_install() {
 	install -d ${D}${base_sbindir}
-	install -m 0755 ${S}/makedevs ${D}${base_sbindir}/makedevs
+	install -m 0755 ${S}/makedevs ${D}${base_sbindir}/makedevs.makedevs
 }
+
+ALTERNATIVE_PATH = "${base_sbindir}/makedevs.makedevs"
+ALTERNATIVE_NAME = "makedevs"
+ALTERNATIVE_LINK = "${base_sbindir}/makedevs"
+ALTERNATIVE_PRIORITY = "50"
+
+
diff --git a/packages/pmount/pmount-0.9.17/.mtn2git_empty b/packages/pmount/pmount-0.9.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pmount/pmount-0.9.17/.mtn2git_empty
diff --git a/packages/pmount/pmount-0.9.17/gettext.patch b/packages/pmount/pmount-0.9.17/gettext.patch
new file mode 100644
index 0000000000..dbac93f6ba
--- /dev/null
+++ b/packages/pmount/pmount-0.9.17/gettext.patch
@@ -0,0 +1,133 @@
+Index: pmount-0.9.17/src/pmount-hal.c
+===================================================================
+--- pmount-0.9.17.orig/src/pmount-hal.c	2007-07-01 13:58:49.000000000 +0200
++++ pmount-0.9.17/src/pmount-hal.c	2008-10-08 23:39:20.970178412 +0200
+@@ -16,7 +16,6 @@
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <locale.h>
+-#include <libintl.h>
+ #include <libhal-storage.h>
+ 
+ #include "policy.h"
+@@ -26,7 +25,12 @@
+ #include "realpath.h"
+ 
+ /* gettext abbreviation */
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
++#else
++#define _(String) (String)
++#endif
+ 
+ void help() {
+     puts( _(
+@@ -196,10 +200,12 @@
+     char *dmask = NULL;
+     char *iocharset = NULL;
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     if( argc < 2 ) {
+         help();
+Index: pmount-0.9.17/src/utils.h
+===================================================================
+--- pmount-0.9.17.orig/src/utils.h	2007-07-07 09:05:06.000000000 +0200
++++ pmount-0.9.17/src/utils.h	2008-10-08 23:19:09.515475595 +0200
+@@ -12,7 +12,12 @@
+ #define __utils_h
+ 
+ /* gettext abbreviation */
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext(String)
++#else
++#define _(String) (String)
++#endif
+ 
+ /* global flag whether to print debug messages (false by default) */
+ extern int enable_debug;
+Index: pmount-0.9.17/configure.ac
+===================================================================
+--- pmount-0.9.17.orig/configure.ac	2007-12-14 20:27:23.000000000 +0100
++++ pmount-0.9.17/configure.ac	2008-10-08 23:19:09.598820915 +0200
+@@ -77,10 +77,7 @@
+ fi
+ AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL")
+ 													   
+-GETTEXT_PACKAGE="pmount"
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+-AM_GLIB_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ AC_OUTPUT([
+ Makefile
+Index: pmount-0.9.17/src/pmount.c
+===================================================================
+--- pmount-0.9.17.orig/src/pmount.c	2008-10-08 23:36:44.452037557 +0200
++++ pmount-0.9.17/src/pmount.c	2008-10-08 23:37:38.778816969 +0200
+@@ -21,9 +21,12 @@
+ #include <errno.h>
+ #include <locale.h>
+ #include <langinfo.h>
+-#include <libintl.h>
+ #include <sys/stat.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ #include "fs.h"
+ #include "policy.h"
+ #include "utils.h"
+@@ -619,10 +622,12 @@
+         { NULL, 0, NULL, 0}
+     };
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     /* If pmount is run without a single argument, print out the list
+        of removable devices. Does not require root privileges, just read access
+Index: pmount-0.9.17/src/pumount.c
+===================================================================
+--- pmount-0.9.17.orig/src/pumount.c	2008-10-08 23:38:21.122028300 +0200
++++ pmount-0.9.17/src/pumount.c	2008-10-08 23:38:47.972023678 +0200
+@@ -16,9 +16,12 @@
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <getopt.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ #include "policy.h"
+ #include "utils.h"
+ #include "luks.h"
+@@ -172,10 +175,12 @@
+         { NULL, 0, NULL, 0}
+     };
+ 
++#ifdef ENABLE_NLS
+     /* initialize locale */
+     setlocale( LC_ALL, "" );
+     bindtextdomain( "pmount", NULL );
+     textdomain( "pmount" );
++#endif
+ 
+     /* are we root? */
+     if( geteuid() ) {
diff --git a/packages/pmount/pmount-0.9.17/install.patch b/packages/pmount/pmount-0.9.17/install.patch
new file mode 100644
index 0000000000..b02942a591
--- /dev/null
+++ b/packages/pmount/pmount-0.9.17/install.patch
@@ -0,0 +1,15 @@
+Index: pmount-0.9.17/src/Makefile.am
+===================================================================
+--- pmount-0.9.17.orig/src/Makefile.am	2008-10-09 01:22:41.668067209 +0200
++++ pmount-0.9.17/src/Makefile.am	2008-10-09 01:23:22.144725902 +0200
+@@ -36,8 +36,8 @@
+ 
+ install-data-hook:
+ 	test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR)
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
+-	$(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
++	$(INSTALL_DATA)  -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount
++	$(INSTALL_DATA)  -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount
+ 
+ uninstall-hook:
+ 	rm -f $(INSTALL_DIR)/pmount
diff --git a/packages/pmount/pmount_0.9.17.bb b/packages/pmount/pmount_0.9.17.bb
new file mode 100644
index 0000000000..f72534b468
--- /dev/null
+++ b/packages/pmount/pmount_0.9.17.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE = "http://pmount.alioth.debian.org/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+DEPENDS = "hal e2fsprogs-libs sysfsutils"
+RDEPENDS_${PN}-hal = "${PN}"
+RRECOMMENDS_${PN}-hal = "hal"
+
+SRC_URI = "http://alioth.debian.org/frs/download.php/2247/${P}.tar.gz \
+	   file://gettext.patch;patch=1 \
+	   file://install.patch;patch=1 \
+	  "
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--enable-hal"
+
+PACKAGES =+ "${PN}-hal"
+
+FILES_${PN}-hal = "${bindir}/pmount-hal"
+
diff --git a/packages/portabase/beecrypt/config.m4 b/packages/portabase/beecrypt/config.m4
deleted file mode 100644
index 05d2d1593d..0000000000
--- a/packages/portabase/beecrypt/config.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-dnl config.m4
-ifdef(`__CONFIG_M4_INCLUDED__',,`
-define(`CONFIG_TOP_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0')
-define(`ASM_OS',`linux-gnu')
-define(`ASM_CPU',`arm')
-define(`ASM_ARCH',`arm')
-define(`ASM_BIGENDIAN',`no')
-define(`ASM_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0/gas')
-define(`TEXTSEG',`.text')
-define(`GLOBL',`.globl')
-define(`GSYM_PREFIX',`')
-define(`LSYM_PREFIX',`.L')
-define(`ALIGN',`')
-define(`__CONFIG_M4_INCLUDED__')
-include(asmdefs.m4)
-')
diff --git a/packages/portabase/beecrypt/gas.patch b/packages/portabase/beecrypt/gas.patch
deleted file mode 100644
index bdb20944d3..0000000000
--- a/packages/portabase/beecrypt/gas.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 beecrypt-3.1.0/gas/aesopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/aesopt.ppc.m4	2003-06-09 08:03:21 +0200
-+++ beecrypt-3.1.0/gas/aesopt.ppc.m4	2004-10-06 17:59:31 +0200
-@@ -21,7 +21,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- define(`s0',`r24')
- define(`s1',`r25')
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.x86.m4 beecrypt-3.1.0/gas/aesopt.x86.m4
---- beecrypt-3.1.0/gas.orig/aesopt.x86.m4	2003-06-09 10:35:39 +0200
-+++ beecrypt-3.1.0/gas/aesopt.x86.m4	2004-10-06 17:54:36 +0200
-@@ -1,5 +1,5 @@
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- ifdef(`USE_MMX',`
- 
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 beecrypt-3.1.0/gas/blowfishopt.i586.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4	2003-06-09 10:25:11 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.i586.m4	2004-10-06 17:54:58 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- dnl during this macro we assume:
- dnl	bp in %esi, xl and xr in %ecx and %edx, %eax and %ebx clear
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 beecrypt-3.1.0/gas/blowfishopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4	2003-06-04 19:39:57 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.ppc.m4	2004-10-06 17:59:36 +0200
-@@ -21,7 +21,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- define(`round',`
- 	lwz r9,$3(r3)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 beecrypt-3.1.0/gas/mpopt.alpha.m4
---- beecrypt-3.1.0/gas.orig/mpopt.alpha.m4	2003-05-29 10:44:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.alpha.m4	2004-10-06 17:57:20 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/alpha.m4)
-+include(alpha.m4)
- 
- 
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 beecrypt-3.1.0/gas/mpopt.ia64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ia64.m4	2003-05-28 10:40:44 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ia64.m4	2004-10-06 17:57:32 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ia64.m4)
-+include(ia64.m4)
- 
- define(`sze',`r14')
- define(`dst',`r15')
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 beecrypt-3.1.0/gas/mpopt.m68k.m4
---- beecrypt-3.1.0/gas.orig/mpopt.m68k.m4	2003-04-26 14:01:57 +0200
-+++ beecrypt-3.1.0/gas/mpopt.m68k.m4	2004-10-06 17:57:38 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/m68k.m4)
-+include(m68k.m4)
- 
- dnl works
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 beecrypt-3.1.0/gas/mpopt.ppc64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc64.m4	2004-10-06 17:57:54 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/ppc64.m4)
-+include(ppc64.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 beecrypt-3.1.0/gas/mpopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc.m4	2004-10-06 17:57:50 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 beecrypt-3.1.0/gas/mpopt.sparcv8.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8.m4	2004-10-06 17:56:54 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpsetmul)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4	2004-10-06 17:57:04 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 beecrypt-3.1.0/gas/mpopt.x86_64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4	2003-05-29 14:40:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86_64.m4	2004-10-06 17:56:14 +0200
-@@ -21,7 +21,7 @@
- 	.file "mpopt.s"
- 
- include(config.m4)
--include(ASM_SRCDIR/x86_64.m4)
-+include(x86_64.m4)
- 
- 
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86.m4 beecrypt-3.1.0/gas/mpopt.x86.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86.m4	2003-06-04 19:39:58 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86.m4	2004-10-06 17:56:27 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- 
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 beecrypt-3.1.0/gas/sha1opt.x86.m4
---- beecrypt-3.1.0/gas.orig/sha1opt.x86.m4	2003-05-08 19:52:54 +0200
-+++ beecrypt-3.1.0/gas/sha1opt.x86.m4	2004-10-06 17:55:20 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- 	.equ	K00,	0x5a827999
- 	.equ	K20,	0x6ed9eba1
diff --git a/packages/portabase/beecrypt/m4.diff b/packages/portabase/beecrypt/m4.diff
deleted file mode 100644
index 0d07f75cb2..0000000000
--- a/packages/portabase/beecrypt/m4.diff
+++ /dev/null
@@ -1,155 +0,0 @@
---- beecrypt-3.1.0/acinclude.m4.orig	2004-10-06 17:09:25.000000000 +0200
-+++ beecrypt-3.1.0/acinclude.m4	2004-10-06 17:12:22.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- 
- dnl  BEECRYPT_INT_TYPES
--AC_DEFUN(BEECRYPT_INT_TYPES,[
-+AC_DEFUN([BEECRYPT_INT_TYPES],[
-   AC_TYPE_SIZE_T
-   bc_typedef_size_t=
-   if test $ac_cv_type_size_t != yes; then
-@@ -112,7 +112,7 @@
- 
- 
- dnl  BEECRYPT_CPU_BITS
--AC_DEFUN(BEECRYPT_CPU_BITS,[
-+AC_DEFUN([BEECRYPT_CPU_BITS],[
-   AC_CHECK_SIZEOF([unsigned long])
-   if test $ac_cv_sizeof_unsigned_long -eq 8; then
-     AC_SUBST(MP_WBITS,64U)
-@@ -125,7 +125,7 @@
- 
- 
- dnl  BEECRYPT_WORKING_AIO
--AC_DEFUN(BEECRYPT_WORKING_AIO,[
-+AC_DEFUN([BEECRYPT_WORKING_AIO],[
-   AC_CHECK_HEADERS(aio.h)
-   if test "$ac_cv_header_aio_h" = yes; then
-     AC_SEARCH_LIBS([aio_read],[c rt aio posix4],[
-@@ -228,7 +228,7 @@
- 
- 
- dnl  BEECRYPT_CFLAGS_REM
--AC_DEFUN(BEECRYPT_CFLAGS_REM,[
-+AC_DEFUN([BEECRYPT_CFLAGS_REM],[
-   if test "$CFLAGS" != ""; then
-     CFLAGS_save=""
-     for flag in $CFLAGS
-@@ -243,7 +243,7 @@
- 
- 
- dnl  BEECRYPT_GNU_CC
--AC_DEFUN(BEECRYPT_GNU_CC,[
-+AC_DEFUN([BEECRYPT_GNU_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   case $bc_target_arch in
-   ia64)
-@@ -331,7 +331,7 @@
- 
- 
- dnl  BEECRYPT_COMPAQ_CC
--AC_DEFUN(BEECRYPT_COMPAQ_CC,[
-+AC_DEFUN([BEECRYPT_COMPAQ_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Compaq's C compiler],bc_cv_prog_COMPAQ_CC,[
-@@ -355,7 +355,7 @@
- 
- 
- dnl  BEECRYPT_HPUX_CC
--AC_DEFUN(BEECRYPT_HPUX_CC,[
-+AC_DEFUN([BEECRYPT_HPUX_CC],[
-   if test "$ac_enable_debug" != yes; then
-     BEECRYPT_CFLAGS_REM([-g])
-     CFLAGS="$CFLAGS -fast"
-@@ -364,7 +364,7 @@
- 
- 
- dnl  BEECRYPT_IBM_CC
--AC_DEFUN(BEECRYPT_IBM_CC,[
-+AC_DEFUN([BEECRYPT_IBM_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using IBM C],bc_cv_prog_IBM_CC,[
-@@ -398,7 +398,7 @@
- 
- 
- dnl  BEECRYPT_INTEL_CC
--AC_DEFUN(BEECRYPT_INTEL_CC,[
-+AC_DEFUN([BEECRYPT_INTEL_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Intel C++],bc_cv_prog_INTEL_CC,[
-@@ -448,7 +448,7 @@
- 
- 
- dnl  BEECRYPT_SUN_FORTE_CC
--AC_DEFUN(BEECRYPT_SUN_FORTE_CC,[
-+AC_DEFUN([BEECRYPT_SUN_FORTE_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Sun Forte C],bc_cv_prog_SUN_FORTE_CC,[
-@@ -485,7 +485,7 @@
- 
- 
- dnl  BEECRYPT_ASM_DEFS
--AC_DEFUN(BEECRYPT_ASM_DEFS,[
-+AC_DEFUN([BEECRYPT_ASM_DEFS],[
-   AC_SUBST(ASM_OS,$target_os)
-   AC_SUBST(ASM_CPU,$bc_target_cpu)
-   AC_SUBST(ASM_ARCH,$bc_target_arch)
-@@ -494,7 +494,7 @@
- 
- 
- dnl  BEECRYPT_ASM_TEXTSEG
--AC_DEFUN(BEECRYPT_ASM_TEXTSEG,[
-+AC_DEFUN([BEECRYPT_ASM_TEXTSEG],[
-   AC_CACHE_CHECK([how to switch to text segment],
-     bc_cv_asm_textseg,[
-       case $target_os in
-@@ -516,7 +516,7 @@
- 
- 
- dnl  BEECRYPT_ASM_GLOBL
--AC_DEFUN(BEECRYPT_ASM_GLOBL,[
-+AC_DEFUN([BEECRYPT_ASM_GLOBL],[
-   AC_CACHE_CHECK([how to declare a global symbol],
-     bc_cv_asm_globl,[
-       case $target_os in
-@@ -529,7 +529,7 @@
- 
- 
- dnl  BEECRYPT_ASM_GSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_GSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_GSYM_PREFIX],[
-   AC_CACHE_CHECK([if global symbols need leading underscore],
-     bc_cv_asm_gsym_prefix,[
-       case $target_os in
-@@ -542,7 +542,7 @@
- 
- 
- dnl  BEECRYPT_ASM_LSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_LSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_LSYM_PREFIX],[
-   AC_CACHE_CHECK([how to declare a local symbol],
-     bc_cv_asm_lsym_prefix,[
-       case $target_os in
-@@ -562,7 +562,7 @@
- 
- 
- dnl  BEECRYPT_ASM_ALIGN
--AC_DEFUN(BEECRYPT_ASM_ALIGN,[
-+AC_DEFUN([BEECRYPT_ASM_ALIGN],[
-   AC_CACHE_CHECK([how to align symbols],
-     bc_cv_asm_align,[
-       case $target_cpu in
-@@ -587,7 +587,7 @@
- 
- 
- dnl  BEECRYPT_ASM_SOURCES
--AC_DEFUN(BEECRYPT_ASM_SOURCES,[
-+AC_DEFUN([BEECRYPT_ASM_SOURCES],[
-   echo > mpopt.s
-   echo > aesopt.s
-   echo > blowfishopt.s
diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb
deleted file mode 100644
index bd61bad88e..0000000000
--- a/packages/portabase/beecrypt_3.1.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "BeeCrypt is an ongoing project to provide a strong and fast cryptography \
-toolkit. Includes entropy sources, random generators, block ciphers, hash functions, \
-message authentication codes, multiprecision integer routines, and public key primitives."
-
-HOMEPAGE = "http://sourceforge.net/projects/beecrypt/"
-LICENSE = "LGPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-file://config.m4 \
-file://gas.patch;patch=1 \
-file://m4.diff;patch=1"
-PR = "r1"
-
-inherit autotools
-
-do_configure_prepend() {
-
-cp ${WORKDIR}/config.m4 ${S}/gas/
-
-}
-
-
-do_stage() {
-
-#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
-	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/beecrypt
-	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
-	do
-		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
-	done
-
-}
diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb
index 43794f3e6f..404dfcfe1e 100644
--- a/packages/portabase/metakit_2.4.9.3.bb
+++ b/packages/portabase/metakit_2.4.9.3.bb
@@ -8,13 +8,16 @@ HOMEPAGE = "http://www.equi4.com/metakit.html"
 
 SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \
 	   file://metakit-2.4.9.3.patch;patch=1"
-PR = "r2"
+PR = "r3"
+
+FILES_${PN} += " ${libdir}/*.so"
 
 do_configure_prepend() {
 
 #	cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/
 
 }
+
 do_configure () {
 
 	cd builds
@@ -41,10 +44,8 @@ do_configure () {
 
 }
 
-
 do_stage() {
-#	oe_libinstall  -a  -C builds/.libs libmk4  ${STAGING_LIBDIR}
-	cp builds/.libs/libmk4.a ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C builds/.libs libmk4 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/
 	for X in mk4.h mk4.inl
 	do
@@ -53,14 +54,12 @@ do_stage() {
 
 }
 
-
-
 do_compile () {
 	cd builds
 	oe_runmake
 }
 
 do_install() {
-
-	:
+	oe_libinstall -so -C builds/.libs libmk4 ${D}${libdir}
 }
+
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index aac840ae58..64090bf80f 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r41"
+PR = "r42"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -98,6 +98,7 @@ EOF
 	mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
 	mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
 	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+	mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN}	
 	mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
 	mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
 	mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
@@ -108,6 +109,7 @@ pkg_postinst_${PN} () {
 update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
 update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
 update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
+update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${PN} 200
 update-alternatives --install ${bindir}/last last last.${PN} 200
 update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
 update-alternatives --install ${bindir}/wall wall wall.${PN} 200
diff --git a/packages/tinylogin/tinylogin_1.4.bb b/packages/tinylogin/tinylogin_1.4.bb
index ad254bff6a..43a7f10755 100644
--- a/packages/tinylogin/tinylogin_1.4.bb
+++ b/packages/tinylogin/tinylogin_1.4.bb
@@ -3,11 +3,11 @@ DESCRIPTION = "TinyLogin is a suite of tiny UNIX \
 utilities for handling logins, user authentication, \
 changing passwords, and otherwise maintaining users \
 and groups on an embedded system."
-HOMEPAGE = "http://tinylogin.busybox.net/"
+HOMEPAGE = "http://tinylogin.tinylogin.net/"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \
+SRC_URI = "http://tinylogin.tinylogin.net/downloads/tinylogin-${PV}.tar.bz2 \
 	file://cvs-20040608.patch;patch=1;pnum=1 \
 	file://add-system.patch;patch=1;pnum=1 \
 	file://adduser-empty_pwd.patch;patch=1 \
@@ -22,8 +22,17 @@ do_compile () {
 do_install () {
 	install -d ${D}${base_bindir}
 	install -m 4755 tinylogin ${D}${base_bindir}/tinylogin
-	for i in `cat tinylogin.links`; do
-		mkdir -p ${D}/`dirname $i`
-		ln -sf /bin/tinylogin ${D}$i
-	done
+	install -d ${D}${sysconfdir}
+	install -m 0644 tinylogin.links ${D}${sysconfdir}
 }
+
+pkg_postinst_${PN} () {
+    # If we are not making an image we create links for the utilities that doesn't exist
+    # so the update-alternatives script will get the utilities it needs
+    # (update-alternatives have no problem replacing links later anyway)
+    if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/tinylogin";; /bin/*) to="tinylogin";; /*/*) to="../bin/tinylogin";; esac; ln -s $to $link; fi; done </etc/tinylogin.links; fi
+
+    # This adds the links, remember that this has to work when building an image too, hence the $D
+    while read link; do case "$link" in /*/*/*) to="../../bin/tinylogin";; /bin/*) to="tinylogin";; /*/*) to="../bin/tinylogin";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 40; done <$D/etc/tinylogin.links
+}
+
diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc
index 810c8e6e9f..443adf29bc 100644
--- a/packages/util-linux-ng/util-linux-ng.inc
+++ b/packages/util-linux-ng/util-linux-ng.inc
@@ -26,7 +26,7 @@ FILES_util-linux-ng-swaponoff = "/sbin/swapon.${PN} /sbin/swapoff.${PN}"
 FILES_util-linux-ng-losetup = "/sbin/losetup.${PN}"
 FILES_util-linux-ng-mount = "/bin/mount.${PN} ${sysconfdir}/default/mountall"
 FILES_util-linux-ng-umount = "/bin/umount.${PN}"
-FILES_util-linux-ng-readprofile = "/usr/sbin/readprofile"
+FILES_util-linux-ng-readprofile = "/usr/sbin/readprofile.${PN}"
 
 RRECOMMENDS_${PN} = "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-mount util-linux-ng-readprofile "
 RDEPENDS_${PN} = "util-linux-ng-umount util-linux-ng-swaponoff util-linux-ng-losetup"
@@ -109,6 +109,8 @@ do_install () {
 	mv ${D}${sbindir}/cfdisk ${D}${base_sbindir}/
 	mv ${D}${sbindir}/ctrlaltdel ${D}${base_sbindir}/
 
+	mv ${D}${sbindir}/readprofile ${D}${sbindir}/readprofile.${PN}
+	
 	install -d ${D}${sysconfdir}/default/
 	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
@@ -207,3 +209,12 @@ pkg_prerm_util-linux-ng-swaponoff () {
 	update-alternatives --remove swapoff swapoff.${PN}
 	update-alternatives --remove swapon swapon.${PN}
 }
+
+pkg_postinst_util-linux-ng-readprofile() {
+    update-alternatives --install ${sbindir}/readprofile readprofile readprofile.${PN} 100
+}
+
+pkg_prerm_util-linux-ng-readprofile () {
+    update-alternatives --remove readprofile readprofile.${PN} 100
+}
+
diff --git a/packages/util-linux-ng/util-linux-ng_2.14.bb b/packages/util-linux-ng/util-linux-ng_2.14.bb
index 455c0b8c46..1223aa72e8 100644
--- a/packages/util-linux-ng/util-linux-ng_2.14.bb
+++ b/packages/util-linux-ng/util-linux-ng_2.14.bb
@@ -1,6 +1,6 @@
 require util-linux-ng.inc
 
-PR = "r2"
+PR = "r3"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.14', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \
author	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>	2008-10-09 17:36:26 +0000
committer	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>	2008-10-09 17:36:26 +0000
commit	4fc0350debb067af2293141903b692c2f05a20b1 (patch)
tree	4c9096cd991275ad89b074de5b274fabb65bd06c
parent	8e57ba12981ecc58d174d0c3c1a8a0cc69490896 (diff)
parent	227d3062aa5ab07b3b05ea219a658a4f9aba5962 (diff)