summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2007-03-11 18:39:19 +0000
committerPhilip Balister <philip@balister.org>2007-03-11 18:39:19 +0000
commit51053d021c7d57e379e088fc0592895df748e0b1 (patch)
tree75749e623cd3d2ffa1ccd61aa0b501a50b0a74b0
parent42f23263ac62da6ef5a7c105afaed3875c75c096 (diff)
parent3de7894a5577fbf7359c2d5462dce0863a8c2942 (diff)
merge of 'b0e8a7b18bc538b2926b839a1a3adad6234a53e0'
and 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'
-rw-r--r--MAINTAINERS8
-rw-r--r--classes/insane.bbclass2
-rw-r--r--classes/opie.bbclass2
-rw-r--r--classes/own-mirrors.bbclass4
-rw-r--r--classes/seppuku.bbclass111
-rw-r--r--conf/distro/foonas.conf (renamed from conf/distro/openturbostation.conf)43
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3-pre.inc412
-rw-r--r--conf/distro/include/slugos.inc5
-rw-r--r--conf/distro/mokoslug.conf13
-rw-r--r--conf/documentation.conf4
-rw-r--r--conf/machine/fic-gta01.conf2
-rw-r--r--conf/machine/include/LAB-settings.conf2
-rw-r--r--conf/machine/include/simpad-2.4.conf13
-rw-r--r--conf/machine/include/simpad-2.6.conf5
-rw-r--r--conf/machine/simpad.conf22
-rw-r--r--conf/machine/turbostation.conf7
-rw-r--r--packages/alsa/alsa-state.bb16
-rwxr-xr-xpackages/alsa/alsa-state/alsa-state29
-rw-r--r--packages/asterisk/asterisk-1.0.9/gsm.patch71
-rw-r--r--packages/asterisk/asterisk-1.0.9/makefile.patch311
-rw-r--r--packages/asterisk/asterisk-1.2.16/.mtn2git_empty (renamed from packages/asterisk/asterisk-1.0.9/.mtn2git_empty)0
-rw-r--r--packages/asterisk/asterisk-1.2.16/asterisk.patch (renamed from packages/asterisk/asterisk-1.2.12.1/asterisk.patch)0
-rw-r--r--packages/asterisk/asterisk-1.2.16/uclibc-compat-getloadavg.patch (renamed from packages/asterisk/asterisk-1.2.12.1/uclibc-compat-getloadavg.patch)0
-rw-r--r--packages/asterisk/asterisk-1.2.16/uclibc-dsn.patch (renamed from packages/asterisk/asterisk-1.2.12.1/uclibc-dsn.patch)0
-rw-r--r--packages/asterisk/asterisk-1.2.8/makefile.patch200
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/asterisk.patch221
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch13
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch18
-rw-r--r--packages/asterisk/asterisk_1.0.9.bb33
-rw-r--r--packages/asterisk/asterisk_1.2.12.1.bb38
-rw-r--r--packages/asterisk/asterisk_1.2.16.bb (renamed from packages/asterisk/asterisk_1.2.9.1.bb)9
-rw-r--r--packages/asterisk/asterisk_1.2.8.bb32
-rw-r--r--packages/avahi/avahi.inc2
-rw-r--r--packages/base-files/base-files/fic-gta01/fstab1
-rw-r--r--packages/base-files/base-files_3.0.14.bb2
-rw-r--r--packages/busybox/busybox-1.2.1/foonas/.mtn2git_empty (renamed from packages/asterisk/asterisk-1.2.12.1/.mtn2git_empty)0
-rw-r--r--packages/busybox/busybox-1.2.1/foonas/defconfig (renamed from packages/busybox/busybox-1.2.1/openturbostation/defconfig)0
-rw-r--r--packages/dfu-util/.mtn2git_empty (renamed from packages/asterisk/asterisk-1.2.8/.mtn2git_empty)0
-rw-r--r--packages/dfu-util/dfu-util-native_svn.bb16
-rw-r--r--packages/dfu-util/dfu-util_svn.bb17
-rw-r--r--packages/foonas-init/.mtn2git_empty (renamed from packages/asterisk/asterisk-1.2.9.1/.mtn2git_empty)0
-rw-r--r--packages/foonas-init/files/.mtn2git_empty (renamed from packages/busybox/busybox-1.2.1/openturbostation/.mtn2git_empty)0
-rw-r--r--packages/foonas-init/files/boot/.mtn2git_empty (renamed from packages/initscripts/initscripts-1.0/openturbostation/.mtn2git_empty)0
-rw-r--r--packages/foonas-init/files/boot/disk (renamed from packages/openturbostation-init/files/boot/disk)0
-rw-r--r--packages/foonas-init/files/boot/flash (renamed from packages/openturbostation-init/files/boot/flash)0
-rw-r--r--packages/foonas-init/files/boot/network (renamed from packages/openturbostation-init/files/boot/network)0
-rw-r--r--packages/foonas-init/files/boot/nfs (renamed from packages/openturbostation-init/files/boot/nfs)0
-rw-r--r--packages/foonas-init/files/boot/udhcpc.script (renamed from packages/openturbostation-init/files/boot/udhcpc.script)0
-rw-r--r--packages/foonas-init/files/conffiles (renamed from packages/openturbostation-init/files/conffiles)0
-rw-r--r--packages/foonas-init/files/functions (renamed from packages/openturbostation-init/files/functions)0
-rw-r--r--packages/foonas-init/files/initscripts/.mtn2git_empty (renamed from packages/netbase/netbase/openturbostation/.mtn2git_empty)0
-rw-r--r--packages/foonas-init/files/initscripts/fixfstab (renamed from packages/openturbostation-init/files/initscripts/fixfstab)0
-rw-r--r--packages/foonas-init/files/initscripts/loadmodules.sh (renamed from packages/openturbostation-init/files/initscripts/loadmodules.sh)0
-rw-r--r--packages/foonas-init/files/initscripts/rmrecovery (renamed from packages/openturbostation-init/files/initscripts/rmrecovery)0
-rw-r--r--packages/foonas-init/files/initscripts/sysconfsetup (renamed from packages/openturbostation-init/files/initscripts/sysconfsetup)0
-rw-r--r--packages/foonas-init/files/initscripts/syslog.buffer (renamed from packages/openturbostation-init/files/initscripts/syslog.buffer)0
-rw-r--r--packages/foonas-init/files/initscripts/syslog.file (renamed from packages/openturbostation-init/files/initscripts/syslog.file)0
-rw-r--r--packages/foonas-init/files/initscripts/syslog.network (renamed from packages/openturbostation-init/files/initscripts/syslog.network)0
-rw-r--r--packages/foonas-init/files/initscripts/umountinitrd.sh (renamed from packages/openturbostation-init/files/initscripts/umountinitrd.sh)0
-rw-r--r--packages/foonas-init/files/links.conf (renamed from packages/openturbostation-init/files/links.conf)0
-rw-r--r--packages/foonas-init/files/modulefunctions (renamed from packages/openturbostation-init/files/modulefunctions)0
-rw-r--r--packages/foonas-init/files/reflash (renamed from packages/openturbostation-init/files/reflash)0
-rw-r--r--packages/foonas-init/files/sysconf (renamed from packages/openturbostation-init/files/sysconf)0
-rw-r--r--packages/foonas-init/files/turnup (renamed from packages/openturbostation-init/files/turnup)0
-rw-r--r--packages/foonas-init/foonas-init_0.10.bb (renamed from packages/openturbostation-init/openturbostation-init_0.10.bb)14
-rw-r--r--packages/fuse/fuse-2.6.3/.mtn2git_empty (renamed from packages/openturbostation-init/.mtn2git_empty)0
-rw-r--r--packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch21
-rw-r--r--packages/fuse/fuse_2.6.3.bb22
-rw-r--r--packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch13
-rw-r--r--packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb4
-rw-r--r--packages/images/foonas-image.bb (renamed from packages/images/openturbostation-image.bb)56
-rw-r--r--packages/images/openprotium-image.bb7
-rw-r--r--packages/initscripts/initscripts-1.0/foonas/.mtn2git_empty (renamed from packages/openturbostation-init/files/.mtn2git_empty)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/checkroot.sh (renamed from packages/initscripts/initscripts-1.0/openturbostation/checkroot.sh)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/devices (renamed from packages/initscripts/initscripts-1.0/openturbostation/devices)0
-rw-r--r--packages/initscripts/initscripts-1.0/foonas/domainname.sh (renamed from packages/initscripts/initscripts-1.0/openturbostation/domainname.sh)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/halt (renamed from packages/initscripts/initscripts-1.0/openturbostation/halt)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/reboot (renamed from packages/initscripts/initscripts-1.0/openturbostation/reboot)0
-rw-r--r--packages/initscripts/initscripts-openturbostation_1.0.bb174
-rw-r--r--packages/iptables/files/.mtn2git_empty (renamed from packages/openturbostation-init/files/boot/.mtn2git_empty)0
-rw-r--r--packages/iptables/files/compile.patch17
-rw-r--r--packages/iptables/iptables_1.2.9.bb5
-rw-r--r--packages/iptables/iptables_1.3.3.bb5
-rw-r--r--packages/irda-utils/irda-utils_0.9.16.bb4
-rw-r--r--packages/libftdi/files/ftdi_eeprom-0.2-moko.patch16
-rw-r--r--packages/libftdi/ftdi-eeprom-native_0.2.bb8
-rw-r--r--packages/libftdi/ftdi-eeprom_0.2.bb13
-rw-r--r--packages/libftdi/libftdi_0.8.bb2
-rw-r--r--packages/libopie/libopie2/exports.patch11
-rw-r--r--packages/libopie/libopie2_cvs.bb7
-rw-r--r--packages/libqpe/libqpe-opie.inc10
-rw-r--r--packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch113
-rw-r--r--packages/libqpe/libqpe-opie_1.2.2.bb3
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb5
-rw-r--r--packages/linux/ixp4xx-kernel.inc6
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.20/defconfig19
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.20.bb4
-rw-r--r--packages/linux/linux-ezx/wyrm-ts.diff119
-rw-r--r--packages/linux/linux-ezx_2.6.16.13.bb5
-rw-r--r--packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb5
-rw-r--r--packages/linux/linux-rp_2.6.20.bb3
-rw-r--r--packages/linux/linux-turbostation/defconfig17
-rw-r--r--packages/linux/linux-turbostation_2.6.20.1.bb25
-rw-r--r--packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch72
-rw-r--r--packages/linux/linux_2.6.20.bb2
-rw-r--r--packages/ltp/.mtn2git_empty (renamed from packages/openturbostation-init/files/initscripts/.mtn2git_empty)0
-rw-r--r--packages/ltp/ltp-20070228/.mtn2git_empty0
-rw-r--r--packages/ltp/ltp-20070228/cross-compile.patch51
-rw-r--r--packages/ltp/ltp-20070228/ltp-run4
-rw-r--r--packages/ltp/ltp-20070228/runltp-path.patch13
-rw-r--r--packages/ltp/ltp_20070228.bb42
-rw-r--r--packages/meta/foonas-packages.bb (renamed from packages/meta/openturbostation-packages.bb)16
-rw-r--r--packages/meta/slugos-native.bb9
-rw-r--r--packages/meta/slugos-packages.bb8
-rw-r--r--packages/mrxvt/files/fix-compile.patch23
-rw-r--r--packages/mrxvt/mrxvt_0.5.2.bb (renamed from packages/mrxvt/mrxvt_0.4.1.bb)8
-rw-r--r--packages/netbase/netbase/foonas/.mtn2git_empty0
-rw-r--r--packages/netbase/netbase/foonas/interfaces (renamed from packages/netbase/netbase/openturbostation/interfaces)0
-rw-r--r--packages/openmoko-base/openmoko-theme-standard_svn.bb2
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb7
-rw-r--r--packages/opie-help-en/opie-help-en_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-i18n_cvs.bb3
-rw-r--r--packages/opie-i18n/opie-lrelease-native_cvs.bb4
-rw-r--r--packages/opie-i18n/opie-lupdate-native_cvs.bb4
-rw-r--r--packages/opie-keytabs/opie-keytabs_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb3
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb3
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb7
-rw-r--r--packages/opie-pics/opie-pics_cvs.bb3
-rw-r--r--packages/opie-sh-snes/opie-sh-snes.inc1
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_cvs.bb5
-rw-r--r--packages/opie-sounds/opie-sounds_cvs.bb3
-rw-r--r--packages/qpe-games/hexatrolic_1.0beta3.bb1
-rw-r--r--packages/qpe-games/labyrinth_0.7.bb1
-rw-r--r--packages/qpe-games/win4_1.0.1.bb1
-rw-r--r--packages/qpe-games/ziq_1.1ern.bb3
-rw-r--r--packages/qpe-games/zsubhunt_1.0.0ern.bb1
-rw-r--r--packages/qpe-games/ztappy_0.9.3ern.bb1
-rw-r--r--packages/rglueap/.mtn2git_empty0
-rw-r--r--packages/rglueap/rglueap_0.1.bb15
-rw-r--r--packages/s3c2410-utils/sjf2410-linux-native_20060807.bb2
-rw-r--r--packages/s3c2410-utils/sjf2410-linux-native_svn.bb2
-rw-r--r--packages/spandsp/.mtn2git_empty0
-rw-r--r--packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb17
-rw-r--r--packages/tasks/task-base.bb6
-rw-r--r--packages/tasks/task-mokogateway.bb81
-rw-r--r--packages/tasks/task-sdk-opie.bb18
-rw-r--r--packages/tasks/task-sdk.bb15
-rw-r--r--packages/tasks/task-slugos.bb36
-rw-r--r--packages/ttf-fonts/ttf-dejavu_2.15.bb (renamed from packages/ttf-fonts/ttf-dejavu_2.13.bb)0
-rw-r--r--packages/uboot-utils/files/.mtn2git_empty0
-rw-r--r--packages/uboot-utils/files/env-Makefile.patch (renamed from packages/uboot-utils/env-Makefile.patch)0
-rw-r--r--packages/uboot-utils/files/fic-gta01/.mtn2git_empty0
-rw-r--r--packages/uboot-utils/files/fic-gta01/fw_env.config6
-rw-r--r--packages/uboot-utils/files/fw_env.c.patch (renamed from packages/uboot-utils/fw_env.c.patch)0
-rw-r--r--packages/uboot-utils/files/fw_env.h.patch (renamed from packages/uboot-utils/fw_env.h.patch)0
-rw-r--r--packages/uboot-utils/files/tools-Makefile.patch (renamed from packages/uboot-utils/tools-Makefile.patch)0
-rw-r--r--packages/uboot-utils/files/turbostation/.mtn2git_empty0
-rw-r--r--packages/uboot-utils/files/turbostation/fw_env.config15
-rw-r--r--packages/uboot-utils/uboot-utils_1.1.2.bb9
-rw-r--r--packages/uboot/u-boot-mkimage-gta01-native_svn.bb2
-rw-r--r--packages/xorg-lib/diet-x11/makekeys.diff12
-rw-r--r--packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb3
-rw-r--r--packages/xorg-lib/libx11/makekeys.diff12
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb1
-rw-r--r--packages/zd1211/zd1211-firmware_1.3.bb16
169 files changed, 1518 insertions, 1483 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2ad122350c..0dd848a2d9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -182,11 +182,11 @@ Recipes: directfb, php
Person: Øyvind Repvik
Mail: nail@nslu2-linux.org
-Machines: nslu2, fsg3, ixp4xx, n2100
-Distros: debianslug, openslug, slugos
+Machines: nslu2, fsg3, ixp4xx, n2100, turbostation
+Distros: foonas, slugos
Recipes: bwmon, watchdog, wakelan, libdvb, sane-backends, samba
-Recipes: ccxstream, eciadsl, ssmtp, gstreamer, ixp4xx-npe, joe
+Recipes: ccxstream, eciadsl, ssmtp, ixp4xx-npe, joe
Recipes: lcdproc, libol, mailx, mysql, musicpd, openntpd, qc-usb
Recipes: radlib, scsi-idle, rng-tools, slugos-init, syslog-ng
-Recipes: vsftpd, zd1211, wpa-supplicant
+Recipes: vsftpd, zd1211
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index a3ca21d1dc..40f6151f08 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -206,7 +206,7 @@ def package_qa_check_rpath(file,name,d):
bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
output = os.popen("%s -Byr %s" % (scanelf,file))
- txt = output.readline().rsplit()
+ txt = output.readline().split()
if bad_dir in txt:
package_qa_write_error( 1, name, file, d)
bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file))
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index c3b9d13226..92cde5487b 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -15,7 +15,7 @@
inherit palmtop
-OPIE_CVS_PV = "1.2.2+cvs${SRCDATE}"
+OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}"
DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
diff --git a/classes/own-mirrors.bbclass b/classes/own-mirrors.bbclass
new file mode 100644
index 0000000000..32763ed24f
--- /dev/null
+++ b/classes/own-mirrors.bbclass
@@ -0,0 +1,4 @@
+PREMIRRORS() {
+http://.*/.* ${SOURCE_MIRROR_URL}
+ftp://.*/.* ${SOURCE_MIRROR_URL}
+}
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass
index 5757df7efb..8d5e234c49 100644
--- a/classes/seppuku.bbclass
+++ b/classes/seppuku.bbclass
@@ -5,6 +5,23 @@
# This class requires python2.4 because of the urllib2 usage
#
+def seppuku_spliturl(url):
+ """
+ Split GET URL to return the host base and the query
+ as a param dictionary
+ """
+ import urllib
+ (uri,query) = urllib.splitquery(url)
+ param = {}
+ for par in query.split("&"):
+ (key,value) = urllib.splitvalue(par)
+ key = urllib.unquote(key)
+ value = urllib.unquote(value)
+ param[key] = value
+
+ return (uri,param)
+
+
def seppuku_login(opener, login, user, password):
"""
@@ -109,7 +126,7 @@ def seppuku_find_bug_report(opener, query, product, component, bugname):
(number,status) = scanner.result()[0]
return (not status in ["CLOS", "RESO", "VERI"],number)
-def seppuku_reopen_bug(opener, file, product, component, bug_number, bugname, text):
+def seppuku_reopen_bug(poster, file, product, component, bug_number, bugname, text):
"""
Reopen a bug report and append to the comment
@@ -118,22 +135,34 @@ def seppuku_reopen_bug(opener, file, product, component, bug_number, bugname, te
http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=2007&longdesclength=2&product=OpenMoko&component=autobuilds&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&knob=reopen&target_milestone=Phase+0&short_desc=foo
"""
- import urllib, urllib2
- param = urllib.urlencode( { "product" : product, "component" : component, "longdesclength" : 2,
- "short_desc" : bugname, "knob" : "reopen", "id" : bug_number, "comment" : text } )
+ import urllib2
+ (uri, param) = seppuku_spliturl( file )
+
+ # Prepare the post
+ param["product"] = product
+ param["component"] = component
+ param["longdesclength"] = 2
+ param["short_desc"] = bugname
+ param["knob"] = "reopen"
+ param["id"] = bug_number
+ param["comment"] = text
+
try:
- result = opener.open( file + param )
+ result = poster.open( uri, param )
except urllib2.HTTPError, e:
print e.geturl()
print e.info()
return False
+ except Exception, e:
+ print e
+ return False
if result.code != 200:
return False
else:
return True
-def seppuku_file_bug(opener, file, product, component, bugname, text):
+def seppuku_file_bug(poster, file, product, component, bugname, text):
"""
Create a completely new bug report
@@ -150,14 +179,21 @@ def seppuku_file_bug(opener, file, product, component, bugname, text):
@param text Text
"""
- import urllib,urllib2
- param = urllib.urlencode( { "product" : product, "component" : component, "short_desc" : bugname, "comment" : text } )
+ import urllib2
+ (uri, param) = seppuku_spliturl( file )
+ param["product"] = product
+ param["component"] = component
+ param["short_desc"] = bugname
+ param["comment"] = text
+
try:
- result = opener.open( file + param )
+ result = poster.open( uri, param )
except urllib2.HTTPError, e:
print e.geturl()
print e.info()
- raise e
+ return False
+ except Exception, e:
+ print e
return False
if result.code != 200:
@@ -165,6 +201,35 @@ def seppuku_file_bug(opener, file, product, component, bugname, text):
else:
return True
+def seppuku_create_attachment(poster, attach_query, product, component, bug_number, text, file):
+ """
+
+ Create a new attachment for the failed report
+ """
+
+ if not bug_number:
+ import bb
+ bb.note("Can't create an attachment, the bug is not present")
+ return False
+
+ import urllib2
+ param = { "bugid" : bug_number, "action" : "insert", "data" : file, "description" : "Build log", "ispatch" : "0", "contenttypemethod" : "list", "contenttypeselection" : "text/plain", "comment" : text }
+
+ try:
+ result = poster.open( attach_query, param )
+ except urllib2.HTTPError, e:
+ print e.geturl()
+ print e.info()
+ return False
+ except Exception, e:
+ print e
+ return False
+
+ print result.read()
+ if result.code != 200:
+ return False
+ else:
+ return True
addhandler seppuku_eventhandler
@@ -177,7 +242,12 @@ python seppuku_eventhandler() {
from bb import data, mkdirhier, build
import bb, os, glob
- bb.note( "Ran" )
+ # Try to load our exotic libraries
+ try:
+ import MultipartPostHandler
+ except:
+ bb.note("You need to put the MultipartPostHandler into your PYTHONPATH. Download it from http://pipe.scs.fsu.edu/PostHandler/MultipartPostHandler.py")
+ return NotHandled
try:
import urllib2, cookielib
@@ -194,10 +264,12 @@ python seppuku_eventhandler() {
elif name == "TaskFailed" or name == "NoProvider":
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
+ poster = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj),MultipartPostHandler.MultipartPostHandler)
login = bb.data.getVar("SEPPUKU_LOGIN", data, True)
query = bb.data.getVar("SEPPUKU_QUERY", data, True)
newbug = bb.data.getVar("SEPPUKU_NEWREPORT", data, True)
reopen = bb.data.getVar("SEPPUKU_ADDCOMMENT", data, True)
+ attach = bb.data.getVar("SEPPUKU_ATTACHMENT", data, True)
user = bb.data.getVar("SEPPUKU_USER", data, True)
passw = bb.data.getVar("SEPPUKU_PASS", data, True)
product = bb.data.getVar("SEPPUKU_PRODUCT", data, True)
@@ -215,12 +287,12 @@ python seppuku_eventhandler() {
"pr" : bb.data.getVar("PR", data, True),
"task" : e.task }
log_file = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', event.data, True), event.task))
- if len(log_file) != 0:
- to_file = bb.data.getVar('TINDER_LOG', event.data, True)
- text = "".join(open(log_file[0], 'r').readlines())
+ text = "The package failed to build at %s" % bb.data.getVar('DATETIME', data, True)
+ file = open(log_file[0], 'r')
elif name == "NoProvider":
bugname = "noprovider for %s runtime: %s" % (event.getItem, event.getisRuntime)
text = "Please fix it"
+ file = None
else:
assert False
@@ -234,10 +306,17 @@ python seppuku_eventhandler() {
return NotHandled
if bug_number and not bug_open:
- if not seppuku_reopen_bug(opener, reopen, product, component, bug_number, bugname, text):
+ if not seppuku_reopen_bug(poster, reopen, product, component, bug_number, bugname, text):
bb.note("Failed to reopen the bug report")
- elif not seppuku_file_bug(opener, newbug, product, component, bugname, text):
+ elif not seppuku_file_bug(poster, newbug, product, component, bugname, text):
bb.note("Filing a bugreport failed")
+ else:
+ # get the new bug number and create an attachment
+ (bug_open, bug_number) = seppuku_find_bug_report(opener, query, product, component, bugname)
+
+ if file:
+ if not seppuku_create_attachment(poster, attach, product, component, bug_number, text, file):
+ bb.note("Failed to attach the build log")
return NotHandled
}
diff --git a/conf/distro/openturbostation.conf b/conf/distro/foonas.conf
index 0983f337d3..6d5385c338 100644
--- a/conf/distro/openturbostation.conf
+++ b/conf/distro/foonas.conf
@@ -1,9 +1,16 @@
#
-# Open TurboStation distribution - based on openprotium
+# FooNAS distribution - a NAS-centric distribution
+# based on openprotium
#
-DISTRO_NAME = "openturbostation"
+
+DISTRO_NAME = "foonas"
+
+# This is only changed for a release
DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
DISTRO_TYPE = "alpha"
+# These should be merged once the bogofeed change has been committed.
+FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages"
+FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/{MACHINE}/cross/1.0-dev/kernel"
#
# Naming schemes
@@ -14,11 +21,8 @@ INHERIT += "debian"
# Packaging and output format
#
INHERIT += "package_ipk"
-IMAGE_BASENAME = "openturbostation"
+IMAGE_BASENAME = "foonas"
IMAGE_FSTYPES = "jffs2"
-FEED_URIS = "openturbostation-packages##http://ipkg.kynisk.com/opents/cross/1.0-dev/packages"
-FEED_URIS += "openturbostation-kernel##http://ipkg.kynisk.com/opents/cross/1.0-dev/kernel"
-# For protium on the turbostation
#
# binutils and compilers
@@ -33,38 +37,31 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
PREFERRED_VERSION_binutils = "2.16"
PREFERRED_VERSION_binutils-cross = "2.16"
PREFERRED_VERSION_gcc = "4.1.2"
-PREFERRED_VERSION_gcc-cross = "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.2"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
PREFERRED_VERSION_glibc = "2.5"
PREFERRED_VERSION_glibc-intermediate = "2.5"
PREFERRED_VERSION_glibc-initial = "2.3.2"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
#
-# Target OS & FPU system
+# Target OS
#
USE_NLS ?= "no"
TARGET_OS = "linux"
HOTPLUG = "udev"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Bootstrap & Init
-#
-#PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
require conf/distro/include/sane-srcdates.inc
-#
-#
-# Ensure consistency across all SlugOS builds for the provider of a
-# relational database - use the latest version of the SleepyCat
-# Berkeley database
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
CMDLINE_DEBUG = "noirqdebug"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
new file mode 100644
index 0000000000..fa1edcc64c
--- /dev/null
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -0,0 +1,412 @@
+#
+# Default versions
+QTE_VERSION ?= "2.3.10"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+OPIE_SRCDATE ?= "20070308"
+OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
+OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
+
+#
+#
+# Opie libraries
+#
+PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
+PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
+PREFERRED_VERSION_qte = "${QTE_VERSION}"
+
+PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
+
+SRCDATE_libopie2 ?= "${OPIE_SRCDATE}"
+SRCDATE_libopieobex0 = "${OPIE_SRCDATE}"
+SRCDATE_libopietooth1 = "${OPIE_SRCDATE}"
+SRCDATE_libqpe-opie = "${OPIE_SRCDATE}"
+SRCDATE_libqtaux2 = "${OPIE_SRCDATE}"
+SRCDATE_libmailwrapper = "${OPIE_SRCDATE}"
+
+#
+# Opie applications
+#
+PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-core = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
+
+PREFERRED_VERSION_konqueror-embedded = "20060404"
+
+
+SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-addressbook = "${OPIE_SRCDATE}"
+SRCDATE_opie-advancedfm = "${OPIE_SRCDATE}"
+SRCDATE_opie-alarm = "${OPIE_SRCDATE}"
+SRCDATE_opie-appearance = "${OPIE_SRCDATE}"
+SRCDATE_opie-aqpkg = "${OPIE_SRCDATE}"
+SRCDATE_opie-autorotateapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-backgammon = "${OPIE_SRCDATE}"
+SRCDATE_opie-backup = "${OPIE_SRCDATE}"
+SRCDATE_opie-bartender = "${OPIE_SRCDATE}"
+SRCDATE_opie-batteryapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-bluepin ?= "${OPIE_SRCDATE}"
+SRCDATE_opie-bluetoothapplet ?= "${OPIE_SRCDATE}"
+SRCDATE_opie-bluetoothmanager ?= "${OPIE_SRCDATE}"
+SRCDATE_opie-bounce = "${OPIE_SRCDATE}"
+SRCDATE_opie-brightnessapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-button-settings = "${OPIE_SRCDATE}"
+SRCDATE_opie-buzzword = "${OPIE_SRCDATE}"
+SRCDATE_opie-calculator = "${OPIE_SRCDATE}"
+SRCDATE_opie-calibrate = "${OPIE_SRCDATE}"
+SRCDATE_opie-camera = "${OPIE_SRCDATE}"
+SRCDATE_opie-cardmon = "${OPIE_SRCDATE}"
+SRCDATE_opie-checkbook = "${OPIE_SRCDATE}"
+SRCDATE_opie-citytime = "${OPIE_SRCDATE}"
+SRCDATE_opie-clipboardapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-clockapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-clock = "${OPIE_SRCDATE}"
+SRCDATE_opie-confeditor = "${OPIE_SRCDATE}"
+SRCDATE_opie-console = "${OPIE_SRCDATE}"
+SRCDATE_opie-dagger = "${OPIE_SRCDATE}"
+SRCDATE_opie-dasher = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-datebook-birthdayplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-deco-flat = "${OPIE_SRCDATE}"
+SRCDATE_opie-deco-liquid = "${OPIE_SRCDATE}"
+SRCDATE_opie-deco-polished = "${OPIE_SRCDATE}"
+SRCDATE_opie-doctab = "${OPIE_SRCDATE}"
+SRCDATE_opie-drawpad = "${OPIE_SRCDATE}"
+SRCDATE_opie-dvorak = "${OPIE_SRCDATE}"
+SRCDATE_opie-embeddedkonsole = "${OPIE_SRCDATE}"
+SRCDATE_opie-euroconv = "${OPIE_SRCDATE}"
+SRCDATE_opie-examples-python = "${OPIE_SRCDATE}"
+SRCDATE_opie-examples = "${OPIE_SRCDATE}"
+SRCDATE_opie-eye = "${OPIE_SRCDATE}"
+SRCDATE_opie-fifteen = "${OPIE_SRCDATE}"
+SRCDATE_opie-formatter = "${OPIE_SRCDATE}"
+SRCDATE_opie-freetype = "${OPIE_SRCDATE}"
+SRCDATE_opie-ftplib = "${OPIE_SRCDATE}"
+SRCDATE_opie-ftp = "${OPIE_SRCDATE}"
+SRCDATE_opie-go = "${OPIE_SRCDATE}"
+SRCDATE_opie-gutenbrowser = "${OPIE_SRCDATE}"
+SRCDATE_opie-handwriting = "${OPIE_SRCDATE}"
+SRCDATE_opie-helpbrowser = "${OPIE_SRCDATE}"
+SRCDATE_opie-help-en = "${OPIE_SRCDATE}"
+SRCDATE_opie-homeapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-i18n = "${OPIE_SRCDATE}"
+SRCDATE_opie-lrelease-native = "${OPIE_SRCDATE}"
+SRCDATE_opie-lupdate-native = "${OPIE_SRCDATE}"
+SRCDATE_opie-icon-reload = "${OPIE_SRCDATE}"
+SRCDATE_opie-irc = "${OPIE_SRCDATE}"
+SRCDATE_opie-irdaapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-jumpx = "${OPIE_SRCDATE}"
+SRCDATE_opie-kbill = "${OPIE_SRCDATE}"
+SRCDATE_opie-kcheckers = "${OPIE_SRCDATE}"
+SRCDATE_opie-keyboard = "${OPIE_SRCDATE}"
+SRCDATE_opie-keypebble = "${OPIE_SRCDATE}"
+SRCDATE_opie-keytabs = "${OPIE_SRCDATE}"
+SRCDATE_opie-keyview = "${OPIE_SRCDATE}"
+SRCDATE_opie-kjumpx = "${OPIE_SRCDATE}"
+SRCDATE_opie-kpacman = "${OPIE_SRCDATE}"
+SRCDATE_opie-language = "${OPIE_SRCDATE}"
+SRCDATE_opie-launcher-settings = "${OPIE_SRCDATE}"
+SRCDATE_opie-libqrsync = "${OPIE_SRCDATE}"
+SRCDATE_opie-light-and-power = "${OPIE_SRCDATE}"
+SRCDATE_opie-lockapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-login = "${OPIE_SRCDATE}"
+SRCDATE_opie-logoutapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-mailapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-mail = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1-core = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer1 = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2 = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_SRCDATE}"
+SRCDATE_opie-mediummount = "${OPIE_SRCDATE}"
+SRCDATE_opie-memoryapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-mindbreaker = "${OPIE_SRCDATE}"
+SRCDATE_opie-minesweep = "${OPIE_SRCDATE}"
+SRCDATE_opie-mobilemsg = "${OPIE_SRCDATE}"
+SRCDATE_opie-multikeyapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-multikey = "${OPIE_SRCDATE}"
+SRCDATE_opie-networkapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-networksettings = "${OPIE_SRCDATE}"
+SRCDATE_opie-notesapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-odict = "${OPIE_SRCDATE}"
+SRCDATE_opie-osearch = "${OPIE_SRCDATE}"
+SRCDATE_opie-oxygen = "${OPIE_SRCDATE}"
+SRCDATE_opie-oyatzee = "${OPIE_SRCDATE}"
+SRCDATE_opie-packagemanager = "${OPIE_SRCDATE}"
+SRCDATE_opie-parashoot = "${OPIE_SRCDATE}"
+SRCDATE_opie-pcmciaapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-performance = "${OPIE_SRCDATE}"
+SRCDATE_opie-pickboard = "${OPIE_SRCDATE}"
+SRCDATE_opie-pics = "${OPIE_SRCDATE}"
+SRCDATE_opie-pimconverter = "${OPIE_SRCDATE}"
+SRCDATE_opie-powerchord = "${OPIE_SRCDATE}"
+SRCDATE_opie-pyquicklaunchapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-qasteroids = "${OPIE_SRCDATE}"
+SRCDATE_opie-qcop = "${OPIE_SRCDATE}"
+SRCDATE_opie-quicklauncher = "${OPIE_SRCDATE}"
+SRCDATE_opie-qss = "${OPIE_SRCDATE}"
+SRCDATE_opie-rdesktop = "${OPIE_SRCDATE}"
+SRCDATE_opie-reader = "${OPIE_SRCDATE}"
+SRCDATE_opie-recorder = "${OPIE_SRCDATE}"
+SRCDATE_opie-remote = "${OPIE_SRCDATE}"
+SRCDATE_opie-restartapplet2 = "${OPIE_SRCDATE}"
+SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-rotateapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-screenshotapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-search = "${OPIE_SRCDATE}"
+SRCDATE_opie-security = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-blueping = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-dummy = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-notice = "${OPIE_SRCDATE}"
+SRCDATE_opie-securityplugin-pin = "${OPIE_SRCDATE}"
+SRCDATE_opie-sfcave = "${OPIE_SRCDATE}"
+SRCDATE_opie-sheet = "${OPIE_SRCDATE}"
+SRCDATE_opie-sh = "${OPIE_SRCDATE}"
+SRCDATE_opie-showimg = "${OPIE_SRCDATE}"
+SRCDATE_opie-snake = "${OPIE_SRCDATE}"
+SRCDATE_opie-solitaire = "${OPIE_SRCDATE}"
+SRCDATE_opie-sshkeys = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-flat = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-fresh = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-liquid = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-metal = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-phase = "${OPIE_SRCDATE}"
+SRCDATE_opie-style-web = "${OPIE_SRCDATE}"
+SRCDATE_opie-sounds = "${OPIE_SRCDATE}"
+SRCDATE_opie-suspendapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-symlinker = "${OPIE_SRCDATE}"
+SRCDATE_opie-sysinfo = "${OPIE_SRCDATE}"
+SRCDATE_opie-systemtime = "${OPIE_SRCDATE}"
+SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
+SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
+SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
+SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
+SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
+SRCDATE_opie-theme = "${OPIE_SRCDATE}"
+SRCDATE_opie-tictac = "${OPIE_SRCDATE}"
+SRCDATE_opie-tinykate = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-addressbookplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-datebookplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-fortuneplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-mailplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-stocktickerplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-todolistplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-today-weatherplugin = "${OPIE_SRCDATE}"
+SRCDATE_opie-todo = "${OPIE_SRCDATE}"
+SRCDATE_opie-tonleiter = "${OPIE_SRCDATE}"
+SRCDATE_opie-unikeyboard = "${OPIE_SRCDATE}"
+SRCDATE_opie-usermanager = "${OPIE_SRCDATE}"
+SRCDATE_opie-vmemo = "${OPIE_SRCDATE}"
+SRCDATE_opie-vmemo-settings = "${OPIE_SRCDATE}"
+SRCDATE_opie-volumeapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-vtapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-wellenreiter = "${OPIE_SRCDATE}"
+SRCDATE_opie-wirelessapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-wordgame = "${OPIE_SRCDATE}"
+SRCDATE_opie-write = "${OPIE_SRCDATE}"
+SRCDATE_opie-zkbapplet = "${OPIE_SRCDATE}"
+SRCDATE_opie-zlines = "${OPIE_SRCDATE}"
+SRCDATE_opie-zsafe = "${OPIE_SRCDATE}"
+SRCDATE_opie-zsame = "${OPIE_SRCDATE}"
+SRCDATE_opie-sh-snes = "${OPIE_SRCDATE}"
+SRCDATE_opie-stumbler = "${OPIE_SRCDATE}"
+
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index a89d193225..3edaa342cb 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -144,3 +144,8 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154"
#FIXME: HACK: REMOVE THIS
IGNORE_STRIP_ERRORS = ""
+
+# Due to upstream instability, and another OE project with conflicting
+# needs, nail down a specific, known-working version of madwifi-ng.
+# Remove this once the madwifi-ng stuff seems to stabilize once again.
+PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index ea20fdd6b6..5598694397 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -14,9 +14,16 @@ DISTRO_VERSION = "1.0-alpha"
DISTRO_REVISION = "1"
DISTRO_TYPE = "debug"
+MACHINE_TASK_PROVIDER = "task-base task-mokogateway-everything"
+
+# Even though the NSLU2 does not have built-in bluetooth,
+# we assume that a MokoSlug gateway has a bluetooth dongle.
MACHINE_FEATURES_append_nslu2 = " bluetooth"
-# No room for debug apps in 8MB.
-DEBUG_APPS = ""
+# No room for debug apps on an NSLU2.
+DEBUG_APPS_nslu2 = ""
+
+# No room for a kernel image on an NSLU2.
+IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
-INHERIT += "nslu2-image" \ No newline at end of file
+INHERIT_append_nslu2 = "nslu2-image" \ No newline at end of file
diff --git a/conf/documentation.conf b/conf/documentation.conf
index eec06daf7c..4782a053ba 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -105,6 +105,7 @@ COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names su
COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking."
+SOURCE_MIRROR_URL[doc] = "URL to source mirror which will be used before fetching from original SRC_URI."
BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure."
BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
@@ -122,6 +123,9 @@ SEPPUKU_QUERY[doc] = "The query script of the bugzilla"
SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &"
#SEPPUKU_ADDCOMMENT = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&target_milestone=Phase+0&"
SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment"
+#SEPPUKU_ATTACHMENT = "http:/bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi"
+SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments."
+
#SEPPUKU_PRODUCT = "OpenMoko"
SEPPUKU_PRODUCT[doc] = "The product inside the bugtracker"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 3d21ae77d4..5450c1ebd3 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -30,7 +30,7 @@ MACHINE_TASK_PROVIDER = "task-base"
ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n"
# build tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf
index 576846fbdf..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.conf
@@ -5,4 +5,4 @@
#
# LAB can only resolve relative symlinks
-ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
+#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
index 06eb56d2b6..06f12f532f 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.conf
@@ -1,9 +1,14 @@
PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
+MACHINE_FEATURES_append = "kernel24"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \
+ kernel-module-sa1100usb-core kernel-module-usb-eth \
+ kernel-module-pcnet-cs kernel-module-8390 "
+
+USE_DEVFS = "1"
+
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
# Later versions are broken on kernel 2.4
PREFERRED_VERSION_orinoco-modules = "0.13e"
-BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules \
- pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
-
-USE_DEVFS = "1"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
index 69f04f0730..e485c7bf2a 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.conf
@@ -1,4 +1,5 @@
PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
-BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES_append = "kernel26"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 2478ce17c9..f99d509c86 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -3,27 +3,21 @@
#@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
MACHINE_KERNEL_VERSION ?= "2.4"
-require conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"
+MACHINE_TASK_PROVIDER = "task-base"
+MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
+
+include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/tune-strongarm.conf
-# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+ROOT_FLASH_SIZE = "16"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
-EXTRA_IMAGEDEPENDS = ""
-SERIAL_CONSOLE = "ttySA0 115200 vt100"
GUI_MACHINE_CLASS = "bigscreen"
-ROOT_FLASH_SIZE = "16"
+SERIAL_CONSOLE = "ttySA0 115200 vt100"
USE_VT = "0"
-GPE_EXTRA_INSTALL += "suspend-desktop"
-
-require conf/machine/include/tune-strongarm.conf
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index b25061db21..7f7d24c1e9 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -17,10 +17,11 @@ OPENTURBOSTATION_KERNEL = ""
# We want udev support in the image
udevdir = "/dev"
-TURBOSTATION_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
+TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev"
BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
-ROOT_FLASH_SIZE = 12
-# Hardware stuff
+# Hardware stuff used in image generation
ERASEBLOCK_SIZE = "0x20000"
+JFFS2_ROOTFS_SIZE = "0xC80000"
+KERNEL_IMAGE_SIZE = "0x280000"
require conf/machine/include/tune-ppc603e.conf
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index d49aa3231b..53c69c5c69 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -14,21 +14,30 @@ LICENSE = "GPL"
######################################################################################
-PV = "0.0.1"
+PV = "0.0.2"
PR = "r0"
######################################################################################
-SRC_URI = "file://asound.state"
+SRC_URI = "file://asound.state \
+ file://alsa-state"
FILES_${PN} = "/etc/*"
######################################################################################
+inherit update-rc.d
+
+INITSCRIPT_NAME = "alsa-state"
+INITSCRIPT_PARAMS = "defaults 10"
+
+######################################################################################
+
do_install() {
- install -d ${D}${sysconfdir}
+ install -d ${D}${sysconfdir}/init.d
install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir}
+ install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
}
@@ -38,3 +47,4 @@ pkg_postinst_${PN}() {
/usr/sbin/alsactl -f ${sysconfdir}/asound.state restore
fi
}
+
diff --git a/packages/alsa/alsa-state/alsa-state b/packages/alsa/alsa-state/alsa-state
new file mode 100755
index 0000000000..c6bc1fd494
--- /dev/null
+++ b/packages/alsa/alsa-state/alsa-state
@@ -0,0 +1,29 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: alsa-state
+# Date: 20070308 (YMD)
+
+
+asound_restore(){
+ echo "ALSA: Restoring mixer settings..."
+ if test -x /usr/sbin/alsactl -a -e /etc/asound.state
+ then
+ /usr/sbin/alsactl -f /etc/asound.state restore
+ fi
+}
+
+asound_store(){
+ echo "ALSA: Storing mixer settings..."
+ if test -x /usr/sbin/alsactl
+ then
+ /usr/sbin/alsactl -f /etc/asound.state store
+ fi
+}
+
+case "$1" in
+start) asound_restore ;;
+stop) asound_store ;;
+esac
diff --git a/packages/asterisk/asterisk-1.0.9/gsm.patch b/packages/asterisk/asterisk-1.0.9/gsm.patch
deleted file mode 100644
index c59aa80bba..0000000000
--- a/packages/asterisk/asterisk-1.0.9/gsm.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- asterisk-1.0.9.org/codecs/gsm/Makefile 2005-06-21 16:27:28.000000000 +0200
-+++ asterisk-1.0.9/codecs/gsm/Makefile 2005-08-14 21:47:10.000000000 +0200
-@@ -37,26 +37,6 @@
- ######### ppro's, etc, as well as the AMD K6 and K7. The compile will
- ######### probably require gcc.
-
--ifneq (${OSARCH},Darwin)
--ifneq (${PROC},x86_64)
--ifneq (${PROC},ultrasparc)
--ifneq ($(shell uname -m),ppc)
--ifneq ($(shell uname -m),alpha)
--ifneq ($(shell uname -m),armv4l)
--ifneq (${PROC},sparc64)
--ifneq (${PROC},ppc)
--ifneq (${PROC},ppc64)
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
--endif
--endif
--endif
--endif
--endif
--endif
--
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
-@@ -218,19 +198,6 @@
- $(SRC)/gsm_option.c \
- $(SRC)/short_term.c \
- $(SRC)/table.c
--ifeq (${OSARCH},Linux)
--ifneq ($(shell uname -m),x86_64)
--ifneq ($(shell uname -m),ppc)
--ifneq ($(shell uname -m),alpha)
--ifneq ($(shell uname -m),armv4l)
--ifneq ($(shell uname -m),sparc64)
--GSM_SOURCES+= $(SRC)/k6opt.s
--endif
--endif
--endif
--endif
--endif
--endif
-
- TOAST_SOURCES = $(SRC)/toast.c \
- $(SRC)/toast_lin.c \
-@@ -276,20 +243,6 @@
- $(SRC)/short_term.o \
- $(SRC)/table.o
-
--ifeq (${OSARCH},Linux)
--ifneq ($(shell uname -m), x86_64)
--ifneq ($(shell uname -m), ppc)
--ifneq ($(shell uname -m), alpha)
--ifneq ($(shell uname -m), armv4l)
--ifneq ($(shell uname -m), sparc64)
--GSM_OBJECTS+= $(SRC)/k6opt.o
--endif
--endif
--endif
--endif
--endif
--endif
--
- TOAST_OBJECTS = $(SRC)/toast.o \
- $(SRC)/toast_lin.o \
- $(SRC)/toast_ulaw.o \
-
diff --git a/packages/asterisk/asterisk-1.0.9/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch
deleted file mode 100644
index 6684d8696e..0000000000
--- a/packages/asterisk/asterisk-1.0.9/makefile.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- asterisk-1.0.7/Makefile~makefile.patch
-+++ asterisk-1.0.7/Makefile
-@@ -127,64 +127,67 @@
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-
- INCLUDE=-Iinclude -I../include
--CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
--CFLAGS+=$(OPTIMIZE)
-+my_CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
-+my_CFLAGS+=$(OPTIMIZE)
-
- ifneq ($(PROC),ultrasparc)
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+my_CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- endif
-
--CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
--CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
-+my_CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
-+my_CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
-
- ifeq (${OSARCH},FreeBSD)
- OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
--CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
-+my_CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
- LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
- INCLUDE+=-I/usr/local/include
--CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
-+my_CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
- MPG123TARG=freebsd
- endif # FreeBSD
-
- ifeq (${OSARCH},NetBSD)
--CFLAGS+=-pthread
-+my_CFLAGS+=-pthread
- INCLUDE+=-I/usr/local/include -I/usr/pkg/include
- MPG123TARG=netbsd
- endif
-
- ifeq (${OSARCH},OpenBSD)
--CFLAGS+=-pthread
-+my_CFLAGS+=-pthread
- endif
-
- #Uncomment this to use the older DSP routines
- #CFLAGS+=-DOLD_DSP_ROUTINES
-
--CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
--CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
-+my_CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
-+my_CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
-
- LIBEDIT=editline/libedit.a
-
- ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
- HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
- RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi)
--CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
--CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
--CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
--CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
--CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
--CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
--CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
--CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
--CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
--CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
--CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
-+my_CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
-+my_CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
-+my_CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
-+my_CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
-+my_CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
-+my_CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
-+my_CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
-+my_CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
-+my_CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
-+my_CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
-+my_CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
-+
-+my_CFLAGS+= $(DEBUG_THREADS)
-+my_CFLAGS+= $(TRACE_FRAMES)
-+my_CFLAGS+= $(MALLOC_DEBUG)
-+my_CFLAGS+= $(BUSYDETECT)
-+my_CFLAGS+= $(OPTIONS)
-+my_CFLAGS+=# -fomit-frame-pointer
-+
-+override CFLAGS += $(my_CFLAGS)
-
--CFLAGS+= $(DEBUG_THREADS)
--CFLAGS+= $(TRACE_FRAMES)
--CFLAGS+= $(MALLOC_DEBUG)
--CFLAGS+= $(BUSYDETECT)
--CFLAGS+= $(OPTIONS)
--CFLAGS+=# -fomit-frame-pointer
- SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
- ifeq (${OSARCH},Linux)
- LIBS=-ldl -lpthread
-@@ -296,7 +299,7 @@
- fi
-
- asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
-- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
-+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
-
- muted: muted.o
- $(CC) -o muted muted.o
---- asterisk-1.0.7/res/Makefile~makefile.patch
-+++ asterisk-1.0.7/res/Makefile
-@@ -13,15 +13,13 @@
-
- MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
- res_agi.so
--MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
--MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
--MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi)
-+MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
-+MODS+=$(shell if [ -f "${STAGING_INCDIR}/osp/osp.h" ]; then echo "res_osp.so"; fi)
-
- CRYPTO_LIBS=-lssl -lcrypto
-
- CFLAGS+=
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH")
--CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH")
-+CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo " -DZAPATA_MOH")
- #
- # Work around buggy RedHat 9.0
- #
-@@ -37,7 +35,7 @@
- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
-
- res_crypto.so: res_crypto.o
-- $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS)
-+ $(CC) $(SOLINK) -o $@ $< $(LDFLAGS) $(CRYPTO_LIBS)
-
- clean:
- rm -f *.so *.o .depend
---- asterisk-1.0.7/channels/Makefile~makefile.patch
-+++ asterisk-1.0.7/channels/Makefile
-@@ -71,22 +71,20 @@
- CHANNEL_LIBS+=chan_oss.so
- endif
-
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
--CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
-+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/ixjuser.h ] && echo chan_phone.so)
- CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
-
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
--CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
--CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
--CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
--CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
-+CFLAGS+=$(shell [ ! -f ${STAGING_INCDIR}/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/alsa/asoundlib.h ] && echo "chan_alsa.so")
-+CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo " -DZAPATA_PRI")
-+CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
--ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
--ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
--CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
--CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
--CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
-+ZAPPRI=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo "-lpri")
-+ZAPR2=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo "-lmfcr2")
-+CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
-+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo "chan_vpb.so" )
-+CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo " -DLINUX")
-
- ALSA_SRC=chan_alsa.c
- ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h")
-@@ -106,10 +104,9 @@
-
- ZAPDIR=/usr/lib
-
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
--CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
-+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "chan_zap.so")
-
--CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
-+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/nbs.h ] && echo "chan_nbs.so" )
-
- ifndef OPENH323DIR
- OPENH323DIR=$(HOME)/openh323
-@@ -135,10 +132,10 @@
- endif
-
- gentone: gentone.c
-- $(CC) -o gentone gentone.c -lm
-+ $(BUILD_CC) -o gentone gentone.c -lm
-
- gentone-ulaw: gentone-ulaw.c
-- $(CC) -o gentone-ulaw gentone-ulaw.c -lm
-+ $(BUILD_CC) -o gentone-ulaw gentone-ulaw.c -lm
-
- busy.h: gentone
- ./gentone busy 480 620
---- asterisk-1.0.7/pbx/Makefile~makefile.patch
-+++ asterisk-1.0.7/pbx/Makefile
-@@ -16,7 +16,7 @@
- PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so
-
- # Add GTK console if appropriate
--PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+PBX_LIBS+=$(shell ${STAGING_BINDIR_CROSS}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
- # Add KDE Console if appropriate
- #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
-
---- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch
-+++ asterisk-1.0.7/codecs/lpc10/Makefile
-@@ -25,28 +25,6 @@
- CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
- #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
-
--#fix for PPC processors and ALPHA, And UltraSparc too
--ifneq ($(OSARCH),Darwin)
--ifneq ($(findstring BSD,${OSARCH}),BSD)
--ifneq ($(PROC),ppc)
--ifneq ($(PROC),x86_64)
--ifneq ($(PROC),alpha)
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
--#So we go lowest common available by gcc and go a step down, still a step up from
--#the default as we now have a better instruction set to work with. - Belgarath
--ifeq ($(PROC),ultrasparc)
-- CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
--else
-- CFLAGS+= -march=$(PROC)
--endif
--endif
--endif
--endif
--endif
--endif
--
- LIB = $(LIB_TARGET_DIR)/liblpc10.a
-
- .PHONY: all clean
---- asterisk-1.0.7/cdr/Makefile~makefile.patch
-+++ asterisk-1.0.7/cdr/Makefile
-@@ -37,36 +37,25 @@
- #
- # unixODBC stuff...
- #
--MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi)
--MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi)
-+MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "cdr_odbc.so"; fi)
-
- #
- # FreeTDS stuff...
- #
--MODS+=$(shell if [ -f "/usr/include/tds.h" ]; then echo "cdr_tds.so"; fi)
--MODS+=$(shell if [ -f "/usr/local/include/tds.h" ]; then echo "cdr_tds.so"; fi)
-+MODS+=$(shell if [ -f "${STAGING_INCDIR}/tds.h" ]; then echo "cdr_tds.so"; fi)
-
- #
- # PGSQL stuff... Autoconf anyone??
- #
--MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql ] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ] || [ -f /usr/include/libpq-fe.h ] ; then echo "cdr_pgsql.so"; fi)
--CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi)
--CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi)
--CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi)
--CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi)
--CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi)
--#CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi)
-+CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/pgsql ]; then echo "-I${STAGING_INCDIR}/pgsql"; fi)
-+CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/postgresql ]; then echo "-I${STAGING_INCDIR}/postgresql"; fi)
- MLFLAGS=
--MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi)
--MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi)
--MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi)
--MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi)
--MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi)
-+MLFLAGS+=$(shell if [ -d ${STAGING_LIBDIR}/pgsql ]; then echo "-L${STAGING_LIBDIR}/pgsql"; fi)
-
- #
- # SQLIte stuff...
- #
--MODS+=$(shell if [ -f "/usr/include/sqlite.h" ]; then echo "cdr_sqlite.so"; fi)
-+MODS+=$(shell if [ -f "${STAGING_INCDIR}/sqlite.h" ]; then echo "cdr_sqlite.so"; fi)
-
- all: depend $(MODS)
-
-@@ -84,16 +73,16 @@
- endif
-
- cdr_odbc.so: cdr_odbc.o
-- $(CC) $(SOLINK) -o $@ $< -lodbc $(MLFLAGS)
-+ $(CC) $(SOLINK) -o $@ $< -lodbc $(LDFLAGS) $$(MLFLAGS)
-
- cdr_tds.so: cdr_tds.o
-- $(CC) $(SOLINK) -o $@ $< -ltds $(MLFLAGS)
-+ $(CC) $(SOLINK) -o $@ $< -ltds $(LDFLAGS) $$(MLFLAGS)
-
- cdr_pgsql.so: cdr_pgsql.o
-- $(CC) $(SOLINK) -o $@ $< -lpq -lz $(MLFLAGS)
-+ $(CC) $(SOLINK) -o $@ $< -lpq -lz $(LDFLAGS) $$(MLFLAGS)
-
- cdr_sqlite.so: cdr_sqlite.o
-- $(CC) $(SOLINK) -o $@ $< -lsqlite $(MLFLAGS)
-+ $(CC) $(SOLINK) -o $@ $< -lsqlite $(LDFLAGS) $(MLFLAGS)
-
- depend: .depend
-
diff --git a/packages/asterisk/asterisk-1.0.9/.mtn2git_empty b/packages/asterisk/asterisk-1.2.16/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.0.9/.mtn2git_empty
+++ b/packages/asterisk/asterisk-1.2.16/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.2.12.1/asterisk.patch b/packages/asterisk/asterisk-1.2.16/asterisk.patch
index 006b8e9291..006b8e9291 100644
--- a/packages/asterisk/asterisk-1.2.12.1/asterisk.patch
+++ b/packages/asterisk/asterisk-1.2.16/asterisk.patch
diff --git a/packages/asterisk/asterisk-1.2.12.1/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.16/uclibc-compat-getloadavg.patch
index a909513b1c..a909513b1c 100644
--- a/packages/asterisk/asterisk-1.2.12.1/uclibc-compat-getloadavg.patch
+++ b/packages/asterisk/asterisk-1.2.16/uclibc-compat-getloadavg.patch
diff --git a/packages/asterisk/asterisk-1.2.12.1/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.16/uclibc-dsn.patch
index 23657bcc76..23657bcc76 100644
--- a/packages/asterisk/asterisk-1.2.12.1/uclibc-dsn.patch
+++ b/packages/asterisk/asterisk-1.2.16/uclibc-dsn.patch
diff --git a/packages/asterisk/asterisk-1.2.8/makefile.patch b/packages/asterisk/asterisk-1.2.8/makefile.patch
deleted file mode 100644
index 780868b91e..0000000000
--- a/packages/asterisk/asterisk-1.2.8/makefile.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- asterisk-1.2.8/Makefile~makefile
-+++ asterisk-1.2.8/Makefile
-@@ -16,6 +16,9 @@
- # Create OPTIONS variable
- OPTIONS=
- # If cross compiling, define these to suit
-+CROSS_COMPILE=$(CROSS_DIR)
-+CROSS_COMPILE_TARGET=$(STAGING_DIR)
-+CROSS_COMPILE_BIN=$(STAGING_BINDIR_CROSS)
- # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
- # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
- # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
-@@ -327,13 +330,13 @@
- endif
- endif
-
--ASTCFLAGS+= $(DEBUG_THREADS)
--ASTCFLAGS+= $(TRACE_FRAMES)
--ASTCFLAGS+= $(MALLOC_DEBUG)
--ASTCFLAGS+= $(BUSYDETECT)
--ASTCFLAGS+= $(OPTIONS)
-+#ASTCFLAGS+= $(DEBUG_THREADS)
-+#ASTCFLAGS+= $(TRACE_FRAMES)
-+#ASTCFLAGS+= $(MALLOC_DEBUG)
-+#ASTCFLAGS+= $(BUSYDETECT)
-+#ASTCFLAGS+= $(OPTIONS)
- ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
--ASTCFLAGS+= -fomit-frame-pointer
-+#ASTCFLAGS+= -fomit-frame-pointer
- endif
- SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
-
-@@ -397,7 +400,7 @@
- endif
-
- ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-- CFLAGS+=$(ASTCFLAGS)
-+override CFLAGS+=$(ASTCFLAGS)
- endif
-
- # This is used when generating the doxygen documentation
-@@ -519,7 +522,7 @@
- fi
- rm -f include/asterisk/build.h.tmp
- $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
-- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
-+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
-
- muted: muted.o
- $(CC) $(AUDIO_LIBS) -o muted muted.o
---- asterisk-1.2.8/codecs/gsm/Makefile~makefile
-+++ asterisk-1.2.8/codecs/gsm/Makefile
-@@ -51,7 +51,7 @@
- ifneq (${PROC},ppc)
- ifneq (${PROC},ppc64)
- ifneq (${PROC},s390)
--OPTIMIZE+=-march=$(PROC)
-+#OPTIMIZE+=-march=$(PROC)
- endif
- endif
- endif
-@@ -243,7 +243,7 @@
- ifneq (${PROC},arm)
- ifneq ($(shell uname -m), parisc)
- ifneq (${PROC}, s390)
--GSM_SOURCES+= $(SRC)/k6opt.s
-+#GSM_SOURCES+= $(SRC)/k6opt.s
- endif
- endif
- endif
-@@ -309,7 +309,7 @@
- ifneq ($(shell uname -m), sparc64)
- ifneq ($(shell uname -m), armv4l)
- ifneq ($(shell uname -m), parisc)
--GSM_OBJECTS+= $(SRC)/k6opt.o
-+#GSM_OBJECTS+= $(SRC)/k6opt.o
- endif
- endif
- endif
---- asterisk-1.2.8/res/Makefile~makefile
-+++ asterisk-1.2.8/res/Makefile
-@@ -89,7 +89,7 @@
- fi
-
- res_crypto.so: res_crypto.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
-
- clean:
- rm -f *.so *.o .depend
---- asterisk-1.2.8/channels/Makefile~makefile
-+++ asterisk-1.2.8/channels/Makefile
-@@ -73,7 +73,7 @@
- SOLINK+=-lrt
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/linux/ixjuser.h),)
- CHANNEL_LIBS+=chan_phone.so
- endif
-
-@@ -88,16 +88,16 @@
-
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/alsa/asoundlib.h),)
- CHANNEL_LIBS+=chan_alsa.so
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
-+ifneq ($(wildcard $(STAGING_LIBDIR)/libpri.so.1),)
- CFLAGS+=-DZAPATA_PRI
- ZAPPRI=-lpri
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
-+ifneq ($(wildcard $(STAGING_LIBDIR)/libmfcr2.so.1),)
- CFLAGS+=-DZAPATA_R2
- ZAPR2=-lmfcr2
- endif
-@@ -110,7 +110,7 @@
- endif
-
- ifndef WITHOUT_ZAPTEL
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/linux/zaptel.h),)
- ifeq (${OSARCH},NetBSD)
- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
- endif
-@@ -122,7 +122,7 @@
- endif
- endif # WITHOUT_ZAPTEL
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/vpbapi.h),)
- CHANNEL_LIBS+=chan_vpb.so
- CFLAGS+=-DLINUX
- endif
-@@ -137,7 +137,7 @@
-
- ZAPDIR=/usr/lib
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/nbs.h),)
- CHANNEL_LIBS+=chan_nbs.so
- endif
-
-@@ -158,7 +158,7 @@
- rm -f busy.h ringtone.h gentone gentone-ulaw
-
- %.so : %.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
-
- ifneq ($(wildcard .depend),)
- include .depend
---- asterisk-1.2.8/pbx/Makefile~makefile
-+++ asterisk-1.2.8/pbx/Makefile
-@@ -59,7 +59,7 @@
- $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
-
- pbx_dundi.so: dundi-parser.o pbx_dundi.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
-
- %.moc : %.h
- $(MOC) $< -o $@
---- asterisk-1.2.8/formats/Makefile~makefile
-+++ asterisk-1.2.8/formats/Makefile
-@@ -25,7 +25,7 @@
- #
- # OGG/Vorbis format
- #
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/vorbis/codec.h),)
- FORMAT_LIBS+=format_ogg_vorbis.so
- endif
-
---- asterisk-1.2.8/utils/Makefile~makefile
-+++ asterisk-1.2.8/utils/Makefile
-@@ -22,11 +22,11 @@
-
- TARGET=stereorize streamplayer
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/popt.h),)
- TARGET+=smsq
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
-+ifneq ($(wildcard $(STAGING_INCDIR)/newt.h),)
- TARGET+=astman
- endif
-
diff --git a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
deleted file mode 100644
index 9e93f9d5d7..0000000000
--- a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- asterisk-1.2.9.1/./Makefile~asterisk
-+++ asterisk-1.2.9.1/./Makefile
-@@ -331,7 +331,7 @@
- ASTCFLAGS+= $(TRACE_FRAMES)
- ASTCFLAGS+= $(MALLOC_DEBUG)
- ASTCFLAGS+= $(BUSYDETECT)
--ASTCFLAGS+= $(OPTIONS)
-+#ASTCFLAGS+= $(OPTIONS)
- ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
- ASTCFLAGS+= -fomit-frame-pointer
- endif
-@@ -347,12 +347,12 @@
- netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
- cryptostub.o
-
--ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
-+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),)
- OBJS+= poll.o
- ASTCFLAGS+=-DPOLLCOMPAT
- endif
-
--ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
-+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),)
- OBJS+= dlfcn.o
- ASTCFLAGS+=-DDLFCNCOMPAT
- endif
-@@ -397,7 +397,7 @@
- endif
-
- ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-- CFLAGS+=$(ASTCFLAGS)
-+override CFLAGS+=$(ASTCFLAGS)
- endif
-
- # This is used when generating the doxygen documentation
-@@ -519,7 +519,7 @@
- fi
- rm -f include/asterisk/build.h.tmp
- $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
-- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
-+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
-
- muted: muted.o
- $(CC) $(AUDIO_LIBS) -o muted muted.o
---- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk
-+++ asterisk-1.2.9.1/codecs/gsm/Makefile
-@@ -51,7 +51,7 @@
- ifneq (${PROC},ppc)
- ifneq (${PROC},ppc64)
- ifneq (${PROC},s390)
--OPTIMIZE+=-march=$(PROC)
-+#OPTIMIZE+=-march=$(PROC)
- endif
- endif
- endif
-@@ -243,7 +243,7 @@
- ifneq (${PROC},arm)
- ifneq ($(shell uname -m), parisc)
- ifneq (${PROC}, s390)
--GSM_SOURCES+= $(SRC)/k6opt.s
-+#GSM_SOURCES+= $(SRC)/k6opt.s
- endif
- endif
- endif
-@@ -309,7 +309,7 @@
- ifneq ($(shell uname -m), sparc64)
- ifneq ($(shell uname -m), armv4l)
- ifneq ($(shell uname -m), parisc)
--GSM_OBJECTS+= $(SRC)/k6opt.o
-+#GSM_OBJECTS+= $(SRC)/k6opt.o
- endif
- endif
- endif
---- asterisk-1.2.9.1/res/Makefile~asterisk
-+++ asterisk-1.2.9.1/res/Makefile
-@@ -89,7 +89,7 @@
- fi
-
- res_crypto.so: res_crypto.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
-
- clean:
- rm -f *.so *.o .depend
---- asterisk-1.2.9.1/channels/Makefile~asterisk
-+++ asterisk-1.2.9.1/channels/Makefile
-@@ -73,7 +73,7 @@
- SOLINK+=-lrt
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),)
- CHANNEL_LIBS+=chan_phone.so
- endif
-
-@@ -88,16 +88,16 @@
-
- CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),)
- CHANNEL_LIBS+=chan_alsa.so
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),)
- CFLAGS+=-DZAPATA_PRI
- ZAPPRI=-lpri
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),)
- CFLAGS+=-DZAPATA_R2
- ZAPR2=-lmfcr2
- endif
-@@ -110,7 +110,7 @@
- endif
-
- ifndef WITHOUT_ZAPTEL
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),)
- ifeq (${OSARCH},NetBSD)
- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
- endif
-@@ -122,7 +122,7 @@
- endif
- endif # WITHOUT_ZAPTEL
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),)
- CHANNEL_LIBS+=chan_vpb.so
- CFLAGS+=-DLINUX
- endif
-@@ -137,7 +137,7 @@
-
- ZAPDIR=/usr/lib
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),)
- CHANNEL_LIBS+=chan_nbs.so
- endif
-
-@@ -158,7 +158,7 @@
- rm -f busy.h ringtone.h gentone gentone-ulaw
-
- %.so : %.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
-
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -215,7 +215,7 @@
- chan_alsa.o: $(ALSA_SRC)
-
- chan_alsa.so: chan_alsa.o
-- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
-+ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS)
-
- chan_nbs.so: chan_nbs.o
- $(CC) $(SOLINK) -o $@ $< -lnbs
---- asterisk-1.2.9.1/pbx/Makefile~asterisk
-+++ asterisk-1.2.9.1/pbx/Makefile
-@@ -59,7 +59,7 @@
- $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
-
- pbx_dundi.so: dundi-parser.o pbx_dundi.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
-
- %.moc : %.h
- $(MOC) $< -o $@
---- asterisk-1.2.9.1/formats/Makefile~asterisk
-+++ asterisk-1.2.9.1/formats/Makefile
-@@ -25,7 +25,7 @@
- #
- # OGG/Vorbis format
- #
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),)
- FORMAT_LIBS+=format_ogg_vorbis.so
- endif
-
-@@ -57,7 +57,7 @@
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
-
- format_ogg_vorbis.so : format_ogg_vorbis.o
-- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
-+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS)
-
- install: all
- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
---- asterisk-1.2.9.1/utils/Makefile~asterisk
-+++ asterisk-1.2.9.1/utils/Makefile
-@@ -22,11 +22,11 @@
-
- TARGET=stereorize streamplayer
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),)
- TARGET+=smsq
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),)
- TARGET+=astman
- endif
-
-@@ -64,7 +64,7 @@
- $(CC) $(CFLAGS) -o $@ $^
-
- smsq: smsq.o
-- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt
-+ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS)
-
- streamplayer: streamplayer.o
- $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS}
diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch
deleted file mode 100644
index a909513b1c..0000000000
--- a/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h
---- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100
-+++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100
-@@ -75,7 +75,9 @@
- #define HAVE_STRTOQ
-
- #ifdef _BSD_SOURCE
-+#ifndef __UCLIBC__
- #define HAVE_GETLOADAVG
-+#endif /* __UCLIBC__ */
- #endif
-
- #ifdef __linux__
diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch
deleted file mode 100644
index 23657bcc76..0000000000
--- a/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c
---- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200
-+++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100
-@@ -153,7 +153,13 @@
-
- #if defined(res_ninit)
- #define HAS_RES_NINIT
--#else
-+#endif
-+
-+#ifdef __UCLIBC__
-+#undef HAS_RES_NINIT
-+#endif
-+
-+#ifndef HAS_RES_NINIT
- AST_MUTEX_DEFINE_STATIC(res_lock);
- #if 0
- #warning "Warning, res_ninit is missing... Could have reentrancy issues"
diff --git a/packages/asterisk/asterisk_1.0.9.bb b/packages/asterisk/asterisk_1.0.9.bb
deleted file mode 100644
index 5e1bf87b06..0000000000
--- a/packages/asterisk/asterisk_1.0.9.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="The Astersisk open source software PBX"
-HOMEPAGE="www.asterisk.org"
-LICENSE="GPL"
-DEPENDS="ncurses zlib openssl"
-PR = "r2"
-
-SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
- file://gsm.patch;patch=1 \
- file://makefile.patch;patch=1"
-
-
-# Doh - they use 'L'inux intead of linux
-# FIXME: Do the sed here
-
-export OSARCH="Linux"
-export PROC="${TARGET_ARCH}"
-
-# We will probably have to edit the CFLAG in teh Makefile
-
-do_compile() {
- oe_runmake
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/asterisk
- install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/
-}
-
-
diff --git a/packages/asterisk/asterisk_1.2.12.1.bb b/packages/asterisk/asterisk_1.2.12.1.bb
deleted file mode 100644
index c0b7fc2ed9..0000000000
--- a/packages/asterisk/asterisk_1.2.12.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION="The Asterisk open source software PBX"
-HOMEPAGE="www.asterisk.org"
-LICENSE="GPL"
-DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
-PR = "r0"
-
-SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
- file://uclibc-compat-getloadavg.patch;patch=1 \
- file://uclibc-dsn.patch;patch=1 \
- file://asterisk.patch;patch=1"
-
-
-export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
-export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
-
-export CROSS_ARCH="Linux"
-
-export CROSS_PROC="${TARGET_ARCH}"
-
-export MAKECMDGOALS="dont-optimize"
-
-# We will probably have to edit the CFLAG in the Makefile
-
-do_compile() {
- oe_runmake
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/asterisk
- install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/
-}
-
-
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.16.bb
index c1cedf67f6..0ec55f8e42 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.16.bb
@@ -2,20 +2,22 @@ DESCRIPTION="The Asterisk open source software PBX"
HOMEPAGE="www.asterisk.org"
LICENSE="GPL"
DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
-PR = "r6"
+SECTION = "console/telephony"
+PR = "r4"
SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
file://uclibc-compat-getloadavg.patch;patch=1 \
file://uclibc-dsn.patch;patch=1 \
file://asterisk.patch;patch=1"
+S = "${WORKDIR}/asterisk-${PV}"
+
export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
export CROSS_ARCH="Linux"
-
export CROSS_PROC="${TARGET_ARCH}"
export MAKECMDGOALS="dont-optimize"
@@ -36,3 +38,6 @@ do_stage () {
}
+FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug"
+FILES_${PN}-dbg += "/var/lib/asterisk/agi-bin/.debug"
+
diff --git a/packages/asterisk/asterisk_1.2.8.bb b/packages/asterisk/asterisk_1.2.8.bb
deleted file mode 100644
index a9917c6e62..0000000000
--- a/packages/asterisk/asterisk_1.2.8.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION="The Astersisk open source software PBX"
-HOMEPAGE="www.asterisk.org"
-LICENSE="GPL"
-DEPENDS="ncurses zlib openssl curl"
-PR = "r0"
-
-SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
- file://makefile.patch;patch=1"
-
-
-# Doh - they use 'L'inux intead of linux
-# FIXME: Do the sed here
-
-export OSARCH="Linux"
-export PROC="${TARGET_ARCH}"
-
-# We will probably have to edit the CFLAG in the Makefile
-
-do_compile() {
- oe_runmake
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/asterisk
- install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/
-}
-
-
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index adb1356906..3a0b28cc53 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -5,7 +5,7 @@ SECTION = "network"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "expat libdaemon dbus"
+DEPENDS = "expat libdaemon dbus glib-2.0"
RRECOMMENDS = "libnss-mdns"
RRECOMMENDS_avahi-daemon = "libnss-mdns"
diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index 3837178c9a..392422ea6f 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -6,6 +6,7 @@ proc /proc proc defaults 0 0
# usb?
# Temporary
+tmpfs /tmp tmpfs defaults 0 0
tmpfs /var tmpfs defaults 0 0
tmpfs /media/ram tmpfs defaults 0 0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index db06b92471..0f80f17b19 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r61"
+PR = "r62"
LICENSE = "GPL"
SRC_URI = " \
diff --git a/packages/asterisk/asterisk-1.2.12.1/.mtn2git_empty b/packages/busybox/busybox-1.2.1/foonas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.2.12.1/.mtn2git_empty
+++ b/packages/busybox/busybox-1.2.1/foonas/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.2.1/openturbostation/defconfig b/packages/busybox/busybox-1.2.1/foonas/defconfig
index 322ccd7740..322ccd7740 100644
--- a/packages/busybox/busybox-1.2.1/openturbostation/defconfig
+++ b/packages/busybox/busybox-1.2.1/foonas/defconfig
diff --git a/packages/asterisk/asterisk-1.2.8/.mtn2git_empty b/packages/dfu-util/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.2.8/.mtn2git_empty
+++ b/packages/dfu-util/.mtn2git_empty
diff --git a/packages/dfu-util/dfu-util-native_svn.bb b/packages/dfu-util/dfu-util-native_svn.bb
new file mode 100644
index 0000000000..af6603ddd1
--- /dev/null
+++ b/packages/dfu-util/dfu-util-native_svn.bb
@@ -0,0 +1,16 @@
+require dfu-util_${PV}.bb
+
+inherit native
+
+DEPENDS = "libusb-native"
+
+do_stage() {
+ install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 src/dfu-util_static ${DEPLOY_DIR_IMAGE}/dfu-util
+}
+
+addtask deploy before do_package after do_install
diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb
new file mode 100644
index 0000000000..6f2e050569
--- /dev/null
+++ b/packages/dfu-util/dfu-util_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "USB Device Firmware Upgrade utility"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+DEPENDS = "libusb"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http"
+S = "${WORKDIR}/dfu-util"
+
+inherit autotools
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/asterisk/asterisk-1.2.9.1/.mtn2git_empty b/packages/foonas-init/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.2.9.1/.mtn2git_empty
+++ b/packages/foonas-init/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.2.1/openturbostation/.mtn2git_empty b/packages/foonas-init/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/busybox/busybox-1.2.1/openturbostation/.mtn2git_empty
+++ b/packages/foonas-init/files/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/.mtn2git_empty b/packages/foonas-init/files/boot/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/openturbostation/.mtn2git_empty
+++ b/packages/foonas-init/files/boot/.mtn2git_empty
diff --git a/packages/openturbostation-init/files/boot/disk b/packages/foonas-init/files/boot/disk
index b4bbaf1f3c..b4bbaf1f3c 100644
--- a/packages/openturbostation-init/files/boot/disk
+++ b/packages/foonas-init/files/boot/disk
diff --git a/packages/openturbostation-init/files/boot/flash b/packages/foonas-init/files/boot/flash
index 40f64c9701..40f64c9701 100644
--- a/packages/openturbostation-init/files/boot/flash
+++ b/packages/foonas-init/files/boot/flash
diff --git a/packages/openturbostation-init/files/boot/network b/packages/foonas-init/files/boot/network
index 599250e744..599250e744 100644
--- a/packages/openturbostation-init/files/boot/network
+++ b/packages/foonas-init/files/boot/network
diff --git a/packages/openturbostation-init/files/boot/nfs b/packages/foonas-init/files/boot/nfs
index 7cfce66cbb..7cfce66cbb 100644
--- a/packages/openturbostation-init/files/boot/nfs
+++ b/packages/foonas-init/files/boot/nfs
diff --git a/packages/openturbostation-init/files/boot/udhcpc.script b/packages/foonas-init/files/boot/udhcpc.script
index 3f437e3143..3f437e3143 100644
--- a/packages/openturbostation-init/files/boot/udhcpc.script
+++ b/packages/foonas-init/files/boot/udhcpc.script
diff --git a/packages/openturbostation-init/files/conffiles b/packages/foonas-init/files/conffiles
index e1408a3227..e1408a3227 100644
--- a/packages/openturbostation-init/files/conffiles
+++ b/packages/foonas-init/files/conffiles
diff --git a/packages/openturbostation-init/files/functions b/packages/foonas-init/files/functions
index 2108288ab5..2108288ab5 100644
--- a/packages/openturbostation-init/files/functions
+++ b/packages/foonas-init/files/functions
diff --git a/packages/netbase/netbase/openturbostation/.mtn2git_empty b/packages/foonas-init/files/initscripts/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/netbase/netbase/openturbostation/.mtn2git_empty
+++ b/packages/foonas-init/files/initscripts/.mtn2git_empty
diff --git a/packages/openturbostation-init/files/initscripts/fixfstab b/packages/foonas-init/files/initscripts/fixfstab
index 67116a12fd..67116a12fd 100644
--- a/packages/openturbostation-init/files/initscripts/fixfstab
+++ b/packages/foonas-init/files/initscripts/fixfstab
diff --git a/packages/openturbostation-init/files/initscripts/loadmodules.sh b/packages/foonas-init/files/initscripts/loadmodules.sh
index c5d44d1067..c5d44d1067 100644
--- a/packages/openturbostation-init/files/initscripts/loadmodules.sh
+++ b/packages/foonas-init/files/initscripts/loadmodules.sh
diff --git a/packages/openturbostation-init/files/initscripts/rmrecovery b/packages/foonas-init/files/initscripts/rmrecovery
index eec822b154..eec822b154 100644
--- a/packages/openturbostation-init/files/initscripts/rmrecovery
+++ b/packages/foonas-init/files/initscripts/rmrecovery
diff --git a/packages/openturbostation-init/files/initscripts/sysconfsetup b/packages/foonas-init/files/initscripts/sysconfsetup
index a4f9074d9c..a4f9074d9c 100644
--- a/packages/openturbostation-init/files/initscripts/sysconfsetup
+++ b/packages/foonas-init/files/initscripts/sysconfsetup
diff --git a/packages/openturbostation-init/files/initscripts/syslog.buffer b/packages/foonas-init/files/initscripts/syslog.buffer
index 9285c02946..9285c02946 100644
--- a/packages/openturbostation-init/files/initscripts/syslog.buffer
+++ b/packages/foonas-init/files/initscripts/syslog.buffer
diff --git a/packages/openturbostation-init/files/initscripts/syslog.file b/packages/foonas-init/files/initscripts/syslog.file
index 80ee5f0174..80ee5f0174 100644
--- a/packages/openturbostation-init/files/initscripts/syslog.file
+++ b/packages/foonas-init/files/initscripts/syslog.file
diff --git a/packages/openturbostation-init/files/initscripts/syslog.network b/packages/foonas-init/files/initscripts/syslog.network
index 3d7f4ab8e6..3d7f4ab8e6 100644
--- a/packages/openturbostation-init/files/initscripts/syslog.network
+++ b/packages/foonas-init/files/initscripts/syslog.network
diff --git a/packages/openturbostation-init/files/initscripts/umountinitrd.sh b/packages/foonas-init/files/initscripts/umountinitrd.sh
index b590ae68b5..b590ae68b5 100644
--- a/packages/openturbostation-init/files/initscripts/umountinitrd.sh
+++ b/packages/foonas-init/files/initscripts/umountinitrd.sh
diff --git a/packages/openturbostation-init/files/links.conf b/packages/foonas-init/files/links.conf
index fdd1f3ce23..fdd1f3ce23 100644
--- a/packages/openturbostation-init/files/links.conf
+++ b/packages/foonas-init/files/links.conf
diff --git a/packages/openturbostation-init/files/modulefunctions b/packages/foonas-init/files/modulefunctions
index 430e376ad8..430e376ad8 100644
--- a/packages/openturbostation-init/files/modulefunctions
+++ b/packages/foonas-init/files/modulefunctions
diff --git a/packages/openturbostation-init/files/reflash b/packages/foonas-init/files/reflash
index f2947822f6..f2947822f6 100644
--- a/packages/openturbostation-init/files/reflash
+++ b/packages/foonas-init/files/reflash
diff --git a/packages/openturbostation-init/files/sysconf b/packages/foonas-init/files/sysconf
index 8866c076b8..8866c076b8 100644
--- a/packages/openturbostation-init/files/sysconf
+++ b/packages/foonas-init/files/sysconf
diff --git a/packages/openturbostation-init/files/turnup b/packages/foonas-init/files/turnup
index 73befd26c9..73befd26c9 100644
--- a/packages/openturbostation-init/files/turnup
+++ b/packages/foonas-init/files/turnup
diff --git a/packages/openturbostation-init/openturbostation-init_0.10.bb b/packages/foonas-init/foonas-init_0.10.bb
index 91a690224d..80166793a5 100644
--- a/packages/openturbostation-init/openturbostation-init_0.10.bb
+++ b/packages/foonas-init/foonas-init_0.10.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Turbostation initial boot and config"
+DESCRIPTION = "FooNAS initial boot and config"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r71"
+PR = "r0"
SRC_URI = "file://boot/flash \
file://boot/disk \
@@ -110,14 +110,10 @@ do_install() {
set +ex
}
-# If the package is installed on an NSLU2 $D will be empty, in that
-# case it is normal to run 'start' and 'stop', but because the conf
-# files installed don't actually start or stop anything this is
-# unnecessary, so the package postfoo handling is simplified here.
-#NB: do not use '08' (etc) for the first argument after start/stop,
+# NB: do not use '08' (etc) for the first argument after start/stop,
# the value is interpreted as an octal number if there is a leading
# zero.
-pkg_postinst_openturbostation-init() {
+pkg_postinst_foonas-init() {
opt=
test -n "$D" && opt="-r $D"
update-rc.d $opt hwclock.sh start 8 S . start 45 0 6 .
@@ -131,7 +127,7 @@ pkg_postinst_openturbostation-init() {
update-rc.d $opt rmrecovery start 99 1 2 3 4 5 .
}
-pkg_postrm_openturbostation-init() {
+pkg_postrm_foonas-init() {
opt=
test -n "$D" && opt="-r $D"
for s in ${INITSCRIPTS}
diff --git a/packages/openturbostation-init/.mtn2git_empty b/packages/fuse/fuse-2.6.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/.mtn2git_empty
+++ b/packages/fuse/fuse-2.6.3/.mtn2git_empty
diff --git a/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch
new file mode 100644
index 0000000000..2496b77f70
--- /dev/null
+++ b/packages/fuse/fuse-2.6.3/not-run-updaterc.d-on-host.patch
@@ -0,0 +1,21 @@
+--- fuse-2.6.3/util/Makefile.am~ 2007-02-27 22:50:15.000000000 -0600
++++ fuse-2.6.3/util/Makefile.am 2007-02-27 22:53:31.000000000 -0600
+@@ -29,10 +29,6 @@
+ $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+- @if test -x /usr/sbin/update-rc.d; then \
+- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
+- fi
+
+ install-data-local:
+ $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+@@ -42,7 +38,3 @@
+ rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
+ rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
+- @if test -x /usr/sbin/update-rc.d; then \
+- echo "/usr/sbin/update-rc.d fuse remove || true"; \
+- /usr/sbin/update-rc.d fuse remove || true; \
+- fi
diff --git a/packages/fuse/fuse_2.6.3.bb b/packages/fuse/fuse_2.6.3.bb
new file mode 100644
index 0000000000..f85860f175
--- /dev/null
+++ b/packages/fuse/fuse_2.6.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+HOMEPAGE = "http://fuse.sf.net"
+LICENSE = "GPL"
+DEPENDS = "fakeroot-native"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \
+ file://not-run-updaterc.d-on-host.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --disable-kernel-module"
+
+fakeroot do_stage() {
+ autotools_stage_all
+}
+
+# Package the fuse utils and libs in seperate packages
+PACKAGES += "lib${PN} libulockmgr"
+FILES_${PN}-dev += "${libdir}/*.la"
+FILES_lib${PN} = "${libdir}/libfuse*.so.*"
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch b/packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch
new file mode 100644
index 0000000000..3406481d66
--- /dev/null
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo/compile.patch
@@ -0,0 +1,13 @@
+Index: gpe-ownerinfo-0.28/Makefile
+===================================================================
+--- gpe-ownerinfo-0.28.orig/Makefile
++++ gpe-ownerinfo-0.28/Makefile
+@@ -40,7 +40,7 @@ all: $(PACKAGE) all-mo
+
+ $(LIB_TARGET): $(LIB_OBJS)
+ rm -f $@
+- ar cq $@ $^
++ $(AR) cq $@ $^
+
+ $(PACKAGE): $(OBJS) $(LIB_TARGET)
+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) -L. -lgpe-ownerinfo
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index f04b9c19be..e17c6a6798 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -5,7 +5,9 @@ SECTION = "gpe"
PRIORITY = "optional"
DEPENDS = "gtk+ libgpewidget"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://compile.patch;patch=1"
do_stage () {
oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
diff --git a/packages/images/openturbostation-image.bb b/packages/images/foonas-image.bb
index 512a15441a..f5a258b3d9 100644
--- a/packages/images/openturbostation-image.bb
+++ b/packages/images/foonas-image.bb
@@ -1,16 +1,11 @@
-DESCRIPTION = "Turbostation image"
-HOMEPAGE = "http://www.kynisk.com/opents"
-LICENSE = "MIT"
+DESCRIPTION = "Foonas image"
+LICENSE = "GPL"
PR = "r0"
DEPENDS = "${MACHINE_TASK_PROVIDER}"
EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=${ERASEBLOCK_SIZE} -D ${SLUGOS_DEVICE_TABLE}"
IMAGE_LINGUAS = ""
-# Setting USE_DEVFS prevents *any* entries being created initially
-# in /dev
-#USE_DEVFS = "1"
-
# This is passed to the image command to build the correct /dev
# directory (because only the image program can make actual
# dev entries!)
@@ -29,55 +24,25 @@ IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_R
IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
# Always just make a new flash image.
-PACK_IMAGE = 'turbostation_pack_image;'
+PACK_IMAGE = '${MACHINE}_pack_image;'
IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
PACK_IMAGE_DEPENDS = ""
#EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}"
-# This hack removes '${MACHINE}' from the end of the arch.conf for ipk,
-# preventing _mach.ipk (with no byte sex) taking precedence over everything
-# else.
-# but we want 'storcenter' in there so kernel modules work correctly.
-#
-#ROOTFS_POSTPROCESS_COMMAND += "sed -i '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';"
-
# These depends define native utilities - they do not get put in the flash and
# are not required to build the image.
IMAGE_TOOLS = ""
#EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
-OPENTURBOSTATION_KERNEL = ""
-# CONFIG:
-# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image
-# SLUGOS_SUPPORT: set to here, see below, added to the image.
-# SLUGOS_KERNEL: set here, kernel modules added to the image
-#
-# Do not override the last two unless you really know what you
-# are doing - there is more information below.
-
-# diff, cpio and find are required for reflash and turnup ram.
-# Removing these probably leaves the system bootable, but standard
-# openslug and ucslugc stuff won't work, so only take these out in
-# very non-standard turnkey slugos builds.
-#
-# udev is the default way of handling devices, there is no guarantee
-# that the static device table is completely correct (it is just
-# known to be sufficient for boot.)
-# we'ere still on 2.6.12 devfs....
-#OPENPROTIUM_SUPPORT ?= "diffutils cpio findutils udev"
-#
-OPENTURBOSTATION_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
-
-# kernel-module-af-packet must be in the image for DHCP to work
-# kernel-module-netconsole is here because it is small and is
-# highly useful on minimal systems (which really don't have anywhere
-# other than the network to output error messages!)
+FOONAS_SUPPORT += "diffutils cpio findutils uboot-utils udev"
# this gets /lib/modules made....
+FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \
+ kernel-module-usb-storage"
RDEPENDS = " \
base-files base-passwd netbase \
- busybox initscripts-openturbostation openturbostation-init \
+ busybox initscripts foonas-init \
update-modules sysvinit tinylogin \
module-init-tools-depmod modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
@@ -88,15 +53,16 @@ RDEPENDS = " \
mdadm \
hdparm \
mtd-utils \
- xfsprogs \
udev \
- ${OPENTURBOSTATION_SUPPORT} \
- ${OPENTURBOSTATION_KERNEL} "
+ ${FOONAS_SUPPORT} \
+ ${FOONAS_KERNEL} "
PACKAGE_INSTALL = "${RDEPENDS}"
inherit image
+# At this point you have to make a ${MACHINE}_pack_image for your machine.
+
turbostation_pack_image() {
# find latest kernel
KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb
index 472000f4f0..25d38cf1c3 100644
--- a/packages/images/openprotium-image.bb
+++ b/packages/images/openprotium-image.bb
@@ -83,7 +83,7 @@ RDEPENDS = " \
kernel base-files base-passwd netbase \
busybox initscripts-openprotium openprotium-init \
update-modules sysvinit tinylogin \
- module-init-tools modutils-initscripts \
+ module-init-tools-depmod modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
libgcc1 \
portmap \
@@ -92,11 +92,6 @@ RDEPENDS = " \
mdadm \
hdparm \
mtd-utils \
- sccd \
- util-linux-mount \
- util-linux-umount \
- util-linux-swaponoff \
- util-linux-losetup \
${OPENPROTIUM_SUPPORT} \
${OPENPROTIUM_KERNEL} "
# ${SLUGOS_EXTRA_RDEPENDS}"
diff --git a/packages/openturbostation-init/files/.mtn2git_empty b/packages/initscripts/initscripts-1.0/foonas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/files/.mtn2git_empty
+++ b/packages/initscripts/initscripts-1.0/foonas/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/checkroot.sh b/packages/initscripts/initscripts-1.0/foonas/checkroot.sh
index c69a773482..c69a773482 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/foonas/checkroot.sh
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/devices b/packages/initscripts/initscripts-1.0/foonas/devices
index f83ea63598..f83ea63598 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/devices
+++ b/packages/initscripts/initscripts-1.0/foonas/devices
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/domainname.sh b/packages/initscripts/initscripts-1.0/foonas/domainname.sh
index 7113467d8c..7113467d8c 100644
--- a/packages/initscripts/initscripts-1.0/openturbostation/domainname.sh
+++ b/packages/initscripts/initscripts-1.0/foonas/domainname.sh
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/halt b/packages/initscripts/initscripts-1.0/foonas/halt
index f22d892d46..f22d892d46 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/halt
+++ b/packages/initscripts/initscripts-1.0/foonas/halt
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/reboot b/packages/initscripts/initscripts-1.0/foonas/reboot
index 05a82be4c0..05a82be4c0 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/reboot
+++ b/packages/initscripts/initscripts-1.0/foonas/reboot
diff --git a/packages/initscripts/initscripts-openturbostation_1.0.bb b/packages/initscripts/initscripts-openturbostation_1.0.bb
deleted file mode 100644
index 68e291f566..0000000000
--- a/packages/initscripts/initscripts-openturbostation_1.0.bb
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# OpenTurbostation stuff sorta specific for the turbostation
-#
-# This is, in effect, an extended patch to fix various
-# problems in the initscripts on SlugOS. The problems
-# mostly come down to the order the scripts are executed
-# in.
-include initscripts_${PV}.bb
-
-RCONFLICTS = "initscripts"
-# All other standard definitions inherited from initscripts
-# Except the PR which is hacked here. The format used is
-# a suffix
-PR := "${PR}.11"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = "${PN}"
-
-SRC_URI += "file://openturbostation/domainname.sh"
-SRC_URI += "file://openturbostation/devices"
-SRC_URI += "file://openturbostation/halt"
-SRC_URI += "file://openturbostation/reboot"
-SRC_URI += "file://openturbostation/checkroot.sh"
-
-# Without this it is not possible to patch checkroot.sh
-S = "${WORKDIR}"
-
-do_install_append() {
- # the image build command now installs this for slugos
- # except that mine doesn't. we don't need it, but we turnup
- # expects it to at least exist
- rm ${D}${sysconfdir}/device_table
- touch ${D}${sysconfdir}/device_table
-
- # openprotium specific scripts
- # install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/domainname.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/halt ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/reboot ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/devices ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/checkroot.sh ${D}${sysconfdir}/init.d
-
- # Remove the do install links (this detects a change to the
- # initscripts .bb file - it will cause a build failure here.)
- # This is a copy of the ln -sf lines from the initscripts
- # do_install.
- rm ${D}${sysconfdir}/rc2.d/S99rmnologin
- rm ${D}${sysconfdir}/rc3.d/S99rmnologin
- rm ${D}${sysconfdir}/rc4.d/S99rmnologin
- rm ${D}${sysconfdir}/rc5.d/S99rmnologin
- rm ${D}${sysconfdir}/rc6.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc6.d/S30urandom
- rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc6.d/S40umountfs
- rm ${D}${sysconfdir}/rcS.d/S30ramdisk
- rm ${D}${sysconfdir}/rc6.d/S90reboot
- rm ${D}${sysconfdir}/rc0.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc0.d/S30urandom
- rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc0.d/S40umountfs
- rm ${D}${sysconfdir}/rc0.d/S90halt
- rm ${D}${sysconfdir}/rcS.d/S02banner
- rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh
-# rm ${D}${sysconfdir}/rcS.d/S30checkfs.sh
- rm ${D}${sysconfdir}/rcS.d/S35mountall.sh
- rm ${D}${sysconfdir}/rcS.d/S39hostname.sh
- rm ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
- rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
-# rm ${D}${sysconfdir}/rcS.d/S55urandom
- rm ${D}${sysconfdir}/rcS.d/S99finish
- rm ${D}${sysconfdir}/rcS.d/S05devices
- # udev will run at S04 if installed
- rm ${D}${sysconfdir}/rcS.d/S03sysfs
- rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm -f ${D}${sysconfdir}/rcS.d/S06alignment
- rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
- rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
- rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
-
-
-
- # Check the result
- find ${D}${sysconfdir}/rc?.d ! -type d -print | {
- status=0
- while read d
- do
- oenote "initscripts-openturbostation: unexpected link $d"
- status=1
- done
- test $status -eq 0 ||
- oefatal "initscripts-openturbostation: new links break do_install"
- }
-
- # Set the run-level links
- #
- # Startup (S) links - UNCHANGED
- #
- # Keep these in order of startup - S, then 1, 2-5, 0,6
- # according to the level in which the script starts (or stops) first.
- update-rc.d -r ${D} banner start 2 S .
- update-rc.d -r ${D} sysfs.sh start 3 S .
- # udev runs at S 04 .
- update-rc.d -r ${D} devices start 5 S .
- # update-rc.d -r ${D} alignment.sh start 7 S .
- # busybox hwclock.sh (slugos-init) starts here (08)
- # slugos-init umountinitrd runs here (09)
-
- update-rc.d -r ${D} checkroot.sh start 10 S .
- # slugos buffer syslog starts here (11)
- # sysconfsetup runs at S 12
- # modutils.sh runs at S 20
- # checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
- # ramdisk is not used on SlugOS, would run at S 30
- update-rc.d -r ${D} mountall.sh start 35 S .
- # base-files populate-volatile.sh runs at S37
- update-rc.d -r ${D} devpts.sh start 38 S .
- # slugos file syslog starts here (39)
- update-rc.d -r ${D} populate-volatile.sh start 37 S .
-
- # set hostname and domainname before the network script works (by
- # entering them at level 40), networking may reset them.
- update-rc.d -r ${D} domainname.sh start 40 S .
- update-rc.d -r ${D} hostname.sh start 40 S .
- # network runs at S 40
- # slugos network syslog starts here (44)
- update-rc.d -r ${D} mountnfs.sh start 45 S .
-
- update-rc.d -r ${D} bootmisc.sh start 55 S .
- # urandom is currently disabled from S 55 (and won't work with tmpfs /var)
-
- # ipkg-cl configure runs at S 98
- update-rc.d -r ${D} finish start 99 S .
-
- #
- # User (2-5) links - UNCHANGED
- # rmnologin is the only thing added to user levels
- update-rc.d -r ${D} rmnologin start 99 2 3 4 5 .
-
- #
- # Shutdown (0,6) links - !!!CHANGED!!!
- #
- # The problem here is that netbase installs K40networking but portmap
- # installs S32portmap. One of these has to change! The safe change
- # is to make the networking stop at S40, so all network related shutdown
- # must be in a K script or <S40.
- #
- # S20sendsigs is a disaster. It needs to happen before the umounts
- # but after the portmapper (which it would otherwise kill).
- #
- # urandom would stop at (S)30
-
- # This is the special, correct, slugos umountnfs.sh (it looks in
- # the /proc/mounts information, not /etc/fstab)
- update-rc.d -r ${D} umountnfs.sh start 31 0 6 .
- update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
- # portmap stops at 32
- # slugos network syslog stops here (39)
- # networking stops at 40 (nothing else does, believe me.)
-
- # busybox hwclock.sh (slugos-init) stops here (45)
- # slugos file syslog stops here (47)
- # slugos buffer syslog stops here (49)
- # udev stops here (55)
- # Remove any errant processes
- update-rc.d -r ${D} sendsigs start 60 0 6 .
-
- # This is the special, correct, slugos umountfs, it will umount
- # any network file systems which failed to umount before.
- update-rc.d -r ${D} umountfs start 70 0 6 .
-
- update-rc.d -r ${D} halt start 90 0 .
- update-rc.d -r ${D} reboot start 90 6 .
-}
diff --git a/packages/openturbostation-init/files/boot/.mtn2git_empty b/packages/iptables/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/files/boot/.mtn2git_empty
+++ b/packages/iptables/files/.mtn2git_empty
diff --git a/packages/iptables/files/compile.patch b/packages/iptables/files/compile.patch
new file mode 100644
index 0000000000..76662d9748
--- /dev/null
+++ b/packages/iptables/files/compile.patch
@@ -0,0 +1,17 @@
+Index: iptables-1.3.3/extensions/Makefile
+===================================================================
+--- iptables-1.3.3.orig/extensions/Makefile
++++ iptables-1.3.3/extensions/Makefile
+@@ -67,10 +67,10 @@ endif
+
+ ifdef NO_SHARED_LIBS
+ extensions/libext.a: $(EXT_OBJS)
+- rm -f $@; ar crv $@ $(EXT_OBJS)
++ rm -f $@; $(AR) crv $@ $(EXT_OBJS)
+
+ extensions/libext6.a: $(EXT6_OBJS)
+- rm -f $@; ar crv $@ $(EXT6_OBJS)
++ rm -f $@; $(AR) crv $@ $(EXT6_OBJS)
+
+ extensions/initext.o: extensions/initext.c
+ extensions/initext6.o: extensions/initext6.c
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
index fe43ff488e..213802d17f 100644
--- a/packages/iptables/iptables_1.2.9.bb
+++ b/packages/iptables/iptables_1.2.9.bb
@@ -1,9 +1,10 @@
SECTION = "console/network"
DESCRIPTION = "iptables network filtering tools"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
+ file://compile.patch;patch=1"
S = "${WORKDIR}/iptables-${PV}"
diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb
index 4c500ad5b1..5f19d45317 100644
--- a/packages/iptables/iptables_1.3.3.bb
+++ b/packages/iptables/iptables_1.3.3.bb
@@ -3,14 +3,15 @@ HOMEPAGE = "http://www.netfilter.org/"
SECTION = "console/utils"
LICENSE = "GPL"
RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r3"
+PR = "r4"
PACKAGES =+ "${PN}-utils"
FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
+SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
+ file://compile.patch;patch=1"
S = "${WORKDIR}/iptables-${PV}"
diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb
index 95a15d7d23..ee5580b1de 100644
--- a/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/packages/irda-utils/irda-utils_0.9.16.bb
@@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \
such as phones and laptops."
SECTION = "base"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
file://configure.patch;patch=1 \
@@ -28,5 +28,5 @@ do_install () {
oe_runmake -C irdaping ROOT="${D}" install
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/irattach
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
}
diff --git a/packages/libftdi/files/ftdi_eeprom-0.2-moko.patch b/packages/libftdi/files/ftdi_eeprom-0.2-moko.patch
new file mode 100644
index 0000000000..ae0ee6235a
--- /dev/null
+++ b/packages/libftdi/files/ftdi_eeprom-0.2-moko.patch
@@ -0,0 +1,16 @@
+--- ftdi_eeprom-0.2/ftdi_eeprom/main.c 2004-03-25 19:58:08.000000000 +0100
++++ ftdi_eeprom-0.2-moko/ftdi_eeprom/main.c 2007-02-16 01:23:40.000000000 +0100
+@@ -135,8 +135,11 @@
+
+ i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
+ if (i != 0) {
+- printf("Sorry, unable to find FTDI USB chip\n");
+- exit (-1);
++ i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
++ if (i != 0) {
++ printf("Sorry, unable to find FTDI USB chip\n");
++ exit (-1);
++ }
+ }
+ }
+ }
diff --git a/packages/libftdi/ftdi-eeprom-native_0.2.bb b/packages/libftdi/ftdi-eeprom-native_0.2.bb
new file mode 100644
index 0000000000..1b48bd08f7
--- /dev/null
+++ b/packages/libftdi/ftdi-eeprom-native_0.2.bb
@@ -0,0 +1,8 @@
+require ftdi-eeprom_${PV}.bb
+
+DEPENDS = "libftdi-native confuse-native"
+
+do_stage() {
+ install -m 0755 ftdi_eeprom/ftdi_eeprom ${STAGING_BINDIR_NATIVE}
+}
+
diff --git a/packages/libftdi/ftdi-eeprom_0.2.bb b/packages/libftdi/ftdi-eeprom_0.2.bb
new file mode 100644
index 0000000000..c71ac8d0c3
--- /dev/null
+++ b/packages/libftdi/ftdi-eeprom_0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "ftdi-eeprom is a flashing utility for FTDI chips."
+HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi"
+LICENSE = "GPL"
+DEPENDS = "libftdi confuse"
+PR = "r1"
+
+SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/ftdi_eeprom-${PV}.tar.gz \
+ file://ftdi_eeprom-0.2-moko.patch;patch=1"
+S = "${WORKDIR}/ftdi_eeprom-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-docs"
diff --git a/packages/libftdi/libftdi_0.8.bb b/packages/libftdi/libftdi_0.8.bb
index f7426ceb1a..451d2e302f 100644
--- a/packages/libftdi/libftdi_0.8.bb
+++ b/packages/libftdi/libftdi_0.8.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV
file://doxygen-configure.patch;patch=1"
S = "${WORKDIR}/libftdi-${PV}"
-inherit autotools
+inherit autotools binconfig pkgconfig lib_package
EXTRA_OECONF = "--disable-docs"
diff --git a/packages/libopie/libopie2/exports.patch b/packages/libopie/libopie2/exports.patch
new file mode 100644
index 0000000000..2ff06287be
--- /dev/null
+++ b/packages/libopie/libopie2/exports.patch
@@ -0,0 +1,11 @@
+--- libopie2/opiecore/ostorageinfo.h.org 2007-03-09 11:20:17.000000000 +0000
++++ libopie2/opiecore/ostorageinfo.h 2007-03-08 23:43:56.000000000 +0000
+@@ -35,7 +35,7 @@
+ namespace Opie {
+ namespace Core {
+
+-class OStorageInfo : public StorageInfo
++class Q_EXPORT OStorageInfo : public StorageInfo
+ {
+ Q_OBJECT
+
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index d6403d645a..1979f5e95e 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,13 +1,14 @@
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r4"
+PR = "r6"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
- file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \
- file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
+ file://exports.patch;patch=1 \
file://include.pro"
+# file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
+
SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 342c7d643b..77ba0f62ec 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -16,10 +16,10 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
do_compile_prepend_mnci () {
ln -s custom-ramses.h custom.h
@@ -76,4 +76,4 @@ do_install() {
FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*"
FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
diff --git a/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
new file mode 100644
index 0000000000..54dd5947de
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
@@ -0,0 +1,113 @@
+? 1.diff
+? library/1.diff
+Index: library/qpeapplication.cpp
+===================================================================
+RCS file: /cvs/opie/library/qpeapplication.cpp,v
+retrieving revision 1.115
+diff -u -r1.115 qpeapplication.cpp
+--- library/qpeapplication.cpp 27 Sep 2005 21:04:59 -0000 1.115
++++ library/qpeapplication.cpp 11 Jan 2007 06:12:50 -0000
+@@ -101,6 +101,7 @@
+
+
+ static bool useBigPixmaps = 0;
++static bool saveWindowsPos = 0;
+
+ class HackWidget : public QWidget
+ {
+@@ -129,6 +130,7 @@
+ fontSize = cfg.readNumEntry( "FontSize", 10 );
+ smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
+ bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
++ saveWindowsPos = cfg.readBoolEntry( "AllowWindowed", false );
+ #ifdef OPIE_WITHROHFEEDBACK
+ RoH = 0;
+ #endif
+@@ -250,7 +252,8 @@
+
+ static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
+ {
+-#ifndef OPIE_NO_WINDOWED
++ if (!saveWindowsPos)
++ return FALSE;
+ maximized = TRUE;
+ // 350 is the trigger in qwsdefaultdecoration for providing a resize button
+ if ( qApp->desktop()->width() <= 350 )
+@@ -272,8 +275,6 @@
+
+ return TRUE;
+ }
+-#endif
+- return FALSE;
+ }
+
+
+@@ -322,7 +323,8 @@
+ {
+ if( !w )
+ return;
+-#ifndef OPIE_NO_WINDOWED
++ if (!saveWindowsPos)
++ return;
+ // 350 is the trigger in qwsdefaultdecoration for providing a resize button
+ if ( qApp->desktop()->width() <= 350 )
+ return;
+@@ -343,7 +345,6 @@
+ QString s;
+ s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() );
+ cfg.writeEntry( app, s );
+-#endif
+ }
+
+ static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
+@@ -2207,6 +2208,11 @@
+ quit();
+ }
+
++bool QPEApplication::isSaveWindowsPos()
++{
++ return saveWindowsPos;
++}
++
+ #if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
+ extern "C" void __cxa_pure_virtual();
+
+Index: library/qpeapplication.h
+===================================================================
+RCS file: /cvs/opie/library/qpeapplication.h,v
+retrieving revision 1.35
+diff -u -r1.35 qpeapplication.h
+--- library/qpeapplication.h 4 Oct 2005 19:38:19 -0000 1.35
++++ library/qpeapplication.h 11 Jan 2007 06:12:50 -0000
+@@ -137,6 +137,8 @@
+
+ int exec();
+
++ static bool isSaveWindowsPos();
++
+ signals:
+ void clientMoused();
+ void timeChanged();
+Index: library/widget_showing.cpp
+===================================================================
+RCS file: /cvs/opie/library/widget_showing.cpp,v
+retrieving revision 1.4
+diff -u -r1.4 widget_showing.cpp
+--- library/widget_showing.cpp 19 Apr 2005 13:27:29 -0000 1.4
++++ library/widget_showing.cpp 11 Jan 2007 06:12:50 -0000
+@@ -52,13 +52,8 @@
+ return;
+ }
+
+-#ifdef OPIE_NO_WINDOWED
+- Q_UNUSED( nomax )
+- if ( TRUE ) {
+-#else
+- if ( !nomax
+- && ( qApp->desktop()->width() <= 320 ) ){
+-#endif
++ if ( !isSaveWindowsPos() || (!nomax
++ && ( qApp->desktop()->width() <= 30 )) ){
+ wg->showMaximized();
+ } else {
+ #ifdef Q_WS_QWS
diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb
index 21ffea194e..009a075091 100644
--- a/packages/libqpe/libqpe-opie_1.2.2.bb
+++ b/packages/libqpe/libqpe-opie_1.2.2.bb
@@ -1,7 +1,8 @@
require ${PN}.inc
-PR = "r1"
+PR = "r3"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
+ file://save-windows-pos-dynamic.patch;patch=1 \
file://fix-titleheight.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 3dafddcf0a..7a6cda7b9b 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,8 +1,7 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
-PR = "r1"
+PV = "1.2.2+cvs${SRCDATE}"
+PR = "r7"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1"
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index b16c3d481d..1c9d004d0f 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -211,6 +211,12 @@ do_configure_prepend() {
}
+
+# Kernel module dependencies
+
+RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
+
+
# MACHID and LE handling
#
# This mach_fixup function adds the required prefix to the image to
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig
index 6322bd14a0..f787d9d1dc 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig
@@ -728,6 +728,7 @@ CONFIG_ISCSI_TCP=m
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_SATA_AHCI is not set
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
@@ -1586,11 +1587,11 @@ CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
# CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -1603,7 +1604,19 @@ CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_GARMIN=m
CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-# CONFIG_USB_SERIAL_KEYSPAN is not set
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 94a08509a7..e67803098b 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "768"
+IXP4XX_KERNEL_SVN_REV = "770"
#
# The directory containing the patches to be applied is
# specified below
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r3.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/linux-ezx/wyrm-ts.diff b/packages/linux/linux-ezx/wyrm-ts.diff
new file mode 100644
index 0000000000..a7ec75613c
--- /dev/null
+++ b/packages/linux/linux-ezx/wyrm-ts.diff
@@ -0,0 +1,119 @@
+--- /tmp/pcap_ts.c 2007-02-04 16:55:21.000000000 -0200
++++ linux-2.6.16/drivers/input/touchscreen/pcap_ts.c 2007-02-04 18:47:58.000000000 -0200
+@@ -31,7 +31,7 @@
+
+ #include "../../misc/ezx/ssp_pcap.h"
+
+-#if 1
++#if 0
+ #define DEBUGP(x, args ...) printk(KERN_DEBUG "%s: " x, __FUNCTION__, ## args)
+ #else
+ #define DEBUGP(x, args ...)
+@@ -39,6 +39,7 @@
+
+ #define PRESSURE 1
+ #define COORDINATE 2
++#define STANDBY 3
+
+ struct pcap_ts {
+ int irq_xy;
+@@ -97,7 +98,7 @@
+ int ret;
+ u_int32_t tmp;
+ DEBUGP("start xy read in mode %s\n",
+- pcap_ts->read_state == COORDINATE ? "COORD" : "PRESS");
++ pcap_ts->read_state == COORDINATE ? "COORD" : (pcap_ts->read_state == PRESSURE ? "PRESS" : "STANDBY"));
+
+ ret = ezx_pcap_read(SSP_PCAP_ADJ_ADC1_REGISTER, &tmp);
+ if (ret < 0)
+@@ -122,7 +123,7 @@
+ u_int32_t tmp;
+
+ DEBUGP("get xy value in mode %s\n",
+- pcap_ts->read_state == COORDINATE ? "COORD" : "PRESS");
++ pcap_ts->read_state == COORDINATE ? "COORD" : (pcap_ts->read_state == PRESSURE ? "PRESS" : "STANDBY"));
+
+ ret = ezx_pcap_read(SSP_PCAP_ADJ_ADC2_REGISTER, &tmp);
+ if (ret < 0)
+@@ -145,7 +146,16 @@
+ static irqreturn_t pcap_ts_irq_xy(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ struct pcap_ts *pcap_ts = dev_id;
++// DEBUGP("read_state: %d\n", pcap_ts->read_state);
+
++ /*
++ * Ignore further read interrupts after we set STANDBY - WM
++ */
++ if (pcap_ts->read_state == STANDBY)
++ {
++ DEBUGP("ignored\n");
++ return IRQ_HANDLED;
++ }
+ if (pcap_ts_get_xy_value(pcap_ts) < 0) {
+ printk("pcap_ts: error reading XY value\n");
+ return IRQ_HANDLED;
+@@ -160,33 +170,32 @@
+ pcap_ts->pressure <= PRESSURE_MIN ) &&
+ pcap_ts->pressure == pcap_ts->pressure_last) {
+ /* pen has been released */
++ DEBUGP("UP\n");
+ input_report_key(pcap_ts->input, BTN_TOUCH, 0);
+- input_sync(pcap_ts->input);
+-
+ input_report_abs(pcap_ts->input, ABS_PRESSURE, 0);
++ input_sync(pcap_ts->input);
+
+ pcap_ts->x = pcap_ts->y = 0;
+
++ /* no need for timer, we'll get interrupted with
++ * next touch down event */
++ del_timer(&pcap_ts->timer);
++
+ /* ask PCAP2 to interrupt us if touch event happens
+ * again */
+- pcap_ts->read_state = PRESSURE;
++ pcap_ts->read_state = STANDBY;
+ pcap_ts_mode(PCAP_TS_STANDBY_MODE);
+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_MSR_TSM, 0);
+-
+- /* no need for timer, we'll get interrupted with
+- * next touch down event */
+- del_timer(&pcap_ts->timer);
+ } else {
+ /* pen has been touched down */
++ DEBUGP("DOWN\n");
++
+ input_report_key(pcap_ts->input, BTN_TOUCH, 1);
+ /* don't input_sync(), we don't know position yet */
+
+ if (pcap_ts->pressure == 0)
+ pcap_ts->pressure = pcap_ts->pressure_last;
+
+- input_report_abs(pcap_ts->input, ABS_PRESSURE,
+- pcap_ts->pressure);
+-
+ /* switch state machine into coordinate read mode */
+ pcap_ts->read_state = COORDINATE;
+ pcap_ts_mode(PCAP_TS_POSITION_XY_MEASUREMENT);
+@@ -196,18 +205,14 @@
+ /* we are in coordinate mode */
+ if (pcap_ts->x <= X_AXIS_MIN || pcap_ts->x >= X_AXIS_MAX ||
+ pcap_ts->y <= Y_AXIS_MIN || pcap_ts->y >= Y_AXIS_MAX) {
+- DEBUGP("invalid x/y coordinate position: PEN_UP?\n");
+-
++ DEBUGP("PEN_UP?\n");
+ pcap_ts->pressure = 0;
+-#if 0
+- input_report_key(pcap_ts->input, BTN_TOUCH, 0);
+- pcap_ts->x = pcap_ts->y = 0;
+-#endif
+ } else {
++ input_report_abs(pcap_ts->input, ABS_PRESSURE, pcap_ts->pressure);
+ input_report_abs(pcap_ts->input, ABS_X, pcap_ts->x);
+ input_report_abs(pcap_ts->input, ABS_Y, pcap_ts->y);
++ input_sync(pcap_ts->input);
+ }
+- input_sync(pcap_ts->input);
+
+ /* switch back to pressure read mode */
+ pcap_ts->read_state = PRESSURE;
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 2775a744d3..1e6d3e2506 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openezx.org"
LICENSE = "GPL"
DEPENDS += "quilt-native"
EZX = "ezx9"
-PR = "${EZX}-r1"
+PR = "${EZX}-r2"
inherit kernel
@@ -20,7 +20,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
\
file://logo_linux_clut224.ppm \
file://defconfig-a780 \
- file://defconfig-e680"
+ file://defconfig-e680 \
+ file://wyrm-ts.diff;patch=1"
S = "${WORKDIR}/linux-2.6.16"
##############################################################
diff --git a/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb b/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb
index 8b65609687..b5202fc0f5 100644
--- a/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb
+++ b/packages/linux/linux-ezx_2.6.19+2.6.20-rc2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openezx.org"
LICENSE = "GPL"
DEPENDS += "quilt-native"
EZX = "ezx0"
-PR = "${EZX}-r1"
+PR = "${EZX}-r2"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_rokr-e2 = "1"
@@ -30,7 +30,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
${DMSRC}/sumatra.c.patch;patch=1;pnum=1 \
${DMSRC}/uncompress.h.patch;patch=1;pnum=5 \
file://logo_linux_clut224.ppm \
- file://defconfig-${MACHINE}"
+ file://defconfig-${MACHINE} \
+ file://wyrm-ts.diff;patch=1"
S = "${WORKDIR}/linux-2.6.19"
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index 3504014ffd..49446a772a 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r5"
+PR = "r6"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -39,6 +39,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
${RPSRC}/poodle_pm-r3.patch;patch=1 \
${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
${RPSRC}/w100_extaccel-r0.patch;patch=1 \
+ ${RPSRC}/w100_extmem-r0.patch;patch=1 \
file://hostap-monitor-mode.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/linux/linux-turbostation/defconfig b/packages/linux/linux-turbostation/defconfig
index e0cb5f373f..4930877637 100644
--- a/packages/linux/linux-turbostation/defconfig
+++ b/packages/linux/linux-turbostation/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20.1
-# Wed Mar 7 20:28:41 2007
+# Thu Mar 8 19:11:26 2007
#
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
@@ -1526,19 +1526,6 @@ CONFIG_USB_TRANCEVIBRATOR=m
# USB Gadget Support
#
# CONFIG_USB_GADGET is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
#
# MMC/SD Card support
@@ -1646,7 +1633,7 @@ CONFIG_XFS_POSIX_ACL=y
# CONFIG_XFS_RT is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
+CONFIG_MINIX_FS=m
CONFIG_ROMFS_FS=m
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.1.bb
index dc4374ef17..a74bf1475a 100644
--- a/packages/linux/linux-turbostation_2.6.20.1.bb
+++ b/packages/linux/linux-turbostation_2.6.20.1.bb
@@ -2,31 +2,12 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS = "uboot-utils"
-PR = "r5"
-
-# notes on iom def kernel:
-#
-# can probably remove :
-# BLK_DEV_RAM ?
-# MD_RAID5
-# QUOTA
-# QFMT_V2
-# DNOTIFY?
-# MSDOS_FS, VFAT_FS, NTFS_FS?
-#
-# USB_GADGET? - USB_GADGET_NET2280, USB_ETH, USB_ETH_RNDIS
-#
-#
-# should add:
-# EXT3_FS
-# PACKET_MMAP ?
-# i2c_chardev?
-# usb audio:
-# USB_EMI62?
-# USB_EMI26?
+PR = "r6"
COMPATIBLE_MACHINE = "turbostation"
+RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
+
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://001_r1000.diff;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch
index 3f28d9eace..7cf2f28c89 100644
--- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch
+++ b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch
@@ -1,6 +1,6 @@
diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kconfig
--- linux-2.6.20.vanilla/drivers/mfd/Kconfig 2007-02-10 19:01:56.000000000 +0100
-+++ linux-2.6.20/drivers/mfd/Kconfig 2007-02-14 16:30:15.000000000 +0100
++++ linux-2.6.20/drivers/mfd/Kconfig 2007-02-28 16:36:01.000000000 +0100
@@ -23,4 +23,7 @@
tristate "Touchscreen interface support"
depends on MCP_UCB1200 && INPUT
@@ -11,7 +11,7 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kcon
endmenu
diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Makefile
--- linux-2.6.20.vanilla/drivers/mfd/Makefile 2007-02-10 19:01:56.000000000 +0100
-+++ linux-2.6.20/drivers/mfd/Makefile 2007-02-14 16:30:15.000000000 +0100
++++ linux-2.6.20/drivers/mfd/Makefile 2007-02-28 16:36:01.000000000 +0100
@@ -6,7 +6,7 @@
obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o
obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o
@@ -23,8 +23,8 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Mak
endif
diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drivers/mfd/ucb1x00-switches.c
--- linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c 2007-02-14 16:32:57.000000000 +0100
-@@ -0,0 +1,204 @@
++++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c 2007-02-28 16:36:43.000000000 +0100
+@@ -0,0 +1,162 @@
+/*
+ * linux/drivers/mfd/ucb1x00-switches.c
+ *
@@ -52,6 +52,8 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
+
+#include "ucb1x00.h"
+
++static int key [6] = { KEY_PROG1,KEY_PROG2,KEY_UP,KEY_DOWN,KEY_LEFT,KEY_RIGHT };
++
+struct ucb1x00_switches {
+ struct input_dev *idev;
+ struct ucb1x00 *ucb;
@@ -63,6 +65,7 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
+ unsigned short int this;
+ struct ucb1x00_switches *switches = id;
+ struct input_dev *idev = switches->idev;
++
+ ucb1x00_enable(switches->ucb);
+
+ this=~ucb1x00_io_read(switches->ucb);
@@ -71,61 +74,16 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive
+ }
+
+ last=this;
-+ switch (idx) {
-+
-+ case 0:
-+
-+ if
-+ ((this & (1<<0)) != 0) input_report_key(idev, KEY_PROG1, 1);
-+ else
-+ input_report_key(idev, KEY_PROG1, 0);
-+ break;
-+
-+ case 1:
-+
-+ if
-+ ((this & (1<<1)) != 0) input_report_key(idev, KEY_PROG2, 1);
-+ else
-+ input_report_key(idev, KEY_PROG2, 0);
-+ break;
-+
-+ case 2:
-+
-+ if
-+ ((this & (1<<2)) != 0) input_report_key(idev, KEY_UP, 1);
-+ else
-+ input_report_key(idev, KEY_UP, 0);
-+ break;
-+
-+ case 3:
-+
-+ if
-+ ((this & (1<<3)) != 0) input_report_key(idev, KEY_DOWN, 1);
-+ else
-+ input_report_key(idev, KEY_DOWN, 0);
-+ break;
-+
-+ case 4:
-+
-+ if
-+ ((this & (1<<4)) != 0) input_report_key(idev, KEY_LEFT, 1);
-+ else
-+ input_report_key(idev, KEY_LEFT, 0);
-+ break;
-+
-+ case 5:
-+
-+ if
-+ ((this & (1<<5)) != 0) input_report_key(idev, KEY_RIGHT, 1);
-+ else
-+ input_report_key(idev, KEY_RIGHT, 0);
-+ break;
-+
-+ default:
-+
++
++ if ((idx >=0) && (idx <=5)) {
++ if ((this & (1<<idx)) != 0) input_report_key(idev, key[idx], 1);
++ else input_report_key(idev, key[idx], 0);
++ }
++ else {
+ printk(KERN_DEBUG "switches-ucb1x00 is BUGGY!!! \n");
-+
++ return;
+ }
++
+}
+
+static int ucb1x00_switches_add(struct ucb1x00_dev *dev)
diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb
index 893856a16a..af73514988 100644
--- a/packages/linux/linux_2.6.20.bb
+++ b/packages/linux/linux_2.6.20.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Linux Kernel"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://defconfig"
diff --git a/packages/openturbostation-init/files/initscripts/.mtn2git_empty b/packages/ltp/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/files/initscripts/.mtn2git_empty
+++ b/packages/ltp/.mtn2git_empty
diff --git a/packages/ltp/ltp-20070228/.mtn2git_empty b/packages/ltp/ltp-20070228/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ltp/ltp-20070228/.mtn2git_empty
diff --git a/packages/ltp/ltp-20070228/cross-compile.patch b/packages/ltp/ltp-20070228/cross-compile.patch
new file mode 100644
index 0000000000..ae956fd8bf
--- /dev/null
+++ b/packages/ltp/ltp-20070228/cross-compile.patch
@@ -0,0 +1,51 @@
+diff -urN ltp-full-20060615.orig/Makefile ltp-full-20060615/Makefile
+--- ltp-full-20060615.orig/Makefile 2006-02-24 10:16:55.000000000 +0800
++++ ltp-full-20060615/Makefile 2006-07-07 17:10:22.000000000 +0800
+@@ -30,11 +30,12 @@
+ endif
+ ifdef CROSS_COMPILER
+ CC=$(CROSS_COMPILER)gcc
++CPP=$(CROSS_COMPILER)g++
+ AR=$(CROSS_COMPILER)ar
+ endif
+
+ export CFLAGS += -Wall $(CROSS_CFLAGS)
+-export CC AR LDFLAGS
++export CC AR LDFLAGS CPP
+
+ -include config.mk
+
+diff -urN ltp-full-20060615.orig/testcases/ballista/ballista/Makefile ltp-full-20060615/testcases/ballista/ballista/Makefile
+--- ltp-full-20060615.orig/testcases/ballista/ballista/Makefile 2006-02-23 08:33:27.000000000 +0800
++++ ltp-full-20060615/testcases/ballista/ballista/Makefile 2006-07-07 17:11:29.000000000 +0800
+@@ -24,7 +24,7 @@
+ ########################
+
+ # compiler info for the host
+-CC = g++ -Wno-deprecated
++CC = $(CPP) -Wno-deprecated
+ CFLAGS = -w -O ${TARGET_DEF}
+ CLIBS = -lpthread -ldl -lnsl -rdynamic
+ TEST_MAN_FILE = selfHost
+diff -urN ltp-full-20060615.orig/testcases/network/nfs/cthon04/tests.init ltp-full-20060615/testcases/network/nfs/cthon04/tests.init
+--- ltp-full-20060615.orig/testcases/network/nfs/cthon04/tests.init 2005-09-01 04:27:17.000000000 +0800
++++ ltp-full-20060615/testcases/network/nfs/cthon04/tests.init 2006-07-07 17:12:28.000000000 +0800
+@@ -73,7 +73,7 @@
+ # Tru64 UNIX
+ # SVR4
+ # Linux
+-PATH=/bin:/usr/bin:/usr/ucb:/usr/ccs/bin:/sbin:/usr/sbin:.
++#PATH=/bin:/usr/bin:/usr/ucb:/usr/ccs/bin:/sbin:/usr/sbin:.
+
+ # Use this path for:
+ # DG/UX
+@@ -104,7 +104,9 @@
+ # Do not remove the following three lines. They may be overridden by
+ # other configuration parameters lower in this file, but these three
+ # variables must be defined.
++ifndef CC
+ CC=cc
++endif
+ CFLAGS=
+ LIBS=
+ LOCKTESTS=tlock
diff --git a/packages/ltp/ltp-20070228/ltp-run b/packages/ltp/ltp-20070228/ltp-run
new file mode 100644
index 0000000000..5d97f00532
--- /dev/null
+++ b/packages/ltp/ltp-20070228/ltp-run
@@ -0,0 +1,4 @@
+#!/bin/sh
+/usr/libexec/ltp/runltp -t 180s > /home/root/testlog.txt
+echo "Benchmark run finished...."
+touch /home/root/testfinished.flag
diff --git a/packages/ltp/ltp-20070228/runltp-path.patch b/packages/ltp/ltp-20070228/runltp-path.patch
new file mode 100644
index 0000000000..dfbbf353ec
--- /dev/null
+++ b/packages/ltp/ltp-20070228/runltp-path.patch
@@ -0,0 +1,13 @@
+Index: runltp
+===================================================================
+--- ltp-full-20060412.orig/runltp 2005-03-12 03:26:14.000000000 +0800
++++ ltp-full-20060412/runltp 2006-04-26 16:42:13.000000000 +0800
+@@ -43,7 +43,7 @@
+ echo "FATAL: unable to change directory to $(dirname $0)"
+ exit 1
+ }
+- export LTPROOT=${PWD}
++ export LTPROOT=/usr/libexec/ltp
+ export TMPBASE="/tmp"
+ export TMP="${TMPBASE}/ltp-$$"
+ export PATH="${PATH}:${LTPROOT}/testcases/bin"
diff --git a/packages/ltp/ltp_20070228.bb b/packages/ltp/ltp_20070228.bb
new file mode 100644
index 0000000000..400d642641
--- /dev/null
+++ b/packages/ltp/ltp_20070228.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Linux Test Project"
+HOMEPAGE = "http://ltp.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
+ file://cross-compile.patch;patch=1 \
+ file://runltp-path.patch;patch=1 \
+ file://ltp-run"
+
+S = "${WORKDIR}/ltp-full-${PV}"
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${HOST_PREFIX}"
+
+do_compile(){
+ oe_runmake CROSS_COMPILE=${HOST_PREFIX}
+}
+
+do_install(){
+ export CREATE=0
+ export LTPROOT=${D}/usr/libexec/ltp/testcases
+
+ oe_runmake install
+
+ install -d ${D}/usr/libexec/ltp/testcases
+ install -d ${D}/usr/libexec/ltp/pan
+
+ #install testcases
+ #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/testcases
+ #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/
+
+ # treecopy testcases pan/pan runtest ver_linux IDcheck.sh \
+ # ${D}/usr/libexec/ltp
+ cp testcases ${D}/usr/libexec/ltp/ -rfp
+ rm ${D}/usr/libexec/ltp/ballista -rf
+ cp pan/pan ${D}/usr/libexec/ltp/pan -p
+ cp runtest ${D}/usr/libexec/ltp/ -rfp
+ cp ver_linux ${D}/usr/libexec/ltp/ -p
+ cp runltp ${D}/usr/libexec/ltp/ -p
+ cp IDcheck.sh ${D}/usr/libexec/ltp/ -p
+}
+
diff --git a/packages/meta/openturbostation-packages.bb b/packages/meta/foonas-packages.bb
index 21c492fb0c..822b7afb2d 100644
--- a/packages/meta/openturbostation-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -1,14 +1,14 @@
-DESCRIPTION = "Packages that are compatible with Openturbostation"
+DESCRIPTION = "Packages that are compatible with FooNAS"
LICENSE = "MIT"
PR = "r1"
CONFLICTS = "db3"
-PROVIDES += "${OPENTURBOSTATION_IMAGENAME}-packages"
+PROVIDES += "${FOONAS_IMAGENAME}-packages"
EXCLUDE_FROM_WORLD = "1"
INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY = "1"
-OPENTURBOSTATION_PACKAGES = "\
+FOONAS_PACKAGES = "\
alsa-lib \
alsa-utils \
apache2 \
@@ -127,18 +127,18 @@ OPENTURBOSTATION_PACKAGES = "\
vlan \
watchdog \
wget \
+ wireless-tools \
zip \
zlib \
"
-OPENTURBOSTATION_EXTRA_PACKAGES ?= ""
+FOONAS_EXTRA_PACKAGES ?= ""
# The package-index at the end causes regeneration of the Packages.gz and
# other control files.
-# openprotium-native \
DEPENDS = "\
- openturbostation-image \
- ${OPENTURBOSTATION_PACKAGES} \
- ${OPENTURBOSTATION_EXTRA_PACKAGES} \
+ foonas-image \
+ ${FOONAS_PACKAGES} \
+ ${FOONAS_EXTRA_PACKAGES} \
package-index \
"
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index 3b4023ba45..281310a2dd 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -78,9 +78,12 @@ SLUGOS_NATIVE = "\
# even on a thumb system (and this can be set in the tool's .bb file),
# however even this doesn't work for very large programs at present
# (only monotone!)
-SLUGOS_NATIVE_THUMB_BROKEN = "\
- monotone-6 \
- "
+####### *-*-* TEMPORARY: mwester - remove monotone as it wont' build.
+#SLUGOS_NATIVE_THUMB_BROKEN = "\
+# monotone-6 \
+# "
+SLUGOS_NATIVE_THUMB_BROKEN = ""
+###### *-*-*
SLUGOS_NATIVE_THUMB_BROKEN_thumb = ""
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 06be00eb67..62d87861d5 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r20"
+PR = "r22"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -107,14 +107,12 @@ SLUGOS_PACKAGES = "\
make \
masqmail \
mdadm \
- mediatomb \
memtester \
mgetty \
miau \
microcom \
minicom \
motion \
- mpd \
mt-daapd \
mtd-utils \
mutt \
@@ -158,6 +156,7 @@ SLUGOS_PACKAGES = "\
sysfsutils \
syslog-ng \
tar \
+ task-mokogateway-everything \
thttpd \
tiff \
tzdata \
@@ -172,6 +171,7 @@ SLUGOS_PACKAGES = "\
wget \
wireless-tools \
wpa-supplicant \
+ zd1211-firmware \
zip \
zlib \
"
@@ -183,6 +183,8 @@ SLUGOS_BROKEN_PACKAGES = "\
gphoto2 \
irssi \
libgphoto2 \
+ mediatomb \
+ mpd \
netpbm \
puppy \
pvrusb2-mci \
diff --git a/packages/mrxvt/files/fix-compile.patch b/packages/mrxvt/files/fix-compile.patch
index 25794dc5fd..c849ffd35e 100644
--- a/packages/mrxvt/files/fix-compile.patch
+++ b/packages/mrxvt/files/fix-compile.patch
@@ -1,19 +1,16 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mrxvt-0.4.1/src/rxvt.h~fix-compile
-+++ mrxvt-0.4.1/src/rxvt.h
-@@ -387,15 +387,8 @@
- ** which in turn is unsafe without checking.
- ** Untainted defines the type of data that is safe.
- */
+Index: mrxvt-0.5.2/src/rxvt.h
+===================================================================
+--- mrxvt-0.5.2.orig/src/rxvt.h
++++ mrxvt-0.5.2/src/rxvt.h
+@@ -488,15 +488,8 @@ typedef char* XPointer;
+ * turn is unsafe without checking. Untainted defines the type of data that is
+ * safe.
+ */
-#ifdef __GNUC__
-# define $tainted
-# define $untainted
--# define TAINTED $tainted
--# define UNTAINTED $untainted
+-# define TAINTED $tainted
+-# define UNTAINTED $untainted
-#else
-# define TAINTED
-# define UNTAINTED
diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.5.2.bb
index 8991295902..4a5b71f0c9 100644
--- a/packages/mrxvt/mrxvt_0.4.1.bb
+++ b/packages/mrxvt/mrxvt_0.5.2.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://materm.sourceforge.net"
AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>"
LICENSE = "GPL"
SECTION = "x11/applications"
-DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng"
+RDEPENDS = "freetype fontconfig libxft"
+DEPENDS = "freetype fontconfig libxft virtual/libx11"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
@@ -11,4 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
inherit autotools
-EXTRA_OECONF = "--enable-everything --disable-debug"
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-everything \
+ --disable-debug"
diff --git a/packages/netbase/netbase/foonas/.mtn2git_empty b/packages/netbase/netbase/foonas/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/foonas/.mtn2git_empty
diff --git a/packages/netbase/netbase/openturbostation/interfaces b/packages/netbase/netbase/foonas/interfaces
index 314715bba7..314715bba7 100644
--- a/packages/netbase/netbase/openturbostation/interfaces
+++ b/packages/netbase/netbase/foonas/interfaces
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index d8a9ba5fa2..e7a6def235 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -5,7 +5,7 @@ PR = "r3"
inherit openmoko-base
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=https"
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
S = "${WORKDIR}"
dirs = "themes/openmoko-standard"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index a919c3094b..98ac64a4c1 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,8 +1,9 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
- ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
- file://sysconfig-bluetooth.patch;patch=1"
+ ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"
+
+# file://sysconfig-bluetooth.patch;patch=1"
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 787b40833f..ccd75ca89a 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,6 +1,5 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html "
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index 3e269e73ef..6532cd170c 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,7 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
${HANDHELDS_CVS};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb
index 94401fab78..9bce52188f 100644
--- a/packages/opie-i18n/opie-lrelease-native_cvs.bb
+++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
+
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb
index 5f2d834b74..e7c33b6da0 100644
--- a/packages/opie-i18n/opie-lupdate-native_cvs.bb
+++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
+
SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \
${HANDHELDS_CVS};module=opie/development/translation/shared"
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index d18339a046..c81cd23eb9 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -1,6 +1,5 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
index 3cb7f8551e..23898147b1 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
index b2e826ae59..bbfbd25e2b 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
index d091f50903..ac3f961b3c 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
index ca44bfc3af..10a119a48a 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Skin for opie-mediaplayer2"
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
APPNAME = "opieplayer2"
+PV = "${OPIE_CVS_PV}"
RPROVIDES = "opie-mediaplayer2-skin"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 2badc15abd..b080b3ce92 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 5080a4d984..fa74824d73 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,8 +1,9 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
- ${HANDHELDS_CVS};module=opie/share \
- file://friendly-button-names.patch;patch=1"
+ ${HANDHELDS_CVS};module=opie/share"
+
+# file://friendly-button-names.patch;patch=1"
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 593ea5bf9c..185ff2f338 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -1,7 +1,6 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/pics-hires"
diff --git a/packages/opie-sh-snes/opie-sh-snes.inc b/packages/opie-sh-snes/opie-sh-snes.inc
index 14c1dcd242..1f1787624a 100644
--- a/packages/opie-sh-snes/opie-sh-snes.inc
+++ b/packages/opie-sh-snes/opie-sh-snes.inc
@@ -5,6 +5,7 @@ LICENSE = "GPL"
RDEPENDS = "opie-sh"
+inherit opie
FILES_${PN} = "/opt/QtPalmtop"
diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index 7c49fdd77b..5f36686636 100644
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,5 +1,4 @@
require ${PN}.inc
-#Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
-
+PV = "${OPIE_CVS_PV}"
+PR = "r1"
diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb
index 818a1c48f1..bbd3046b64 100644
--- a/packages/opie-sounds/opie-sounds_cvs.bb
+++ b/packages/opie-sounds/opie-sounds_cvs.bb
@@ -1,6 +1,5 @@
require ${PN}.inc
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.2+cvs-${SRCDATE}"
+PV = "${OPIE_CVS_PV}"
SRC_URI = "${HANDHELDS_CVS};module=opie/sounds"
diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb
index 241693504e..e0ca1a4084 100644
--- a/packages/qpe-games/hexatrolic_1.0beta3.bb
+++ b/packages/qpe-games/hexatrolic_1.0beta3.bb
@@ -14,6 +14,7 @@ S = "${WORKDIR}/${APPNAME}"
do_install () {
+ install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb
index f6e9299b3d..0a43be2795 100644
--- a/packages/qpe-games/labyrinth_0.7.bb
+++ b/packages/qpe-games/labyrinth_0.7.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz"
S = "${WORKDIR}/${APPNAME}"
do_install () {
+ install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -d ${D}${palmtopdir}/share/games/${APPNAME}/
diff --git a/packages/qpe-games/win4_1.0.1.bb b/packages/qpe-games/win4_1.0.1.bb
index 3541ac9610..9813b33435 100644
--- a/packages/qpe-games/win4_1.0.1.bb
+++ b/packages/qpe-games/win4_1.0.1.bb
@@ -22,6 +22,7 @@ do_compile_prepend() {
}
do_install () {
+ install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
diff --git a/packages/qpe-games/ziq_1.1ern.bb b/packages/qpe-games/ziq_1.1ern.bb
index 626f03d53d..f51805f1d8 100644
--- a/packages/qpe-games/ziq_1.1ern.bb
+++ b/packages/qpe-games/ziq_1.1ern.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://handhelds.org/~zecke/oe_packages/ziq_V1.1ern.tar.gz \
file://ziq.patch;patch=1"
PV = "1.1ern"
+PR = "r1"
S = "${WORKDIR}/ziq_V${PV}"
@@ -19,7 +20,9 @@ APPDESKTOP = "${S}"
do_install () {
+ install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
+ install -d ${D}${palmtopdir}/apps/Games
install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
}
diff --git a/packages/qpe-games/zsubhunt_1.0.0ern.bb b/packages/qpe-games/zsubhunt_1.0.0ern.bb
index d486058bab..0a52c0017a 100644
--- a/packages/qpe-games/zsubhunt_1.0.0ern.bb
+++ b/packages/qpe-games/zsubhunt_1.0.0ern.bb
@@ -18,6 +18,7 @@ APPDESKTOP = "${S}"
do_install () {
+ install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
diff --git a/packages/qpe-games/ztappy_0.9.3ern.bb b/packages/qpe-games/ztappy_0.9.3ern.bb
index 1fe3c5187a..d64a17a7cb 100644
--- a/packages/qpe-games/ztappy_0.9.3ern.bb
+++ b/packages/qpe-games/ztappy_0.9.3ern.bb
@@ -18,6 +18,7 @@ APPTYPE = "binary"
APPDESKTOP = "${S}"
do_install () {
+ install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
diff --git a/packages/rglueap/.mtn2git_empty b/packages/rglueap/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/rglueap/.mtn2git_empty
diff --git a/packages/rglueap/rglueap_0.1.bb b/packages/rglueap/rglueap_0.1.bb
new file mode 100644
index 0000000000..2d6cd2c41b
--- /dev/null
+++ b/packages/rglueap/rglueap_0.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Raw Glue AP"
+SECTION = "console/network"
+HOMEPAGE = "http://rfakeap.tuxfamily.org/#Raw_Glue_AP"
+LICENSE = "GPLv2"
+DEPENDS = "libpcap"
+
+SRC_URI = "http://rfakeap.tuxfamily.org/rglueap-${PV}.tar.gz"
+
+LDFLAGS += "-lpcap"
+
+do_install() {
+ install -d ${D}/${sbindir}
+ install -m 0755 rglueap ${D}/${sbindir}
+}
+
diff --git a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
index 70cc6c7424..53b2d0c8e0 100644
--- a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
+++ b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb
@@ -29,4 +29,4 @@ do_install() {
:
}
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
diff --git a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb
index 55176029ab..60cce4a3e2 100644
--- a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb
+++ b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb
@@ -29,4 +29,4 @@ do_install() {
:
}
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
diff --git a/packages/spandsp/.mtn2git_empty b/packages/spandsp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/spandsp/.mtn2git_empty
diff --git a/packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb b/packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb
new file mode 100644
index 0000000000..2c0ffa0845
--- /dev/null
+++ b/packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "A library of many DSP functions for telephony."
+HOMEPAGE = "http://www.soft-switch.org"
+DEPENDS = "tiff libxml2"
+SECTION = "voip"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz"
+S = "${WORKDIR}/${PN}-0.0.3"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+do_stage () {
+ autotools_stage_all
+} \ No newline at end of file
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index f74d8f8943..5bc38f6a79 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,8 +1,7 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r19"
+PR = "r20"
PACKAGES = "task-base \
- task-base-minimal \
task-base-oh-minimal \
task-base-core-default"
@@ -99,11 +98,10 @@ RDEPENDS_task-base-oh-minimal = "\
${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-RRECOMMENDS_task-base-minimal = "\
+RRECOMMENDS_task-base-oh-minimal = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
-
HOTPLUG ?= "linux-hotplug"
RDEPENDS_task-base-core-default = '\
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
new file mode 100644
index 0000000000..1d05af8c4f
--- /dev/null
+++ b/packages/tasks/task-mokogateway.bb
@@ -0,0 +1,81 @@
+DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PROVIDES = "task-mokogateway-everything"
+PR = "2"
+
+PACKAGES = "\
+ task-mokogateway-everything \
+ ${MOKOGATEWAY_PACKAGES} \
+"
+
+MOKOGATEWAY_PACKAGES = "\
+ task-mokogateway-usbnet \
+ task-mokogateway-bluetooth \
+ task-mokogateway-wifi \
+ task-mokogateway-debug \
+"
+
+RDEPENDS_task-mokogateway-everything = "${MOKOGATEWAY_PACKAGES}"
+
+DESCRIPTION_task-mokogateway-usbnet = "MokoGateway: USB Networking"
+RDEPENDS_task-mokogateway-usbnet = "\
+ iptables \
+"
+RRECOMMENDS_task-mokogateway-usbnet = "\
+ kernel-module-usbnet \
+ kernel-module-cdc-acm \
+ kernel-module-cdc-ether \
+ kernel-module-iptable-nat \
+ kernel-module-ipt-masquerade \
+"
+
+DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth"
+RDEPENDS_task-mokogateway-bluetooth = "\
+ bluez-utils \
+"
+RRECOMMENDS_task-mokogateway-bluetooth = "\
+ kernel-module-bluetooth \
+ kernel-module-l2cap \
+ kernel-module-rfcomm \
+ kernel-module-hci-vhci \
+ kernel-module-bnep \
+ kernel-module-hidp \
+ kernel-module-hci-uart \
+ kernel-module-sco \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)} \
+"
+
+DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi"
+RDEPENDS_task-mokogateway-wifi = "\
+ wireless-tools \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
+ wpa-supplicant \
+"
+RRECOMMENDS_task-mokogateway-wifi = "\
+ kernel-module-ieee80211-crypt \
+ kernel-module-ieee80211-crypt-ccmp \
+ kernel-module-ieee80211-crypt-tkip \
+ kernel-module-ieee80211-crypt-wep \
+ kernel-module-arc4 \
+ kernel-module-michael-mic \
+ kernel-module-aes \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-zd1211rw", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "zd1211-firmware", "",d)} \
+"
+
+DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
+RDEPENDS_task-mokogateway-debug = "\
+ dfu-util \
+ ftdi-eeprom \
+ openocd \
+"
+RRECOMMENDS_task-mokogateway-debug = "\
+"
+
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
new file mode 100644
index 0000000000..34fca7bcc6
--- /dev/null
+++ b/packages/tasks/task-sdk-opie.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "SDK packages for Opie"
+PR = "r6"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "task-sdk-opie"
+
+RDEPENDS_task-sdk-opie := "\
+ libopiebluez2 \
+ libopiedb2 \
+ libopiecore2 \
+ libopienet2 \
+ libopiepim2 \
+ libopieui2 \
+ libqpe1 \
+ qte \
+ libqtaux2 \
+ libmailwrapper"
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index 7fa7c11322..a9814d51a1 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "SDK packages for Opie and GPE"
+DESCRIPTION = "SDK packages"
PR = "r5"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -6,7 +6,6 @@ ALLOW_EMPTY = "1"
PACKAGES = "\
task-sdk-bare \
task-sdk-base \
- task-sdk-opie \
task-sdk-x11 \
task-sdk-x11-ext \
task-sdk-gpe"
@@ -115,15 +114,3 @@ RDEPENDS_task-sdk-gpe := "\
libgpelaunch-dev \
libgpewidget-dev \
libhandoff-dev"
-
-RDEPENDS_task-sdk-opie := "\
- libopiebluez2 \
- libopiedb2 \
- libopiecore2 \
- libopienet2 \
- libopiepim2 \
- libopieui2 \
- libqpe1 \
- qte \
- libqtaux2 \
- libmailwrapper"
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 2fd4ad0473..92820e069c 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -18,6 +18,7 @@ ALLOW_EMPTY = "1"
# The standard firmware contents and additional packages built as requirements
# of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS.
SLUGOS_STANDARD_RDEPENDS = ""
+SLUGOS_STANDARD_RRECOMMENDS = ""
# diff, cpio and find are required for reflash and turnup ram.
# Removing these probably leaves the system bootable, but standard
@@ -27,17 +28,17 @@ SLUGOS_STANDARD_RDEPENDS = ""
# udev is the default way of handling devices, there is no guarantee
# that the static device table is completely correct (it is just
# known to be sufficient for boot.)
-SLUGOS_STANDARD_RDEPENDS += "diffutils cpio findutils udev"
+SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils udev"
# These lines add support for formatting ext2 and ext3 file systems
# on a hard disk attached to the NSLU2. ext3 is the standard Linux
# file system.
-SLUGOS_STANDARD_RDEPENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
# These lines add support for an X/Y/ZModem package called lrzsz
# (this is of use for people with modified NSLU2 hardware which
# supports a serial port.)
-SLUGOS_STANDARD_RDEPENDS += "lrzsz"
+SLUGOS_STANDARD_RRECOMMENDS += "lrzsz"
# Filesystem selection. Adding entries here adds the module to the
# image. The module must be built as part of nslu2-kernel (i.e. it
@@ -55,7 +56,7 @@ SLUGOS_STANDARD_RDEPENDS += "lrzsz"
# NOTE: removing kernel-module-nfs from this list will prevent NFS
# boot (however you can do a simple flash file system boot - no
# attached disk - and install the nfs modules from ssh.)
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
kernel-module-ext2 \
kernel-module-jbd \
kernel-module-ext3 \
@@ -67,31 +68,25 @@ kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
-# Until it becomes clear which of the ntfs drivers is the better
-# solution, the Linux ntfs driver is commented out.
-#SLUGOS_STANDARD_RDEPENDS += "\
-#kernel-module-ntfs \
-#"
-
# Add daemon required for HW RNG support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
rng-tools \
"
# Add modules required for usb support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
kernel-module-ohci-hcd \
kernel-module-uhci-hcd \
"
# Add modules required for IDE support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
kernel-module-libata \
kernel-module-pata-artop \
"
# Add modules required for Network support
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
kernel-module-via-velocity \
"
@@ -99,20 +94,20 @@ kernel-module-via-velocity \
# NOTE: This module is desirable for systems lacking a physical
# console, but is usually only enabled if specific needs or issues
# arise. If space in the flash is at a premium, it can be omitted.
-SLUGOS_STANDARD_RDEPENDS += "\
+SLUGOS_STANDARD_RRECOMMENDS += "\
kernel-module-netconsole \
"
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
-RDEPENDS += "kernel ixp4xx-npe \
+RDEPENDS += "\
+ kernel ixp4xx-npe \
base-files base-passwd netbase \
busybox initscripts-slugos slugos-init \
update-modules sysvinit tinylogin \
module-init-tools modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
portmap \
- dropbear \
beep \
e2fsprogs-blkid \
util-linux-mount \
@@ -122,4 +117,7 @@ RDEPENDS += "kernel ixp4xx-npe \
${SLUGOS_STANDARD_RDEPENDS} \
${DISTRO_EXTRA_RDEPENDS}"
-RRECOMMENDS = "${DISTRO_EXTRA_RRECOMMENDS}"
+RRECOMMENDS += "\
+ dropbear \
+ ${SLUGOS_STANDARD_RRECOMMENDS} \
+ ${DISTRO_EXTRA_RRECOMMENDS}"
diff --git a/packages/ttf-fonts/ttf-dejavu_2.13.bb b/packages/ttf-fonts/ttf-dejavu_2.15.bb
index c1b743aa1b..c1b743aa1b 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.13.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.15.bb
diff --git a/packages/uboot-utils/files/.mtn2git_empty b/packages/uboot-utils/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uboot-utils/files/.mtn2git_empty
diff --git a/packages/uboot-utils/env-Makefile.patch b/packages/uboot-utils/files/env-Makefile.patch
index ad3a6b39a3..ad3a6b39a3 100644
--- a/packages/uboot-utils/env-Makefile.patch
+++ b/packages/uboot-utils/files/env-Makefile.patch
diff --git a/packages/uboot-utils/files/fic-gta01/.mtn2git_empty b/packages/uboot-utils/files/fic-gta01/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uboot-utils/files/fic-gta01/.mtn2git_empty
diff --git a/packages/uboot-utils/files/fic-gta01/fw_env.config b/packages/uboot-utils/files/fic-gta01/fw_env.config
new file mode 100644
index 0000000000..9fe07672c5
--- /dev/null
+++ b/packages/uboot-utils/files/fic-gta01/fw_env.config
@@ -0,0 +1,6 @@
+# Configuration file for fw_(printenv/saveenv) utility.
+# Up to two entries are valid, in this case the redundand
+# environment sector is assumed present.
+
+# MTD device name Device offset Env. size Flash sector size
+/dev/mtd1 0x0000 0x4000 0x4000
diff --git a/packages/uboot-utils/fw_env.c.patch b/packages/uboot-utils/files/fw_env.c.patch
index 62f364ad4a..62f364ad4a 100644
--- a/packages/uboot-utils/fw_env.c.patch
+++ b/packages/uboot-utils/files/fw_env.c.patch
diff --git a/packages/uboot-utils/fw_env.h.patch b/packages/uboot-utils/files/fw_env.h.patch
index 2ef2bb83c4..2ef2bb83c4 100644
--- a/packages/uboot-utils/fw_env.h.patch
+++ b/packages/uboot-utils/files/fw_env.h.patch
diff --git a/packages/uboot-utils/tools-Makefile.patch b/packages/uboot-utils/files/tools-Makefile.patch
index a44bc917d6..a44bc917d6 100644
--- a/packages/uboot-utils/tools-Makefile.patch
+++ b/packages/uboot-utils/files/tools-Makefile.patch
diff --git a/packages/uboot-utils/files/turbostation/.mtn2git_empty b/packages/uboot-utils/files/turbostation/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uboot-utils/files/turbostation/.mtn2git_empty
diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config
new file mode 100644
index 0000000000..97ce8a87d4
--- /dev/null
+++ b/packages/uboot-utils/files/turbostation/fw_env.config
@@ -0,0 +1,15 @@
+# Configuration file for fw_(printenv/saveenv) utility.
+# Up to two entries are valid, in this case the redundand
+# environment sector is assumed present.
+
+# MTD device name Device offset Env. size Flash sector size
+
+# Primary U-Boot environment. You shouldn't need to touch this. If you touch this,
+# you should be *very* sure about what you're doing if you don't have a serial
+# cable attached!
+# /dev/mtd4 0x00000 0x20000 0x20000
+
+# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily
+# render your turbostation unbootable!
+
+/dev/mtd5 0x00000 0x20000 0x20000 \ No newline at end of file
diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb
index 3bcf1eba6c..292c97f134 100644
--- a/packages/uboot-utils/uboot-utils_1.1.2.bb
+++ b/packages/uboot-utils/uboot-utils_1.1.2.bb
@@ -3,12 +3,13 @@ SECTION = "bootloaders"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "mtd-utils"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \
- file://fw_env.h.patch;patch=1 \
file://fw_env.c.patch;patch=1 \
file://tools-Makefile.patch;patch=1 \
- file://env-Makefile.patch;patch=1 "
+ file://env-Makefile.patch;patch=1 \
+ file://fw_env.config"
S = "${WORKDIR}/u-boot-${PV}"
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
@@ -33,7 +34,9 @@ do_stage() {
}
do_install () {
- install -d ${D}/sbin
+ install -d ${D}/sbin
+ install -d ${D}${sysconfdir}
+ install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
}
diff --git a/packages/uboot/u-boot-mkimage-gta01-native_svn.bb b/packages/uboot/u-boot-mkimage-gta01-native_svn.bb
index ad98bea30e..c93507fdd0 100644
--- a/packages/uboot/u-boot-mkimage-gta01-native_svn.bb
+++ b/packages/uboot/u-boot-mkimage-gta01-native_svn.bb
@@ -15,4 +15,4 @@ do_deploy () {
}
do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
diff --git a/packages/xorg-lib/diet-x11/makekeys.diff b/packages/xorg-lib/diet-x11/makekeys.diff
new file mode 100644
index 0000000000..cea08725ec
--- /dev/null
+++ b/packages/xorg-lib/diet-x11/makekeys.diff
@@ -0,0 +1,12 @@
+diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c
+--- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c 2007-03-08 14:34:34.000000000 +0100
++++ libX11-X11R7.1-1.0.1/src/util/makekeys.c 2007-03-08 14:34:58.000000000 +0100
+@@ -49,7 +49,7 @@
+ KeySym val;
+ } info[KTNUM];
+
+-#define MIN_REHASH 10
++#define MIN_REHASH 15
+ #define MATCHES 10
+
+ char tab[KTNUM];
diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index 52e01dde75..81f92a5898 100644
--- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -10,4 +10,5 @@ SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
file://fix-disable-xlocale.diff;patch=1 \
file://fix-utf8-wrong-define.patch;patch=1 \
file://xim.patch;patch=1 \
- file://xchar2b.patch;patch=1"
+ file://xchar2b.patch;patch=1 \
+ file://makekeys.diff;patch=1"
diff --git a/packages/xorg-lib/libx11/makekeys.diff b/packages/xorg-lib/libx11/makekeys.diff
new file mode 100644
index 0000000000..cea08725ec
--- /dev/null
+++ b/packages/xorg-lib/libx11/makekeys.diff
@@ -0,0 +1,12 @@
+diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c
+--- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c 2007-03-08 14:34:34.000000000 +0100
++++ libX11-X11R7.1-1.0.1/src/util/makekeys.c 2007-03-08 14:34:58.000000000 +0100
+@@ -49,7 +49,7 @@
+ KeySym val;
+ } info[KTNUM];
+
+-#define MIN_REHASH 10
++#define MIN_REHASH 15
+ #define MATCHES 10
+
+ char tab[KTNUM];
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 64f4585e0f..c6a701d9cb 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -3,6 +3,7 @@ require xorg-lib-common.inc
PR = "r4"
DESCRIPTION = "Base X libs."
+SRC_URI += "file://makekeys.diff;patch=1"
DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto"
diff --git a/packages/zd1211/zd1211-firmware_1.3.bb b/packages/zd1211/zd1211-firmware_1.3.bb
new file mode 100644
index 0000000000..e6f006971d
--- /dev/null
+++ b/packages/zd1211/zd1211-firmware_1.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "ZyDAS ZD1211 Firmware"
+HOMEPAGE = "http://zd1211.ath.cx/"
+SECTION = "net"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/zd1211-firmware1.3.tar.bz2"
+
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+ install -d -m 0755 ${D}/lib/firmware/zd1211
+ install -m 0644 ${S}/zd1211* ${D}/lib/firmware/zd1211/
+}
+
+FILES_${PN} = "/lib/firmware"