From e084786aed2d73221570ea9f0199a85890ac231f Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 3 Jan 2008 15:08:58 +0000 Subject: qpegps: upgrade 0.9.3.1. bump angstrom-preferred * fix DEPENDS and libqte-mt linking close #oebug 3955 thanks to bluelightning * patch 0.9.3.1 Place.* file name bug * fix .desktop QA issue --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- packages/qpegps/files/qpegps.desktop | 3 +-- packages/qpegps/qpegps.inc | 8 +++++--- packages/qpegps/qpegps_0.9.3.1.bb | 6 ++++++ packages/qpegps/qpegps_0.9.3.bb | 1 - 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 packages/qpegps/qpegps_0.9.3.1.bb delete mode 100644 packages/qpegps/qpegps_0.9.3.bb diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 97fed90f21..82c31cb64a 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0" PREFERRED_VERSION_qpe-libgaim ?= "1.5.0" PREFERRED_VERSION_qpealarmclock ?= "1.0.9" PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9" -PREFERRED_VERSION_qpegps ?= "0.9.3" +PREFERRED_VERSION_qpegps ?= "0.9.3.1" PREFERRED_VERSION_qpenmapfe ?= "1.0.0" PREFERRED_VERSION_qpf-arabic ?= "1.0" PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10" diff --git a/packages/qpegps/files/qpegps.desktop b/packages/qpegps/files/qpegps.desktop index 16e222b00b..de5a93ccea 100644 --- a/packages/qpegps/files/qpegps.desktop +++ b/packages/qpegps/files/qpegps.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Comment=Moving Map Exec=qpegps -Icon=qpegps/qpegps.png +Icon=qpegps Type=Application Name=qpeGPS - diff --git a/packages/qpegps/qpegps.inc b/packages/qpegps/qpegps.inc index 2e10bf40a6..b763be896d 100644 --- a/packages/qpegps/qpegps.inc +++ b/packages/qpegps/qpegps.inc @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://qpegps.sourceforge.net/" -RRECOMMENDS = "gpsd" +DEPENDS = "gpsd" +RDEPENDS = "gpsd" SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \ file://qpegps.desktop \ @@ -16,18 +17,19 @@ inherit palmtop QMAKE_PROFILES = "qpegps.pro" EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps" OE_QMAKE_CFLAGS += " -DQWS " +OE_QMAKE_LIBS_QT = ${QT_LIBRARY} do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/qpegps \ + ${D}${palmtopdir}/pics \ ${D}${palmtopdir}/help/html/qpegps_icons \ ${D}${palmtopdir}/qpegps/maps \ ${D}${palmtopdir}/qpegps/icons \ ${D}${palmtopdir}/qpegps/tracks install -m 0755 qpegps ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/ + install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/ install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/ install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/ install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/ diff --git a/packages/qpegps/qpegps_0.9.3.1.bb b/packages/qpegps/qpegps_0.9.3.1.bb new file mode 100644 index 0000000000..e43e6a353f --- /dev/null +++ b/packages/qpegps/qpegps_0.9.3.1.bb @@ -0,0 +1,6 @@ +require qpegps.inc + +do_configure_prepend() { + mv ${S}/Place.cpp ${S}/place.cpp + mv ${S}/Place.h ${S}/place.h +} diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb deleted file mode 100644 index 4cdb945321..0000000000 --- a/packages/qpegps/qpegps_0.9.3.bb +++ /dev/null @@ -1 +0,0 @@ -require qpegps.inc -- cgit v1.2.3 From 7377bcfa7701f0d9b88d5d312b40d356b0f0e018 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Jan 2008 15:23:12 +0000 Subject: base and sanity bbclasses + qemu: move gcc3 availability checking into base.bbclass (from Poky) --- classes/base.bbclass | 17 +++++++++++++++++ classes/sanity.bbclass | 8 -------- packages/qemu/qemu-gcc3-check.inc | 17 +++-------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 2b508a8e84..e0b4c59e5f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -902,6 +902,23 @@ python () { base_after_parse(d) } +def check_app_exists(app, d): + from bb import which, data + + app = data.expand(app, d) + path = data.getVar('PATH', d) + return len(which(path, app)) != 0 + +def check_gcc3(data): + + gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' + + for gcc3 in gcc3_versions.split(): + if check_app_exists(gcc3, data): + return gcc3 + + return False + # Patch handling inherit patch diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index cc413b7011..9994febf0d 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -24,14 +24,6 @@ def check_conf_exists(fn, data): return True return False -def check_app_exists(app, d): - from bb import which, data - - app = data.expand(app, d) - path = data.getVar('PATH', d) - return len(which(path, app)) != 0 - - def check_sanity(e): from bb import note, error, data, __version__ from bb.event import Handled, NotHandled, getName diff --git a/packages/qemu/qemu-gcc3-check.inc b/packages/qemu/qemu-gcc3-check.inc index 658e72ffc3..81c3555b48 100644 --- a/packages/qemu/qemu-gcc3-check.inc +++ b/packages/qemu/qemu-gcc3-check.inc @@ -4,19 +4,8 @@ python __anonymous() { path = data.getVar('PATH', d, 1) oldOeConf = data.getVar('EXTRA_OECONF', d, 1) if not oldOeConf: oldOeConf = "" - if len(which(path, 'gcc-3.4.4')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.4", d) - elif len(which(path, 'gcc-3.4')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d) - elif len(which(path, 'gcc34')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d) - elif len(which(path, 'gcc33')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d) - elif len(which(path, 'gcc-3.3')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d) - elif len(which(path, 'gcc-3.3.6')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d) - elif len(which(path, 'gcc-3.4.6')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d) + gcc3 = check_gcc3(d) + if gcc3: + data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d) } -- cgit v1.2.3 From bc7aa85e1bf3db6ac7e31fe15fe27ec05526205a Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 3 Jan 2008 15:30:46 +0000 Subject: add qpegps_svn, close #oebug 2194 --- packages/qpegps/qpegps_svn.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/qpegps/qpegps_svn.bb diff --git a/packages/qpegps/qpegps_svn.bb b/packages/qpegps/qpegps_svn.bb new file mode 100644 index 0000000000..16233d935c --- /dev/null +++ b/packages/qpegps/qpegps_svn.bb @@ -0,0 +1,15 @@ +require qpegps.inc + +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://qpegps.svn.sourceforge.net/svnroot/;module=qpegps/trunk/qpegps;proto=https \ + file://qpegps.desktop \ + file://qpegps.png " + +S = "${WORKDIR}/qpegps/trunk/qpegps" + +do_configure_prepend() { + mv ${S}/Place.cpp ${S}/place.cpp + mv ${S}/Place.h ${S}/place.h +} -- cgit v1.2.3 From 3ed7a06c4169967775fbb39656d0bbcf078be089 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 3 Jan 2008 20:10:33 +0000 Subject: contrib/feed-browser: Capure current config.inc from Angstrom site. --- contrib/feed-browser/includes/config.inc | 1031 +++++++++++++++++++++--------- 1 file changed, 738 insertions(+), 293 deletions(-) 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 @@ '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 +?> -- cgit v1.2.3 From 6ad3c8191ec734ea3b789300ad9cce646dc764ec Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 3 Jan 2008 20:33:48 +0000 Subject: contrib/feed-browser/update.php: Allow to update individual feeds. --- contrib/feed-browser/update.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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(); -- cgit v1.2.3 From cd06d19972831142dfcdbaf12cb47594a6f682ea Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 3 Jan 2008 21:15:00 +0000 Subject: openmoko-gps: Update to latest version and add new icon. mtN: ---------------------------------------------------------------------- --- packages/openmoko-apps/files/openmoko-gps.desktop | 2 +- packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb | 32 -------------------- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 34 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 33 deletions(-) delete mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb create mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index ed3ec23933..a496745da4 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-gps 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+svnr4.bb deleted file mode 100644 index a0a0a50942..0000000000 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2008 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php -# for a copy of the license) -# -# Filename: openmoko-gps_svn.bb -# Date: 20080101 (YMD) - -DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform." -HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS" -SECTION = "base" -LICENSE = "GPL" - -RDEPENDS = "python-pygtk" - -PR = "r0" - -###################################################################################### - -SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=4 \ - file://openmoko-gps.desktop" - -S = "${WORKDIR}/gps" - -do_install() { - install -d ${D}/usr/bin - install -d ${D}/usr/share/applications/ - - install -m 0755 ${S}/gps_reader.py ${D}/usr/bin - install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ -} diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb new file mode 100644 index 0000000000..1d00b6a78d --- /dev/null +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -0,0 +1,34 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2008 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: openmoko-gps_svn.bb +# Date: 20080101 (YMD) + +DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform." +HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS" +SECTION = "base" +LICENSE = "GPL" + +RDEPENDS = "python-pygtk" + +PR = "r0" + +###################################################################################### + +SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \ + file://openmoko-gps.desktop" + +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-gps.png +} -- cgit v1.2.3 From 51e42c17e8a759a080b6767c8a137875cec2b8ac Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 3 Jan 2008 21:21:26 +0000 Subject: util-linux-ng: Install binaries into same locations as util-linux does. --- packages/util-linux-ng/util-linux-ng.inc | 51 +++++++++++++++++++------------- 1 file changed, 31 insertions(+), 20 deletions(-) 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 -- cgit v1.2.3 From c5c78c3746fa20932160ff585b3e4c53f4e6c69d Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 3 Jan 2008 23:28:27 +0000 Subject: openmoko-apps: openmoko-gps: Fix icon name --- packages/openmoko-apps/files/openmoko-gps.desktop | 2 +- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index a496745da4..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-gps +Icon=openmoko-gps2 Terminal=false Type=Application Categories=GTK;Application;Utilities; diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb index 1d00b6a78d..9028393b4e 100644 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -14,7 +14,7 @@ LICENSE = "GPL" RDEPENDS = "python-pygtk" -PR = "r0" +PR = "r1" ###################################################################################### @@ -30,5 +30,5 @@ do_install() { 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-gps.png + install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps2.png } -- cgit v1.2.3 From 6118eb7dd8e9c90e153687eb2c9db8072c79693e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 4 Jan 2008 00:07:39 +0000 Subject: initramfs-minimal-image: Revamp dependencies. --- packages/images/initramfs-minimal-image.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 = "" -- cgit v1.2.3 From 31634521405243e9933606d4654b3cac8c672fba Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Fri, 4 Jan 2008 04:40:14 +0000 Subject: dotconf: rename to libdotonf, fix packaging * follow debian naming and packaging * change dependency in speech-dispatcher --- packages/dotconf/.mtn2git_empty | 0 packages/dotconf/dotconf_1.0.13.bb | 15 ------------- packages/dotconf/files/.mtn2git_empty | 0 packages/dotconf/files/srcMakefile.am_00.patch | 9 -------- packages/libdotconf/.mtn2git_empty | 0 packages/libdotconf/files/.mtn2git_empty | 0 packages/libdotconf/files/srcMakefile.am_00.patch | 9 ++++++++ packages/libdotconf/libdotconf_1.0.13.bb | 25 ++++++++++++++++++++++ .../speech-dispatcher/speech-dispatcher_0.6.5.bb | 2 +- 9 files changed, 35 insertions(+), 25 deletions(-) delete mode 100644 packages/dotconf/.mtn2git_empty delete mode 100644 packages/dotconf/dotconf_1.0.13.bb delete mode 100644 packages/dotconf/files/.mtn2git_empty delete mode 100644 packages/dotconf/files/srcMakefile.am_00.patch create mode 100644 packages/libdotconf/.mtn2git_empty create mode 100644 packages/libdotconf/files/.mtn2git_empty create mode 100644 packages/libdotconf/files/srcMakefile.am_00.patch create mode 100644 packages/libdotconf/libdotconf_1.0.13.bb diff --git a/packages/dotconf/.mtn2git_empty b/packages/dotconf/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 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/dotconf/files/.mtn2git_empty b/packages/dotconf/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dotconf/files/srcMakefile.am_00.patch b/packages/dotconf/files/srcMakefile.am_00.patch deleted file mode 100644 index 500f1fd2d7..0000000000 --- a/packages/dotconf/files/srcMakefile.am_00.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- dotconf-1.0.13/src/Makefile.am.orig 2008-01-02 11:48:16.000000000 +0000 -+++ dotconf-1.0.13/src/Makefile.am 2008-01-02 11:48:22.000000000 +0000 -@@ -1,5 +1,5 @@ - --INCLUDES = -I. -I$(includedir) -+INCLUDES = -I. - - include_HEADERS = dotconf.h - noinst_HEADERS = readdir.h diff --git a/packages/libdotconf/.mtn2git_empty b/packages/libdotconf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libdotconf/files/.mtn2git_empty b/packages/libdotconf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libdotconf/files/srcMakefile.am_00.patch b/packages/libdotconf/files/srcMakefile.am_00.patch new file mode 100644 index 0000000000..500f1fd2d7 --- /dev/null +++ b/packages/libdotconf/files/srcMakefile.am_00.patch @@ -0,0 +1,9 @@ +--- dotconf-1.0.13/src/Makefile.am.orig 2008-01-02 11:48:16.000000000 +0000 ++++ dotconf-1.0.13/src/Makefile.am 2008-01-02 11:48:22.000000000 +0000 +@@ -1,5 +1,5 @@ + +-INCLUDES = -I. -I$(includedir) ++INCLUDES = -I. + + include_HEADERS = dotconf.h + noinst_HEADERS = readdir.h 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/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb index 4f70def359..ac001bf1b7 100644 --- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb +++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb @@ -2,7 +2,7 @@ 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" -- cgit v1.2.3 From 1d6f1d20590fd91fb800156d9c16afb551a28c16 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Jan 2008 09:27:32 +0000 Subject: conf/distro: remove angstrom 2007.1, update dependant distros to 2008, special-case openmoko --- conf/distro/amsdelta-oe.conf | 2 +- conf/distro/angstrom-2007.1-legacy.conf | 2 +- conf/distro/angstrom-2007.1.conf | 260 --------------------- conf/distro/angstrom-2008.1.conf | 10 +- conf/distro/foonas.conf | 2 +- conf/distro/include/angstrom-2007-for-openmoko.inc | 260 +++++++++++++++++++++ conf/distro/mokoslug.conf | 2 +- conf/distro/openmoko.conf | 2 +- 8 files changed, 272 insertions(+), 268 deletions(-) delete mode 100644 conf/distro/angstrom-2007.1.conf create mode 100644 conf/distro/include/angstrom-2007-for-openmoko.inc 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-2007.1.conf b/conf/distro/angstrom-2007.1.conf deleted file mode 100644 index 380c882c2c..0000000000 --- a/conf/distro/angstrom-2007.1.conf +++ /dev/null @@ -1,260 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Angstrom -#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi -#@MAINTAINER: Michael 'Mickey' Lauer -#@-------------------------------------------------------------------- - -# If you want to use the angstrom 2007.12 release or if -# you want to base you distro on angstrom 2007, switch to -# the org.openembedded.angstrom-2007.12-stable branch -# THIS FILE WILL GO AWAY IN JANUARY 2008!! - -DISTRO_VERSION = "2007.11RC3" -DISTRO_REVISION = "51" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -#Images built can have to modes: -# 'debug': empty rootpassword, strace included -# 'release' no root password, no strace and gdb by default -DISTRO_TYPE ?= "debug" -#DISTRO_TYPE = "release" - -# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so -# shipping some adhoc subset will be still useless and size burden for -# users of all other languages/countries. Instead, worth to make it easy -# to install additional languages: installer/wizard + metapackages which -# will RRECOMMEND as much as possible content for a given language -# (locales, UI transalations, help, etc. - useless for pros, but really -# helpful for common users). -# Also, it appears that no locales fit in 16Mb for now. "C" locale rules! -IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' - -# These will be put under package management soon -#FEED_URIS += " \ -# no-arch##${ANGSTROM_URI}/unstable/feed/all \ -# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ -# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ -# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ -# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ -# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ -# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" -# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ -# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ -# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" - - -# set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" - - -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "\ - http://www.angstrom-distribution.org/unstable/sources/ \ - http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ - " - - -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" -PCMCIA_MANAGER = "pcmciautils" - -#Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" -RDEPENDS_kernel-base_hx4700 = "" -RDEPENDS_kernel-base_htcuniversal = "" - -PREFERRED_PROVIDER_libgsmd = "libgsmd" - -# older gtk-webcore releases don't work on ARM/EABI -# We need to switch to a fixed SRCDATE or release as soon as possible -PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" -PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" - -PREFERRED_PROVIDER_avahi = "avahi" - -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" - -#use EABI ready toolchain -PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" - -PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" - -PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" - -PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" - -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" - -#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" -PREFERRED_VERSION_avr32-gcc = "4.1.2" -PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" - -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" - -#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" -PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21" - -#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" - -PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.5" - -PREFERRED_VERSION_glibc-initial ?= "2.5" - -# To use an EABI compatible version 3 series gcc, either uncomment -# the lines below or set them in local.conf: -# -# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" - -#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/angstrom-2007-preferred-versions.inc -require conf/distro/include/preferred-gpe-versions-2.8.inc -require conf/distro/include/preferred-e-versions.inc - - -# Virtuals: -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" - -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" - -# Others: -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" -PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_libxss = "libxss" - -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - -# do some task-base stuff here - -# We want to ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' - -#this should go away soon -EXTRA_STUFF ?= "" - - -# Angstrom want to ship some extra stuff. This should be moved into task-base eventually -# contains ipkg specific stuff as well :( - -#work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails -DISTRO_EXTRA_DEPENDS += " \ - mtd-utils-native \ - " - -DISTRO_EXTRA_RDEPENDS += "\ - update-modules \