diff options
35 files changed, 1040 insertions, 469 deletions
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 6d3ad7bd6b..25b07e0038 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe" DISTRO_NAME = "AmsDelta Linux" DISTRO_VERSION = "unstable-${DATE}" -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf DISTRO_TYPE = "debug" diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2007.1-legacy.conf index 298c8589e3..358ed06cf2 100644 --- a/conf/distro/angstrom-2007.1-legacy.conf +++ b/conf/distro/angstrom-2007.1-legacy.conf @@ -4,6 +4,6 @@ # * no sysfs # * no EABI for ARM -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf # We'll have to fill this in as we go. diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ff7636e686..d833fe922f 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -6,11 +6,15 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> #@-------------------------------------------------------------------- -# This is a testbed for unstable and/or untested things, while angstrom-2007.1 -# is aiming for stability and a release. +# This is a aimed to be the next stable angstrom release. +# If you want something stable *right now*, use angstrom-2007.1 +# with the org.openembedded.angstrom-2007.12-stable branch +# # Use this at your own risk, we welcome bugreports filed at # http://bugs.openembedded.org -# In doubt, use DISTRO="angstrom-2007.1" +# +# Again, in doubt, use DISTRO="angstrom-2007.1" with the +# org.openembedded.angstrom-2007.12-stable branch #DISTRO_VERSION = "2008.1" DISTRO_VERSION = "2008.1-test-${DATE}" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 234c92f62a..fe079db92d 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -8,7 +8,7 @@ FOONAS_MODE ?= "glibc" ANGSTROM_MODE = ${FOONAS_MODE} -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf DISTRO = "foonas" DISTRO_NAME = "foonas" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/include/angstrom-2007-for-openmoko.inc index 380c882c2c..380c882c2c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index 2c039dbcce..d68a03fa2b 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -6,7 +6,7 @@ #@-------------------------------------------------------------------- # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf DISTRO = "mokoslug" DISTRO_NAME = "MokoSlug" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index f2007c231f..e3ddd2165b 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform #----------------------------------------------------------------------------- -require conf/distro/angstrom-2007.1.conf +require conf/distro/include/angstrom-2007-for-openmoko.inc # # Header diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 3c0bda25fe..2f882450c8 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -1,6 +1,6 @@ #!/bin/bash -DO_UCLIBC=0 +DO_UCLIBC=1 do_build() { echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf @@ -20,6 +20,12 @@ do_build() { then BUILD_MODE="uclibc" echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf + + if [ "$BUILD_CLEAN" != "" ] + then + bitbake -c clean $BUILD_CLEAN + fi + for target in $BUILD_TARGETS do bitbake $target && do_report_success @@ -43,7 +49,7 @@ do_report_success() { # No graphics -for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk +for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross base-files" diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index c4a9fc0fc3..c2414b8013 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -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', + ), + + 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', + ), -$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'=>'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'=>'i486 architecture perl feed', + 'url'=>'i486/perl', + ), + array( + 'name'=>'i486 architecture python feed', + 'url'=>'i486/python', + ), + array( + 'name'=>'i486 architecture debug feed', + 'url'=>'i486/debug', + ), + array( + 'name'=>'i586 architecture base feed', + 'url'=>'i586/base', + ), + array( + 'name'=>'i586 architecture gstreamer feed', + 'url'=>'i586/gstreamer', + ), + array( + 'name'=>'i586 architecture perl feed', + 'url'=>'i586/perl', + ), + array( + 'name'=>'i586 architecture python feed', + 'url'=>'i586/python', + ), + array( + 'name'=>'i586 architecture debug feed', + 'url'=>'i586/debug', + ), + array( + 'name'=>'i686 architecture base feed', + 'url'=>'i686/base', + ), + array( + 'name'=>'i686 architecture gstreamer feed', + 'url'=>'i686/gstreamer', + ), + array( + 'name'=>'i686 architecture perl feed', + 'url'=>'i686/perl', + ), + array( + 'name'=>'i686 architecture python feed', + 'url'=>'i686/python', + ), + array( + 'name'=>'i686 architecture debug feed', + 'url'=>'i686/debug', + ), + array( + 'name'=>'iwmmxt architecture base feed', + 'url'=>'iwmmxt/base', + ), + array( + 'name'=>'iwmmxt architecture gstreamer feed', + 'url'=>'iwmmxt/gstreamer', + ), + array( + 'name'=>'iwmmxt architecture perl feed', + 'url'=>'iwmmxt/perl', + ), + array( + 'name'=>'iwmmxt architecture python feed', + 'url'=>'iwmmxt/python', + ), + array( + 'name'=>'iwmmxt architecture debug feed', + 'url'=>'iwmmxt/debug', + ), + array( + 'name'=>'ppc405 architecture base feed', + 'url'=>'ppc405/base', + ), + array( + 'name'=>'ppc405 architecture gstreamer feed', + 'url'=>'ppc405/gstreamer', + ), + array( + 'name'=>'ppc405 architecture perl feed', + 'url'=>'ppc405/perl', + ), + array( + 'name'=>'ppc405 architecture python feed', + 'url'=>'ppc405/python', + ), + array( + 'name'=>'ppc405 architecture debug feed', + 'url'=>'ppc405/debug', + ), + array( + 'name'=>'ppc603e architecture base feed', + 'url'=>'ppc603e/base', + ), + array( + 'name'=>'ppc603e architecture gstreamer feed', + 'url'=>'ppc603e/gstreamer', + ), + array( + 'name'=>'ppc603e architecture perl feed', + 'url'=>'ppc603e/perl', + ), + array( + 'name'=>'ppc603e architecture python feed', + 'url'=>'ppc603e/python', + ), + array( + 'name'=>'ppc603e architecture debug feed', + 'url'=>'ppc603e/debug', + ) + ) // end distro['feeds'] + ), //end distro + array( + 'distro_name'=>'Ångström', + 'distro_version'=>'2008.6', + 'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2008/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'=>'i486 architecture perl feed', + 'url'=>'i486/perl', + ), + array( + 'name'=>'i486 architecture python feed', + 'url'=>'i486/python', + ), + array( + 'name'=>'i486 architecture debug feed', + 'url'=>'i486/debug', + ), + array( + 'name'=>'i586 architecture base feed', + 'url'=>'i586/base', + ), + array( + 'name'=>'i586 architecture gstreamer feed', + 'url'=>'i586/gstreamer', + ), + array( + 'name'=>'i586 architecture perl feed', + 'url'=>'i586/perl', + ), + array( + 'name'=>'i586 architecture python feed', + 'url'=>'i586/python', + ), + array( + 'name'=>'i586 architecture debug feed', + 'url'=>'i586/debug', + ), + array( + 'name'=>'i686 architecture base feed', + 'url'=>'i686/base', + ), + array( + 'name'=>'i686 architecture gstreamer feed', + 'url'=>'i686/gstreamer', + ), + array( + 'name'=>'i686 architecture perl feed', + 'url'=>'i686/perl', + ), + array( + 'name'=>'i686 architecture python feed', + 'url'=>'i686/python', + ), + array( + 'name'=>'i686 architecture debug feed', + 'url'=>'i686/debug', + ), + array( + 'name'=>'iwmmxt architecture base feed', + 'url'=>'iwmmxt/base', + ), + array( + 'name'=>'iwmmxt architecture gstreamer feed', + 'url'=>'iwmmxt/gstreamer', + ), + array( + 'name'=>'iwmmxt architecture perl feed', + 'url'=>'iwmmxt/perl', + ), + array( + 'name'=>'iwmmxt architecture python feed', + 'url'=>'iwmmxt/python', + ), + array( + 'name'=>'iwmmxt architecture debug feed', + 'url'=>'iwmmxt/debug', + ), + array( + 'name'=>'ppc405 architecture base feed', + 'url'=>'ppc405/base', + ), + array( + 'name'=>'ppc405 architecture gstreamer feed', + 'url'=>'ppc405/gstreamer', + ), + array( + 'name'=>'ppc405 architecture perl feed', + 'url'=>'ppc405/perl', + ), + array( + 'name'=>'ppc405 architecture python feed', + 'url'=>'ppc405/python', + ), + array( + 'name'=>'ppc405 architecture debug feed', + 'url'=>'ppc405/debug', + ), + array( + 'name'=>'ppc603e architecture base feed', + 'url'=>'ppc603e/base', + ), + array( + 'name'=>'ppc603e architecture gstreamer feed', + 'url'=>'ppc603e/gstreamer', + ), + array( + 'name'=>'ppc603e architecture perl feed', + 'url'=>'ppc603e/perl', + ), + array( + 'name'=>'ppc603e architecture python feed', + 'url'=>'ppc603e/python', + ), + array( + 'name'=>'ppc603e architecture debug feed', + 'url'=>'ppc603e/debug', + ) + )// end distro[feeds]s + )// end distro + ); //end $feeds +?> diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index 53317ebb03..98751ea26c 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -46,9 +46,15 @@ if(!check_database()) $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds"); -if($argc > 1 AND $argv[1] == 'upgrades') +if($argc == 2) { - $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'"); + $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_uri = '${argv[1]}'"); +} else if ($argc == 3 && $argv[1] == "--type") { + $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = '${argv[2]}'"); +} + +if (!$feeds) { + die("Cannot find feed(s) in the DB\n"); } $start = time(); diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index e8e9e7c4a8..ae03d00e05 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" PR = "r5" -DEPENDS = "expat libdaemon dbus glib-2.0" +DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0" # uclibc has no nss RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" @@ -22,10 +22,14 @@ inherit autotools pkgconfig update-rc.d RDEPENDS_append = "" # TODO: build and enable all the extra stuff avahi offers -EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" +EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" AVAHI_PYTHON = "--disable-python" AVAHI_GTK = "--disable-gtk" +LDFLAGS_append_linux-uclibc = " -lintl" +LDFLAGS_append_linux-uclibcgnueabi = " -lintl " +LDFLAGS_append_uclinux-uclibc = " -lintl" + PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" diff --git a/packages/dotconf/dotconf_1.0.13.bb b/packages/dotconf/dotconf_1.0.13.bb deleted file mode 100644 index 332cba9bfa..0000000000 --- a/packages/dotconf/dotconf_1.0.13.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parser library" -HOMEPAGE = "http://www.azzit.de/dotconf/" -LICENSE = "LGPLv2" - -PR = "r0" - -inherit autotools - -SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/${PN}-${PV}.tar.gz \ - file://srcMakefile.am_00.patch;patch=1" - -do_stage () { - install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/ - oe_libinstall -C src -a -so libdotconf ${STAGING_LIBDIR}/ -} diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index 4f6f62bb12..91a391975f 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -1,10 +1,12 @@ require e2fsprogs.inc -PR = "r10" +PR = "r11" SRC_URI += "file://no-hardlinks.patch;patch=1" -EXTRA_OECONF += " --sbindir=${base_sbindir}" +EXTRA_OECONF += " --sbindir=${base_sbindir} \ + --disable-nls \ + " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/packages/dotconf/.mtn2git_empty b/packages/espeak/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dotconf/.mtn2git_empty +++ b/packages/espeak/.mtn2git_empty diff --git a/packages/espeak/espeak_1.30.bb b/packages/espeak/espeak_1.30.bb new file mode 100644 index 0000000000..03290d0aa2 --- /dev/null +++ b/packages/espeak/espeak_1.30.bb @@ -0,0 +1,46 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2008 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: espeak_1.30.bb +# Date: 20080104 (YMD) + +DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" +SECTION = "base" +LICENSE = "GPL" + +DEPENDS = "portaudio-v19" + +###################################################################################### + +PR = "r0" + +SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip" + +S = "${WORKDIR}/${PN}-${PV}-source" + +FILES_${PN} += " /usr/share/espeak-data/ " + +do_configure() { + # espeak supports portaudio in APIs V18 and V19 + cp ${S}/src/portaudio19.h ${S}/src/portaudio.h +} + +do_compile() { + cd src + oe_runmake +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${libdir} + install -d ${D}${includedir} + install -d ${D}/usr/share/espeak-data + + install -m 0755 ${S}/src/espeak ${D}${bindir} + oe_libinstall -so -C src libespeak ${D}${libdir} + + cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data +} diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 960db30b56..2184b8c863 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -PR = "r6" +PR = "r7" PROVIDES = "virtual/libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ @@ -28,6 +28,20 @@ do_configure_prepend() { install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/ } +# these lack the .x behind the .so, but shouldn't be in the -dev package +# Otherwise you get the following results: +# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# because gettext depends on gettext-dev, which pulls in more -dev packages: +# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk +# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk +# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk +# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk + +PACKAGES =+ "libgettextlib libgettextsrc" +FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" +FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" + do_stage () { autotools_stage_includes oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/ diff --git a/packages/gpsd/files/fic-gta01/gps-hardware b/packages/gpsd/files/fic-gta01/gps-hardware new file mode 100644 index 0000000000..6490f52c27 --- /dev/null +++ b/packages/gpsd/files/fic-gta01/gps-hardware @@ -0,0 +1,41 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2008 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: gps-hardware +# Date: 20080103 (YMD) +# +################################################################################# +# +# 20080103 - v0.0.1 - Initial release + +if ! test -e /home/root/gllin/gllin +then + echo -e "\n\ngllin GPS driver for Neo1973 not found," + echo "please install the gllin package from" + echo "http://3rdparty.downloads.openmoko.org/gllin/" + echo "" + exit 1 +fi + + +do_start() { + /home/root/gllin/gllin >/var/log/gllin.log 2>&1 & + sleep 1 +} + +do_stop() { + gllin_PIDs="`ps ax | grep "/home/root/gllin" | grep -v grep | awk '{print $1}'`" + test -n "$gllin_PIDs" && kill $gllin_PIDs +} + +do_status() { + ps ax | grep -v grep | grep -q gllin && echo "ready" || echo "unknown" +} + +case "$1" in + start) do_start ;; + stop) do_stop ;; + status) do_status ;; +esac diff --git a/packages/gpsd/files/fic-gta01/gpsd b/packages/gpsd/files/fic-gta01/gpsd deleted file mode 100755 index 113f43dd20..0000000000 --- a/packages/gpsd/files/fic-gta01/gpsd +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# -# gpsd This shell script starts and stops gpsd. -# -# chkconfig: 345 90 40 -# description: Gpsd manages access to a serial- or USB-connected GPS -# processname: gpsd - -# Source function library. -#. /etc/rc.d/init.d/functions - -RETVAL=0 -prog="gpsd" - -test -f /etc/default/$prog && . /etc/default/$prog - -start() { - # Start daemons. - echo -n "Starting $prog: " - # We don't use the daemon function here because of a known bug - # in initlog -- it spuriously returns a nonzero status when - # starting daemons that fork themselves. See - # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629 - # for discussion. Fortunately: - # - # 1. gpsd startup can't fail, or at least not in the absence of - # much larger resource-exhaustion problems that would be very obvious. - # - # 2. We don't need all the logging crud that daemon/initlog sets - # up -- gpsd does its own syslog calls. - # - - if test -e /home/root/gllin/gllin - then - /home/root/gllin/gllin >/var/log/gllin.log 2>&1 & - else - echo -e "\n\ngllin GPS driver for Neo1973 not found," - echo "please install the gllin package from" - echo "http://3rdparty.downloads.openmoko.org/gllin/" - echo "" - exit 1 - fi - - if [ -e "${GPS_DEV}" ] - then - gpsd ${GPSD_OPTS} -p ${GPS_DEV} - echo "success" - else - # User needs to symlink ${GPS_DEV} to the right thing - echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog" - fi - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gpsd - return $RETVAL -} - -stop() { - # Stop daemons. - echo -n "Shutting down $prog: " - - gllin_PIDs="`ps ax | grep "/home/root/gllin" | grep -v grep | awk '{print $1}'`" - test -n "$gllin_PIDs" && kill $gllin_PIDs - - killall gpsd - killproc gpsd - RETVAL=$? - echo - if [ $RETVAL -eq 0 ] - then - rm -f /var/lock/subsys/gpsd; - fi - return $RETVAL -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - RETVAL=$? - ;; - condrestart) - if [ -f /var/lock/subsys/gpsd ]; then - stop - start - RETVAL=$? - fi - ;; - status) -# status gpsd -# RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/packages/gpsd/files/gps-hardware b/packages/gpsd/files/gps-hardware new file mode 100644 index 0000000000..ff2ddb3650 --- /dev/null +++ b/packages/gpsd/files/gps-hardware @@ -0,0 +1,2 @@ +# This is a dummy file. Some machines use it to bring up integrated GPS +# devices on demand. diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd index 3a14867f8a..e536837e1c 100755 --- a/packages/gpsd/files/gpsd +++ b/packages/gpsd/files/gpsd @@ -29,9 +29,18 @@ start() { # 2. We don't need all the logging crud that daemon/initlog sets # up -- gpsd does its own syslog calls. # + + if test -x /etc/init.d/gps-hardware + then + if ! ( /etc/init.d/gps-hardware status | grep -q "ready" ) + then + /etc/init.d/gps-hardware start + fi + fi + if [ -e "${GPS_DEV}" ] then - gpsd ${GPSD_OPTS} -p ${GPS_DEV} + gpsd ${GPSD_OPTS} ${GPS_DEV} echo "success" else # User needs to symlink ${GPS_DEV} to the right thing diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index be593e0744..dac62ec76c 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -3,6 +3,7 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "dbus-glib ncurses python" +RDEPENDS = "gpsd-conf" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -11,6 +12,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gpsd-default \ + file://gps-hardware \ file://gpsd" inherit autotools update-rc.d @@ -41,15 +43,29 @@ do_install_append() { install -d ${D}/${sysconfdir}/init.d install -d ${D}/dev install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd + install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default } -PACKAGES =+ "libgps python-pygps" +pkg_postinst_${PN}-conf() { + update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 + update-alternatives --install ${sysconfdir}/init.d/gps-hardware gps-hardware ${sysconfdir}/init.d/gps-hardware.default 10 +} + +pkg_postrm_${PN}-conf() { + update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default + update-alternatives --remove gps-hardware ${sysconfdir}/init.d/gps-hardware.default +} + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" + +PACKAGES =+ "libgps python-pygps gpsd-conf" + +PACKAGE_ARCH_gpsd-conf = "${MACHINE_ARCH}" -FILES_${PN} += "${sysconfdir}" FILES_libgps = "${libdir}/*.so.*" -CONFFILES_${PN} = "${sysconfdir}/default/gpsd" +FILES_gpsd-conf = "${sysconfdir}" DESCRIPTION_python-pygps = "Python bindings to gpsd" FILES_python-pygps = "${libdir}/*/site-packages/*" diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index c16de2e951..ffd7322bf1 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r4" +PR = "r5" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 8472eb1c15..969ef1b803 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r6" +PR = "r7" diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb index 58e9ebeee2..885a41dbda 100644 --- a/packages/gpsd/gpsd_2.36.bb +++ b/packages/gpsd/gpsd_2.36.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r0" +PR = "r1" diff --git a/packages/images/initramfs-minimal-image.bb b/packages/images/initramfs-minimal-image.bb index 1aa928b2a9..d696468913 100644 --- a/packages/images/initramfs-minimal-image.bb +++ b/packages/images/initramfs-minimal-image.bb @@ -1,7 +1,6 @@ # Sample initramfs image -#IMAGE_INSTALL = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" -IMAGE_INSTALL = "initramfs-nfsboot busybox-static kernel-module-uinput" +IMAGE_INSTALL = "initramfs-module-nfs busybox-static" export IMAGE_BASENAME = "initramfs-image" IMAGE_LINGUAS = "" diff --git a/packages/dotconf/files/.mtn2git_empty b/packages/libdotconf/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dotconf/files/.mtn2git_empty +++ b/packages/libdotconf/.mtn2git_empty diff --git a/packages/libdotconf/files/.mtn2git_empty b/packages/libdotconf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libdotconf/files/.mtn2git_empty diff --git a/packages/dotconf/files/srcMakefile.am_00.patch b/packages/libdotconf/files/srcMakefile.am_00.patch index 500f1fd2d7..500f1fd2d7 100644 --- a/packages/dotconf/files/srcMakefile.am_00.patch +++ b/packages/libdotconf/files/srcMakefile.am_00.patch diff --git a/packages/libdotconf/libdotconf_1.0.13.bb b/packages/libdotconf/libdotconf_1.0.13.bb new file mode 100644 index 0000000000..05520519b6 --- /dev/null +++ b/packages/libdotconf/libdotconf_1.0.13.bb @@ -0,0 +1,25 @@ +DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parser library" +HOMEPAGE = "http://www.azzit.de/dotconf/" +LICENSE = "LGPLv2" + +PR = "r0" + +inherit autotools + +SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/dotconf-${PV}.tar.gz \ + file://srcMakefile.am_00.patch;patch=1" + +S = "${WORKDIR}/dotconf-${PV}" + +do_install() { + install -d ${D}${libdir} + install -d ${D}${includedir} + + install -m 0644 ${S}/src/dotconf.h ${D}${includedir} + oe_libinstall -C src -so libdotconf ${D}${libdir} +} + +do_stage() { + install -m 0644 ${S}/src/dotconf.h ${STAGING_INCDIR}/ + oe_libinstall -C src -so libdotconf ${STAGING_LIBDIR}/ +} diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index ed3ec23933..8273b8183d 100644 --- a/packages/openmoko-apps/files/openmoko-gps.desktop +++ b/packages/openmoko-apps/files/openmoko-gps.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=GPS Comment=Display GPS coordinates Exec=gps_reader.py -Icon=openmoko-terminal +Icon=openmoko-gps2 Terminal=false Type=Application Categories=GTK;Application;Utilities; diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb index a0a0a50942..9028393b4e 100644 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -14,11 +14,11 @@ LICENSE = "GPL" RDEPENDS = "python-pygtk" -PR = "r0" +PR = "r1" ###################################################################################### -SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=4 \ +SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \ file://openmoko-gps.desktop" S = "${WORKDIR}/gps" @@ -26,7 +26,9 @@ S = "${WORKDIR}/gps" do_install() { install -d ${D}/usr/bin install -d ${D}/usr/share/applications/ + install -d ${D}/usr/share/pixmaps/ install -m 0755 ${S}/gps_reader.py ${D}/usr/bin install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ + install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps2.png } diff --git a/packages/portaudio/portaudio-v19_20071207.bb b/packages/portaudio/portaudio-v19_20071207.bb new file mode 100644 index 0000000000..f8de2d741d --- /dev/null +++ b/packages/portaudio/portaudio-v19_20071207.bb @@ -0,0 +1,27 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2008 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: portaudio-v19_20071207.bb +# Date: 20080104 (YMD) + +DESCRIPTION = "portaudio is a portable cross-platform Audio API" +SECTION = "base" +LICENSE = "GPL" + +PR = "r0" + +###################################################################################### + +SRC_URI = "http://www.portaudio.com/archives/pa_stable_v19_${PV}.tar.gz" + +S = "${WORKDIR}/portaudio" + +inherit autotools + +do_stage() { + install -m 0644 ${S}/include/portaudio.h ${STAGING_INCDIR}/ + oe_libinstall -C lib -so libportaudio ${STAGING_LIBDIR}/ +} diff --git a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch b/packages/speech-dispatcher/files/confSpeechd.conf_00.patch new file mode 100644 index 0000000000..de1a776e3b --- /dev/null +++ b/packages/speech-dispatcher/files/confSpeechd.conf_00.patch @@ -0,0 +1,26 @@ +--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig 2008-01-04 13:45:43.000000000 +0000 ++++ speech-dispatcher-0.6.5/config/speechd.conf.in 2008-01-04 13:47:31.000000000 +0000 +@@ -129,10 +129,10 @@ + # - configuration is the path to the config file of this module, + # either relative (to etc/speechd/modules/) or absolute + +-AddModule "espeak" "sd_espeak" "espeak.conf" +-AddModule "festival" "sd_festival" "festival.conf" +-AddModule "flite" "sd_flite" "flite.conf" +-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf" ++#AddModule "espeak" "sd_espeak" "espeak.conf" ++#AddModule "festival" "sd_festival" "festival.conf" ++#AddModule "flite" "sd_flite" "flite.conf" ++AddModule "espeak-generic" "sd_generic" "espeak-generic.conf" + #AddModule "epos-generic" "sd_generic" "epos-generic.conf" + #AddModule "dtk-generic" "sd_generic" "dtk-generic.conf" + #AddModule "ibmtts" "sd_ibmtts" "ibmtts.conf" +@@ -172,6 +172,6 @@ + + # There are some sample client settings + +-Include "clients/emacs.conf" +-Include "clients/gnome-speech.conf" ++#Include "clients/emacs.conf" ++#Include "clients/gnome-speech.conf" + diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb index 4f70def359..68bfd8a347 100644 --- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb +++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb @@ -2,15 +2,16 @@ DESCRIPTION = " Speech Dispatcher is a high-level device independent layer \ for speech synthesis through a simple, stable and well documented interface." HOMEPAGE = "http://www.freebsoft.org/speechd/" LICENSE = "GPLv2" -DEPENDS = "flite dotconf glib-2.0" +DEPENDS = "flite libdotconf glib-2.0" RPROVIDES += "speechd" -PR = "r0" +PR = "r1" inherit autotools SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \ - file://srcMakefile.am.patch;patch=1 " + file://srcMakefile.am.patch;patch=1 \ + file://confSpeechd.conf_00.patch;patch=1" LEAD_SONAME = "libspeechd.so" @@ -18,15 +19,20 @@ do_install() { install -d ${D}${bindir} install -d ${D}${includedir} install -d ${D}${libdir}/${PN}-modules + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/modules oe_libinstall -so -C src/audio libsdaudio ${D}${libdir} oe_libinstall -so -C src/c/api libspeechd ${D}${libdir} install -m 0644 ${S}/src/c/api/libspeechd.h ${D}${includedir} - install -m 0755 ${S}/src/c/clients/say/spd-say ${D}${bindir} + install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir} install -m 0755 ${S}/src/c/clients/spdsend/spdsend ${D}${bindir} - install -m 0755 ${S}/src/server/speech-dispatcher ${D}${bindir} - install -m 0755 ${S}/src/modules/sd_* ${D}${libdir}/${PN}-modules/ + install -m 0755 ${S}/src/server/.libs/speech-dispatcher ${D}${bindir} + install -m 0755 ${S}/src/modules/.libs/sd_* ${D}${libdir}/${PN}-modules/ + + install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir} + install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules } do_stage() { diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc index 987b85dc29..c01458d626 100644 --- a/packages/util-linux-ng/util-linux-ng.inc +++ b/packages/util-linux-ng/util-linux-ng.inc @@ -6,8 +6,9 @@ DEPENDS = "zlib ncurses e2fsprogs-libs" inherit autotools # I'm finishing this recipe during the 2.13.1 candidate release cycle -# @todo Remove $RC later. See if patches are needed. File locations. +# @todo Remove $RC later. See if patches are needed. Move files from /usr/*. # -- Leon 'likewise' Woestenberg + RC="-rc2" DEFAULT_PREFERENCE = "-1" @@ -36,7 +37,9 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile" RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" -EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown" +EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ +--enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ +--enable-arch --enable-init" S = "${WORKDIR}/util-linux-ng-${PV}${RC}" @@ -81,30 +84,38 @@ do_install () { oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - return 0 - test -f ${D}${base_sbindir}/pivot_root && \ - mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} - mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} - mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} - mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} - mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} - mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN} - mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} - mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} + mkdir ${D}${base_bindir} + mkdir ${D}${base_sbindir} + test -f ${D}${sbindir}/pivot_root && \ + mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} + mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} + mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN} + mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} + mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} + mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} +# mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN} + mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} + mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN} mv ${D}${bindir}/last ${D}${bindir}/last.${PN} mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN} mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} + return 0 + + mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} + mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} + mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN} + mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN} + mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} + + mv ${D}${bindir}/agetty ${D}${base_sbindir}/ + mv ${D}${bindir}/blockdev ${D}${base_sbindir}/ + mv ${D}${bindir}/cfdisk ${D}${base_sbindir}/ + mv ${D}${bindir}/ctrlaltdel ${D}${base_sbindir}/ - mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} - mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} - mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN} - mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} - mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall @@ -132,7 +143,7 @@ pkg_postinst_${PN} () { update-alternatives --install ${bindir}/renice renice renice.${PN} 100 update-alternatives --install ${bindir}/wall wall wall.${PN} 100 - # There seems to be problem, atleast on nslu2, with these, untill they are + # There seems to be problem, atleast on nslu2, with these, until they are # fixed the busybox ones have higher priority update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 10 update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10 |