[oe-commits] org.oe.dev merge of '0df24d50b2a3e2b52a0f5072b0e7ad8716db582e'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Jan 3 22:12:44 UTC 2008
merge of '0df24d50b2a3e2b52a0f5072b0e7ad8716db582e'
and 'e41398d20c55fd8c83bc62b4900cf81ad587f19a'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 3e3e64c7187462ff0792e72f0fc7ffaa964aff0c
ViewMTN: http://monotone.openembedded.org/revision/info/3e3e64c7187462ff0792e72f0fc7ffaa964aff0c
Files:
1
contrib/feed-browser/includes/config.inc
contrib/feed-browser/update.php
packages/speechd
packages/speechd/speechd_0.56.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/qpegps/qpegps_0.9.3.bb
packages/qpegps/qpegps_0.9.3.1.bb
packages/dbus/dbus-1.1.1
packages/dotconf
packages/dotconf/files
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302
packages/linux/linux-2.6.23+2.6.24-rc6
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek
packages/sgmlspl
packages/sgmlspl/files
packages/speech-dispatcher
packages/speech-dispatcher/files
packages/util-linux-ng
conf/distro/include/preferred-om-2008-versions.inc
conf/machine/gesbc-9302.conf
packages/dbus/dbus-1.1.1/cross.patch
packages/dbus/dbus-1.1.1/dbus-1.init
packages/dbus/dbus-1.1.1/fix-install-daemon.patch
packages/dbus/dbus-1.1.1/tmpdir.patch
packages/dbus/dbus-native_1.1.1.bb
packages/dbus/dbus_1.1.1.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
packages/dotconf/dotconf_1.0.13.bb
packages/dotconf/files/srcMakefile.am_00.patch
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig
packages/linux/linux_2.6.23+2.6.24-rc6.bb
packages/navit/files/navit.desktop
packages/ntpclient/ntpclient_2007_365.bb
packages/qpegps/qpegps_svn.bb
packages/sgmlspl/files/combined.patch
packages/sgmlspl/sgmlspl-native_1.03ii.bb
packages/speech-dispatcher/files/srcMakefile.am.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/util-linux-ng/util-linux-ng.inc
packages/util-linux-ng/util-linux-ng_2.13.1.bb
MAINTAINERS
classes/base.bbclass
classes/sanity.bbclass
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/gpsd/gpsd.inc
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/qemu/qemu-gcc3-check.inc
packages/qpegps/files/qpegps.desktop
packages/qpegps/qpegps.inc
Diffs:
#
# mt diff -r0df24d50b2a3e2b52a0f5072b0e7ad8716db582e -r3e3e64c7187462ff0792e72f0fc7ffaa964aff0c
#
#
#
# patch "contrib/feed-browser/includes/config.inc"
# from [c83ad830b6705b298699f4bad3d61b6ea860b1d2]
# to [39327f92e74d13d82921aae4b3e00a118513abd4]
#
# patch "contrib/feed-browser/update.php"
# from [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
# to [21317f05572334abdbc6bf631ac3fed98456bd2d]
#
============================================================
--- contrib/feed-browser/includes/config.inc c83ad830b6705b298699f4bad3d61b6ea860b1d2
+++ contrib/feed-browser/includes/config.inc 39327f92e74d13d82921aae4b3e00a118513abd4
@@ -1,301 +1,746 @@
<?php
-define('DB_FILENAME', './feeds.db');
+define('DB_FILENAME', '/home/angstrom/website/repo/feeds.db');
+$feed_base_url = "http://www.angstrom-distribution.org/unstable/feed/";
$feeds = array(
- array(
- 'distro_name'=>'OpenZaurus',
- 'distro_version'=>'3.5.4',
- 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/',
- 'feeds'=>array(
+ array(
+ 'distro_name'=>'Ångström',
+ 'distro_version'=>'unstable',
+ 'feed_base_url'=>'http://www.angstrom-distribution.org/unstable/feed/',
+ 'feeds'=>
array(
- 'name'=>'base',
- 'url'=>'base',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'opie',
- 'url'=>'opie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'x11',
- 'url'=>'x11',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'upgrades',
- 'url'=>'upgrades',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'perl',
- 'url'=>'perl',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'python',
- 'url'=>'python',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Collie upgrades',
- 'url'=>'upgrades/machine/collie',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Tosa upgrades',
- 'url'=>'upgrades/machine/tosa',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Poodle upgrades',
- 'url'=>'upgrades/machine/poodle',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Poodle',
- 'url'=>'machine/poodle',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Collie',
- 'url'=>'machine/collie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Tosa',
- 'url'=>'machine/tosa',
- 'type'=>'normal',
- )
- )
- ),
- array(
- 'distro_name'=>'OpenZaurus',
- 'distro_version'=>'3.5.4.1',
- 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/',
- 'feeds'=>array(
- array(
- 'name'=>'base',
- 'url'=>'base',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'opie',
- 'url'=>'opie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'perl',
- 'url'=>'perl',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'python',
- 'url'=>'python',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'upgrades',
- 'url'=>'upgrades',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'x11',
- 'url'=>'x11',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'C7x0',
- 'url'=>'machine/c7x0',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Spitz',
- 'url'=>'machine/spitz',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Akita',
- 'url'=>'machine/akita',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Akita upgrades',
- 'url'=>'upgrades/machine/akita',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'C7x0 upgrades',
- 'url'=>'upgrades/machine/c7x0',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Spitz upgrades',
- 'url'=>'upgrades/machine/spitz',
- 'type'=>'upgrades',
- )
- )
- )
-);
+ array(
+ 'name'=>'All architectures',
+ 'url'=>'all',
+ ),
+ array(
+ 'name'=>'avr32 base',
+ 'url'=>'avr32/base',
+ ),
+ array(
+ 'name'=>'blackfin base',
+ 'url'=>'blackfin/base',
+ ),
+ array(
+ 'name'=>'armv5te base',
+ 'url'=>'armv5te/base',
+ ),
+ array(
+ 'name'=>'iwmmxt base',
+ 'url'=>'iwmmxt/base',
+ ),
+ array(
+ 'name'=>'armv5teb base',
+ 'url'=>'armv5teb/base',
+ ),
+ array(
+ 'name'=>'arm-oabi base',
+ 'url'=>'arm-oabi/base',
+ ),
-$ipkpath = "/var/www/angstrom/unstable/feed/unsorted";
-$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc');
-$device_archs = array(
- "a1200" => "armv5te",
- "a780"=> "armv5te",
- "acern30",
- "adsp-bf537-stamp" => "bfin",
- "adzs-bf538f-ezlite" => "bfin",
- "akita" => "armv5te",
- "alix",
- "amsdelta",
- "asus620",
- "asus730",
- "at32stk1000" => "avr32",
- "at91sam9260ek" => "armv5te",
- "at91sam9261ek" => "armv5te",
- "at91sam9263ek" => "armv5te",
- "atngw100" => "avr32",
- "aximx50" => "armv5te",
- "aximx50v" => "armv5te",
- "borzoi" => "armv5te",
- "boxer" => "armv5te",
- "c7x0" => "armv5te",
- "colinux",
- "collie",
- "compulab-pxa270" => "armv5te",
- "corgi" => "armv5te",
- "davinci-dvevm",
- "db1200",
- "devkitidp-pxa255" => "armv5te",
- "dht-walnut" => "ppc405",
- "e680" => "armv5te",
- "efika" => "ppc603e",
- "ep93xx" => "armv4t",
- "epia",
- "er0100" => "armv5te",
- "eteng500" => "armv5te",
- "fic-gta01" => "armv4t",
- "fic-gta02" => "armv4t",
- "fsg3be",
- "geodegx",
- "geodelx",
- "guinness",
- "gumstix-connex" => "armv5te",
- "gumstix-verdex" => "armv5te",
- "h1910",
- "h1940",
- "h2200" => "armv5te",
- "h3600" => "arm-oabi",
- "h3800" => "arm-oabi",
- "h3900" => "armv5te",
- "h4000" => "armv5te",
- "h5000" => "armv5te",
- "h6300" => "armv4t",
- "htcalpine",
- "htcapache",
- "htcblueangel",
- "htchimalaya",
- "htcsable",
- "htctornado",
- "htcuniversal" => "armv5te",
- "htcwallaby",
- "husky" => "armv5te",
- "hx2000" => "armv5te",
- "hx4700" => "armv5te",
- "i586-generic" => "i586",
- "i686-generic" => "i586",
- "ixp4xx",
- "ixp4xxbe" => "armv5teb",
- "ixp4xxle" => "armv5te",
- "jornada56x",
- "jornada6xx",
- "jornada7xx",
- "kb9202" => "armv4t",
- "ks8695",
- "lite5200",
- "logicpd-pxa270" => "armv5te",
- "looxc550",
- "lsarm",
- "lsppchd",
- "lsppchg",
- "magicbox",
- "magician" => "armv5te",
- "mainstone" => "armv5te",
- "mnci",
- "mtx-1",
- "mtx-2",
- "mtx-3",
- "mtx-3a",
- "mx21ads" => "armv5te",
- "mx31ads" => "armv6",
- "n2100",
- "native",
- "navman-icn330",
- "netbook-pro" => "armv5te",
- "netvista",
- "nokia770" => "armv5te",
- "nokia800",
- "nslu2" => "armv5te",
- "nslu2be" => "armv5teb",
- "nslu2le" => "armv5te",
- "omap1510inn" => "armv5te",
- "omap1610h2" => "armv5te",
- "omap1710h3" => "armv5te",
- "omap2420h4",
- "omap2430sdp",
- "omap5912osk" => "armv5te",
- "palmld" => "armv5te",
- "palmt650" => "armv5te",
- "palmt680",
- "palmtc",
- "palmtt",
- "palmtt2",
- "palmtt3",
- "palmtt5",
- "palmtx",
- "palmz31",
- "palmz71",
- "palmz72",
- "poodle" => "armv5te",
- "progear",
- "qemuarm" => "armv5te",
- "qemux86",
- "rb500",
- "rokre2" => "armv5te",
- "rokre6" => "armv5te",
- "rt3000",
- "rx1950",
- "rx3000",
- "sarge-at91" => "armv4t",
- "sequoia",
- "shark" => "arm-oabi",
- "shepherd" => "armv5te",
- "simpad" => "arm-oabi",
- "smdk2440" => "armv4t",
- "smdk2443" => "armv4t",
- "spitz" => "armv5te",
- "storcenter",
- "sun4cdm",
- "terrier" => "armv5te",
- "titan",
- "tosa" => "armv5te",
- "triton",
- "ts72xx",
- "turbostation",
- "wgt634u",
- "wl500g",
- "wrap",
- "wrt54",
- "x86-32-nocona",
- "x86-prescott",
- "x86-uml",
- "x86",
- "xilinx-ml403",
- "xilinx-ml410",
- "xxs1500",
- );
+ array(
+ 'name'=>'i586 base',
+ 'url'=>'i586/base',
+ ),
+ array(
+ 'name'=>'i686 base',
+ 'url'=>'i686/base',
+ ),
+ array(
+ 'name'=>'armv4t base',
+ 'url'=>'armv4t/base',
+ ),
+ array(
+ 'name'=>'armv6 base',
+ 'url'=>'armv6/base',
+ ),
+ array(
+ 'name'=>'ppc603e base',
+ 'url'=>'ppc603e/base',
+ ),
+ array(
+ 'name'=>'ppc405 base',
+ 'url'=>'ppc405/base',
+ ),
+
+ array(
+ 'name'=>'armv5te perl',
+ 'url'=>'armv5te/perl',
+ ),
+ array(
+ 'name'=>'armv5te python',
+ 'url'=>'armv5te/python',
+ ),
+ array(
+ 'name'=>'armv5te debug',
+ 'url'=>'armv5te/debug',
+ ),
+ array(
+ 'name'=>'armv5te gstreamer',
+ 'url'=>'armv5te/gstreamer',
+ ),
+ array(
+ 'name'=>'avr32 perl',
+ 'url'=>'avr32/perl',
+ ),
+ array(
+ 'name'=>'avr32 python',
+ 'url'=>'avr32/python',
+ ),
+ array(
+ 'name'=>'avr32 debug',
+ 'url'=>'avr32/debug',
+ ),
+ array(
+ 'name'=>'avr32 gstreamer',
+ 'url'=>'avr32/gstreamer',
+ ),
+
+ array(
+ 'name'=>'blackfin perl',
+ 'url'=>'blackfin/perl',
+ ),
+ array(
+ 'name'=>'blackfin python',
+ 'url'=>'blackfin/python',
+ ),
+ array(
+ 'name'=>'blackfin debug',
+ 'url'=>'blackfin/debug',
+ ),
+ array(
+ 'name'=>'blackfin gstreamer',
+ 'url'=>'blackfin/gstreamer',
+ ),
+ array(
+ 'name'=>'armv4t perl',
+ 'url'=>'armv4t/perl',
+ ),
+ array(
+ 'name'=>'armv4t python',
+ 'url'=>'armv4t/python',
+ ),
+ array(
+ 'name'=>'armv4t debug',
+ 'url'=>'armv4t/debug',
+ ),
+ array(
+ 'name'=>'armv4t gstreamer',
+ 'url'=>'armv4t/gstreamer',
+ ),
+
+ array(
+ 'name'=>'armv6 perl',
+ 'url'=>'armv6/perl',
+ ),
+ array(
+ 'name'=>'armv6 python',
+ 'url'=>'armv6/python',
+ ),
+ array(
+ 'name'=>'armv6 debug',
+ 'url'=>'armv6/debug',
+ ),
+ array(
+ 'name'=>'armv6 gstreamer',
+ 'url'=>'armv6/gstreamer',
+ ),
+
+ array(
+ 'name'=>'i686 perl',
+ 'url'=>'i686/perl',
+ ),
+ array(
+ 'name'=>'i686 python',
+ 'url'=>'i686/python',
+ ),
+ array(
+ 'name'=>'i686 debug',
+ 'url'=>'i686/debug',
+ ),
+ array(
+ 'name'=>'i686 gstreamer',
+ 'url'=>'i686/gstreamer',
+ ),
+ array(
+ 'name'=>'ppc603e perl',
+ 'url'=>'ppc603e/perl',
+ ),
+ array(
+ 'name'=>'ppc603e python',
+ 'url'=>'ppc603e/python',
+ ),
+ array(
+ 'name'=>'ppc603e debug',
+ 'url'=>'ppc603e/debug',
+ ),
+ array(
+ 'name'=>'ppc603e gstreamer',
+ 'url'=>'ppc603e/gstreamer',
+ ),
+
+ array(
+ 'name'=>'Motorola A780',
+ 'url'=>'armv5te/machine/a780',
+ ),
+ array(
+ 'name'=>'HP iPAQ h2200',
+ 'url'=>'armv5te/machine/h2200',
+ ),
+
+ array(
+ 'name'=>'HP iPAQ h4000',
+ 'url'=>'armv5te/machine/h4000',
+ ),
+
+ array(
+ 'name'=>'HTC universal/ iMate jasjar',
+ 'url'=>'armv5te/machine/htcuniversal',
+ ),
+ array(
+ 'name'=>'HP iPAQ hx4700',
+ 'url'=>'armv5te/machine/hx4700',
+ ),
+ array(
+ 'name'=>'HP iPAQ hx2000 series',
+ 'url'=>'armv5te/machine/hx2000',
+ ),
+
+ array(
+ 'name'=>'Psion Teklogix NetBook Pro',
+ 'url'=>'armv5te/machine/netbook-pro',
+ ),
+ array(
+ 'name'=>'HTC Magician',
+ 'url'=>'armv5te/machine/magician',
+ ),
+ array(
+ 'name'=>'Nokia 770 internet tablet',
+ 'url'=>'armv5te/machine/nokia770',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus 5600 (Poodle)',
+ 'url'=>'armv5te/machine/poodle',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus c7x0 (Corgi, Boxer, Husky, Shepher)',
+ 'url'=>'armv5te/machine/c7x0',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus SL-C1000 (akita)',
+ 'url'=>'armv5te/machine/akita',
+ ),
+ array(
+ 'name'=>'HP iPAQ h5xxx series',
+ 'url'=>'armv5te/machine/h5xxx',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus SL-C6000 (Tosa)',
+ 'url'=>'armv5te/machine/tosa',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus SL-C3xxx (Spitz, Borzoi, Terrier)',
+ 'url'=>'armv5te/machine/spitz',
+ ),
+ array(
+ 'name'=>'Cirrus Logic ep93xx boards',
+ 'url'=>'armv4t/machine/ep93xx',
+ ),
+ array(
+ 'name'=>'FIC gta01/Neo1973 phone',
+ 'url'=>'armv4t/machine/fic-gta01',
+ ),
+
+ array(
+ 'name'=>'HP iPAQ h6300',
+ 'url'=>'armv4t/machine/h6300',
+ ),
+ array(
+ 'name'=>'Freescale i.mx31 ADS development board',
+ 'url'=>'armv6/machine/mx31ads',
+ ),
+
+ array(
+ 'name'=>'Tyan thunder K7 s2462 mainboard (guinness)',
+ 'url'=>'i686/machine/guinness',
+ ),
+ array(
+ 'name'=>'Progear webpad',
+ 'url'=>'i686/machine/progear',
+ ),
+ array(
+ 'name'=>'Genesi Efika',
+ 'url'=>'ppc603e/machine/efika',
+ ),
+
+ )// end distro[feeds]
+ ), //end distro
+ array(
+ 'distro_name'=>'Ångström',
+ 'distro_version'=>'2007.12',
+ 'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2007/ipk/glibc/',
+ 'feeds'=>
+ array(
+ array(
+ 'name'=>'noarch feed',
+ 'url'=>'all',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture base feed',
+ 'url'=>'arm-oabi/base',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture gstreamer feed',
+ 'url'=>'arm-oabi/gstreamer',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture perl feed',
+ 'url'=>'arm-oabi/perl',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture python feed',
+ 'url'=>'arm-oabi/python',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture debug feed',
+ 'url'=>'arm-oabi/debug',
+ ),
+ array(
+ 'name'=>'armv4t architecture base feed',
+ 'url'=>'armv4t/base',
+ ),
+ array(
+ 'name'=>'armv4t architecture gstreamer feed',
+ 'url'=>'armv4t/gstreamer',
+ ),
+ array(
+ 'name'=>'armv4t architecture perl feed',
+ 'url'=>'armv4t/perl',
+ ),
+ array(
+ 'name'=>'armv4t architecture python feed',
+ 'url'=>'armv4t/python',
+ ),
+ array(
+ 'name'=>'armv4t architecture debug feed',
+ 'url'=>'armv4t/debug',
+ ),
+ array(
+ 'name'=>'armv5te architecture base feed',
+ 'url'=>'armv5te/base',
+ ),
+ array(
+ 'name'=>'armv5te architecture gstreamer feed',
+ 'url'=>'armv5te/gstreamer',
+ ),
+ array(
+ 'name'=>'armv5te architecture perl feed',
+ 'url'=>'armv5te/perl',
+ ),
+ array(
+ 'name'=>'armv5te architecture python feed',
+ 'url'=>'armv5te/python',
+ ),
+ array(
+ 'name'=>'armv5te architecture debug feed',
+ 'url'=>'armv5te/debug',
+ ),
+ array(
+ 'name'=>'armv5teb architecture base feed',
+ 'url'=>'armv5teb/base',
+ ),
+ array(
+ 'name'=>'armv5teb architecture gstreamer feed',
+ 'url'=>'armv5teb/gstreamer',
+ ),
+ array(
+ 'name'=>'armv5teb architecture perl feed',
+ 'url'=>'armv5teb/perl',
+ ),
+ array(
+ 'name'=>'armv5teb architecture python feed',
+ 'url'=>'armv5teb/python',
+ ),
+ array(
+ 'name'=>'armv5teb architecture debug feed',
+ 'url'=>'armv5teb/debug',
+ ),
+ array(
+ 'name'=>'armv6 architecture base feed',
+ 'url'=>'armv6/base',
+ ),
+ array(
+ 'name'=>'armv6 architecture gstreamer feed',
+ 'url'=>'armv6/gstreamer',
+ ),
+ array(
+ 'name'=>'armv6 architecture perl feed',
+ 'url'=>'armv6/perl',
+ ),
+ array(
+ 'name'=>'armv6 architecture python feed',
+ 'url'=>'armv6/python',
+ ),
+ array(
+ 'name'=>'armv6 architecture debug feed',
+ 'url'=>'armv6/debug',
+ ),
+ array(
+ 'name'=>'i486 architecture base feed',
+ 'url'=>'i486/base',
+ ),
+ array(
+ 'name'=>'i486 architecture gstreamer feed',
+ 'url'=>'i486/gstreamer',
+ ),
+ array(
+ 'name'%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re41398d20c55fd8c83bc62b4900cf81ad587f19a -r3e3e64c7187462ff0792e72f0fc7ffaa964aff0c
#
#
#
# delete "packages/speechd"
#
# delete "packages/speechd/speechd_0.56.bb"
#
# rename "packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb"
# to "packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb"
#
# rename "packages/gpsd/gpsd_2.34.bb"
# to "packages/gpsd/gpsd_2.36.bb"
#
# rename "packages/qpegps/qpegps_0.9.3.bb"
# to "packages/qpegps/qpegps_0.9.3.1.bb"
#
# add_dir "packages/dbus/dbus-1.1.1"
#
# add_dir "packages/dotconf"
#
# add_dir "packages/dotconf/files"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc6"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek"
#
# add_dir "packages/sgmlspl"
#
# add_dir "packages/sgmlspl/files"
#
# add_dir "packages/speech-dispatcher"
#
# add_dir "packages/speech-dispatcher/files"
#
# add_dir "packages/util-linux-ng"
#
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
# content [f09fc00fcb956472364428627b653deb21fa27ae]
#
# add_file "conf/machine/gesbc-9302.conf"
# content [dc5cebcd4e8515d7e65c4053f016747909663f28]
#
# add_file "packages/dbus/dbus-1.1.1/cross.patch"
# content [8893afa8766367ecce4e78b1bbede8c7e4781336]
#
# add_file "packages/dbus/dbus-1.1.1/dbus-1.init"
# content [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
#
# add_file "packages/dbus/dbus-1.1.1/fix-install-daemon.patch"
# content [a130a0f9e1442b0848f09d45516d4c1fae678502]
#
# add_file "packages/dbus/dbus-1.1.1/tmpdir.patch"
# content [074f93acba96cb165a3d21cac74b5fdfaae98fc8]
#
# add_file "packages/dbus/dbus-native_1.1.1.bb"
# content [6b8c402959c6434e289e34eae91e9e615a2ddf77]
#
# add_file "packages/dbus/dbus_1.1.1.bb"
# content [8067523daef0e32a078d9ed9d83ac3254616dcc5]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb"
# content [8af8a43ede5d17504c520bf8d4329c50aeb479f1]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb"
# content [e8096a2fc94fd8c1d952962f9e9a3172902171fb]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc"
# content [01a0574c4b3118881ffd717a2614da49aad139af]
#
# add_file "packages/dotconf/dotconf_1.0.13.bb"
# content [e67a233b6b36af1e1166969497a8065fc964af7b]
#
# add_file "packages/dotconf/files/srcMakefile.am_00.patch"
# content [7cf891b5ee3b478c01d747bf23bb96cf877712cc]
#
# add_file "packages/gpsd/gpsd_2.34.bb"
# content [8e241bbd828101019cda7b30a6725fd6759f50f4]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch"
# content [ab4bd36055349047026603f7f1035fe82b99c6e6]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig"
# content [9dd09f9d70607d6a484fe477d1ad29e3da5382a9]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch"
# content [707e51aa6cd3708350eac84d75dac92c331ebcb6]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch"
# content [1c329717e813ec3539ae5ede3b9e483408c66fe5]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig"
# content [4a6da18c95a3d28a7e9e1d26bdcb8e1f265a4078]
#
# add_file "packages/linux/linux_2.6.23+2.6.24-rc6.bb"
# content [484f320fd5570d9501196799d9d68a36d909f36f]
#
# add_file "packages/navit/files/navit.desktop"
# content [abe450116dc6bb7263347dd948f736d0e612f95e]
#
# add_file "packages/ntpclient/ntpclient_2007_365.bb"
# content [d5bc8f8a34db32961a6955ff40660c464bbc2d5c]
#
# add_file "packages/qpegps/qpegps_svn.bb"
# content [33113854f73f3efe09ce78ca8f3ff118170d1365]
#
# add_file "packages/sgmlspl/files/combined.patch"
# content [4ca5a624cdcc66efa1d3aa936c8a9a116486d189]
#
# add_file "packages/sgmlspl/sgmlspl-native_1.03ii.bb"
# content [d31e81ad7221fd62d1b0de0b029adda659ed88a2]
#
# add_file "packages/speech-dispatcher/files/srcMakefile.am.patch"
# content [7c2fd881a766fc549324acfbb465e7c40a936749]
#
# add_file "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# content [990e0945a62343c1db6ea8b85b8b82ce5e35151c]
#
# add_file "packages/util-linux-ng/util-linux-ng.inc"
# content [5cc612853b6855e2f4df6b91f5f06801c6b029aa]
#
# add_file "packages/util-linux-ng/util-linux-ng_2.13.1.bb"
# content [506c0f835de96a1c5623a992679b614ef4a4555f]
#
# patch "MAINTAINERS"
# from [4feb68bdd9be0d74c5e83609ed81cdb2f0e33169]
# to [8be8b1832f42218d3cc6ae809b61dc80fcd70003]
#
# patch "classes/base.bbclass"
# from [5efb30de935081fe56703b6432d636a3668d4823]
# to [d034cdab57388cbe9087fb1c8dfd47a162e139de]
#
# patch "classes/sanity.bbclass"
# from [a81f2a3b9cc1e0daf9c88d6874dd369ef2c660b5]
# to [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [782e80b0f3b3076866c7a3507276ad9f24f91bc4]
# to [b63adaffd19f973e76be44bc0544e96ff3e9c602]
#
# patch "packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb"
# from [dc639dcc8d259f0b47f5c3350b926cc213ffe48f]
# to [1fc1597723f6cd7f859c6ab5cb7cd2829205a052]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# from [1a0a22dd392f60cedcc86e8ef30f293786d3ebc9]
# to [a71a90f95c1e63d6e70e783d56e0e3d756600f16]
#
# patch "packages/gpsd/gpsd.inc"
# from [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
# to [91e167633095484f711ff118e87bf2839f7105b2]
#
# patch "packages/gpsd/gpsd_2.36.bb"
# from [8e241bbd828101019cda7b30a6725fd6759f50f4]
# to [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
# from [09d7ed3a857d79fd98b743e6eb0e827e353a6ada]
# to [d11e4161fb755938b4e6bae34a26fbc99e3c8005]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [cae2b6640f80fb88e382ef42fd697c013b99999d]
# to [08d45cd12fcab8632fad9c0dd6c9a29f3e37ca2b]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [13ddabf2aeaf44b5315cb84028c6cae9a8168953]
# to [8cef3230be1ba924b6e2c80492f1092a17566910]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [45cadbb58c918bee75079075b7ef9d209507941e]
# to [bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0]
#
# patch "packages/navit/navit_cvs.bb"
# from [68ae9f449982f15699c5e966c7d4cd4b8ccd2f73]
# to [537deb351fc223dc40a33d489f2edf10bd7f67dd]
#
# patch "packages/qemu/qemu-gcc3-check.inc"
# from [ab9405e1e7f0697d39ad932818e4d113c0fbd3ea]
# to [d7b22bce39e0bfb99c296b0873ef8d1dea0d0aff]
#
# patch "packages/qpegps/files/qpegps.desktop"
# from [8731bc5f8a74df0ba973c2a98cca70e1a012548d]
# to [999f00fdc94912b39cda6b2f18139013ad019af7]
#
# patch "packages/qpegps/qpegps.inc"
# from [3da7e58c9eb26df021729878d8d0e46ebe5513ff]
# to [ad06c195bd677200966728bcf93101e47b96eeb8]
#
# patch "packages/qpegps/qpegps_0.9.3.1.bb"
# from [5ed209f056be5ae98b7ed0041ffdc771e271b7be]
# to [94d58e717e493f06eaeb86303f48c0952d98b097]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
@@ -0,0 +1 @@
+PREFERRED_VERSION_vte = "0.16.10"
============================================================
--- conf/machine/gesbc-9302.conf dc5cebcd4e8515d7e65c4053f016747909663f28
+++ conf/machine/gesbc-9302.conf dc5cebcd4e8515d7e65c4053f016747909663f28
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Glomation GESBC-9302 single board computer
+#@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "57600 ttyAM0"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+#extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
+
+#tune for ep93xx cpus
+#can be used for crunch support later on
+#require conf/machine/include/tune-ep9312.inc
+
+require conf/machine/include/tune-arm920t.inc
+
============================================================
--- packages/dbus/dbus-1.1.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
+++ packages/dbus/dbus-1.1.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
@@ -0,0 +1,10 @@
+--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+ exit (0);
+ ]])],
+ [ac_cv_have_abstract_sockets=yes],
++ [ac_cv_have_abstract_sockets=no],
+ [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
============================================================
--- packages/dbus/dbus-1.1.1/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
+++ packages/dbus/dbus-1.1.1/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
@@ -0,0 +1,110 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters at debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+ . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ echo "$DESC already started; not starting."
+ else
+ echo "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+
+ if [ ! -d $UUIDDIR ]; then
+ mkdir -p $UUIDDIR
+ chown $DAEMONUSER $UUIDDIR
+ chgrp $DAEMONUSER $UUIDDIR
+ fi
+
+ dbus-uuidgen --ensure
+
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ if [ -d $EVENTDIR ]; then
+ run-parts --arg=start $EVENTDIR
+ fi
+}
+
+shut_it_down()
+{
+ if [ -d $EVENTDIR ]; then
+ # TODO: --reverse when busybox supports it
+ run-parts --arg=stop $EVENTDIR
+ fi
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ rm -f $PIDFILE
+}
+
+reload_it()
+{
+ echo -n "Reloading $DESC config: "
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ # hopefully this is enough time for dbus to reload it's config file.
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/dbus/dbus-1.1.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
+++ packages/dbus/dbus-1.1.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ fi
+- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
============================================================
--- packages/dbus/dbus-1.1.1/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
+++ packages/dbus/dbus-1.1.1/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
@@ -0,0 +1,30 @@
+--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+- DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+- DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+- DEFAULT_SOCKET_DIR=$TMP
+-else
+- DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++# DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++# DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++# DEFAULT_SOCKET_DIR=$TMP
++#else
++# DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+
+ if ! test -z "$with_test_socket_dir" ; then
+ TEST_SOCKET_DIR="$with_test_socket_dir"
============================================================
--- packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
+++ packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
@@ -0,0 +1,31 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+SECTION = "base"
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ "
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-${PV}"
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+ --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+ oe_runmake install
+ autotools_stage_all
+
+ # for dbus-glib-native introspection generation
+ install -d ${STAGING_DATADIR}/dbus
+ install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
============================================================
--- packages/dbus/dbus_1.1.1.bb 8067523daef0e32a078d9ed9d83ac3254616dcc5
+++ packages/dbus/dbus_1.1.1.bb 8067523daef0e32a078d9ed9d83ac3254616dcc5
@@ -0,0 +1,63 @@
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "base"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+PR = "r3"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init \
+ file://cross.patch;patch=1 \
+ file://fix-install-daemon.patch;patch=1"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+ --disable-doxygen-docs --with-xml=expat --without-x"
+
+d%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list