diff options
67 files changed, 1232 insertions, 357 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 290166bb03..d01bce1fcf 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,74 +1,245 @@ -def tinder_tz_offset(off): - # get the offset.n minutes Either it is a number like - # +200 or -300 +def tinder_form_data(bound, dict, log): + """ + Create the boundary for the HTTP Post + """ + output = [] + + # for each key in the dictionary + for name in dict: + output.append( "--" + bound ) + output.append( 'Content-Disposition: form-data; name="%s"' % name ) + output.append( "" ) + output.append( dict[name] ) + if log: + output.append( "--" + bound ) + output.append( 'Content-Disposition: form-data; name="log"; filename="log.txt"' ) + output.append( '' ) + output.append( log ) + output.append( '--' + bound + '--' ) + output.append( '' ) + + return "\r\n".join(output) + +def tinder_time_string(): + """ + Return the time as GMT + """ + return "" + +def tinder_format_http_post(d,status,log): + """ + Format the Tinderbox HTTP post with the data needed + for the tinderbox to be happy. + """ + + from bb import data + import os,random + + # the variables we will need to send on this form post + variables = { + "tree" : data.getVar('TINDER_TREE', d, True), + "machine_name" : data.getVar('TINDER_MACHINE', d, True), + "os" : os.uname()[0], + "os_version" : os.uname()[2], + "compiler" : "gcc", + "clobber" : data.getVar('TINDER_CLOBBER', d, True) + } + + # optionally add the status + if status: + variables["status"] = str(status) + + # try to load the machine id + # we only need on build_status.pl but sending it + # always does not hurt try: - return int(off) - except ValueError: - if off == "Europe/Berlin": - return 120 - else: - return 0 - -def tinder_tinder_time(offset): - import datetime - td = datetime.timedelta(minutes=tinder_tz_offset(offset)) - time = datetime.datetime.utcnow() + td - return time.strftime('%m/%d/%Y %H:%M:%S') - -def tinder_tinder_start(date,offset): - import datetime, time - td = datetime.timedelta(minutes=tinder_tz_offset(offset)) - ti = time.strptime(date, "%m/%d/%Y %H:%M:%S") - time = datetime.datetime(*ti[0:7])+td - return time.strftime('%m/%d/%Y %H:%M:%S') - -def tinder_send_email(da, header, log): - import smtplib + f = file(data.getVar('TMPDIR',d,True)+'/tinder-machine.id', 'r') + id = f.read() + variables['machine_id'] = id + except: + pass + + # the boundary we will need + boundary = "----------------------------------%d" % int(random.random()*1000000000000) + + # now format the body + body = tinder_form_data( boundary, variables, log ) + + return ("multipart/form-data; boundary=%s" % boundary),body + + +def tinder_build_start(d): + """ + Inform the tinderbox that a build is starting. We do this + by posting our name and tree to the build_start.pl script + on the server. + """ from bb import data - from email.MIMEText import MIMEText - msg = MIMEText(header +'\n' + log) - msg['Subject'] = data.getVar('TINDER_SUBJECT',da, True) or "Tinder-Client build log" - msg['To'] = data.getVar('TINDER_MAILTO' ,da, True) - msg['From'] = data.getVar('TINDER_FROM', da, True) + import httplib + + # get the body and type + content_type, body = tinder_format_http_post(d,None,None) + server = data.getVar('TINDER_HOST', d, True ) + url = data.getVar('TINDER_URL', d, True ) + + selector = url + "/xml/build_start.pl" + + print "selector %s and url %s" % (selector, url) + + # now post it + h = httplib.HTTP(server) + h.putrequest('POST', selector) + h.putheader('content-type', content_type) + h.putheader('content-length', str(len(body))) + h.endheaders() + h.send(body) + errcode, errmsg, headers = h.getreply() + print errcode, errmsg, headers + report = h.file.read() + + # now let us find the machine id that was assigned to us + search = "<machine id='" + report = report[report.find(search)+len(search):] + report = report[0:report.find("'")] + + import bb + bb.note("Machine ID assigned by tinderbox: %s" % report ) + # now we will need to save the machine number + # we will override any previous numbers + f = file(data.getVar('TMPDIR', d, True)+"/tinder-machine.id", 'w') + f.write(report) - s = smtplib.SMTP() - s.connect() - s.sendmail(data.getVar('TINDER_FROM', da, True), [data.getVar('TINDER_MAILTO', da, True)], msg.as_string()) - s.close() -def tinder_send_http(da, header, log): +def tinder_send_http(d, status, log): + """ + Send this log as build status + """ from bb import data - import httplib, urllib - cont = "\n%s\n%s" % ( header, log) - headers = {"Content-type": "multipart/form-data" } + import httplib + + + # get the body and type + content_type, body = tinder_format_http_post(d,status,log) + server = data.getVar('TINDER_HOST', d, True ) + url = data.getVar('TINDER_URL', d, True ) + + selector = url + "/xml/build_status.pl" + + # now post it + h = httplib.HTTP(server) + h.putrequest('POST', selector) + h.putheader('content-type', content_type) + h.putheader('content-length', str(len(body))) + h.endheaders() + h.send(body) + errcode, errmsg, headers = h.getreply() + print errcode, errmsg, headers + print h.file.read() + - conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True)) - conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers) - conn.close() +def tinder_print_info(d): + """ + Print the TinderBox Info + Including informations of the BaseSystem and the Tree + we use. + """ + + from bb import data + import os + # get the local vars + + time = tinder_time_string() + ops = os.uname()[0] + version = os.uname()[2] + url = data.getVar( 'TINDER_URL' , d, True ) + tree = data.getVar( 'TINDER_TREE', d, True ) + branch = data.getVar( 'TINDER_BRANCH', d, True ) + srcdate = data.getVar( 'SRCDATE', d, True ) + machine = data.getVar( 'MACHINE', d, True ) + distro = data.getVar( 'DISTRO', d, True ) + bbfiles = data.getVar( 'BBFILES', d, True ) + tarch = data.getVar( 'TARGET_ARCH', d, True ) + fpu = data.getVar( 'TARGET_FPU', d, True ) + # there is a bug with tipple quoted strings + # i will work around but will fix the original + # bug as well + output = [] + output.append("== Tinderbox Info" ) + output.append("Time: %(time)s" ) + output.append("OS: %(ops)s" ) + output.append("%(version)s" ) + output.append("Compiler: gcc" ) + output.append("Tinderbox Client: 0.1" ) + output.append("Tinderbox Client Last Modified: yesterday" ) + output.append("Tinderbox Protocol: 0.1" ) + output.append("URL: %(url)s" ) + output.append("Tree: %(tree)s" ) + output.append("Config:" ) + output.append("branch = '%(branch)s'" ) + output.append("TARGET_ARCH = '%(tarch)s'" ) + output.append("TARGET_FPU = '%(fpu)s'" ) + output.append("SRCDATE = '%(srcdate)s'" ) + output.append("MACHINE = '%(machine)s'" ) + output.append("DISTRO = '%(distro)s'" ) + output.append("BBFILES = '%(bbfiles)s'" ) + output.append("== End Tinderbox Client Info" ) -# Prepare tinderbox mail header -def tinder_prepare_mail_header(da, status): + # now create the real output + return "\n".join(output) % vars() + + +def tinder_print_env(): + """ + Print the environment variables of this build + """ from bb import data + import os + + time_start = tinder_time_string() + time_end = tinder_time_string() + + # build the environment + env = "" + for var in os.environ: + env += "%s=%s\n" % (var, os.environ[var]) + + output = [] + output.append( "---> TINDERBOX RUNNING env %(time_start)s" ) + output.append( env ) + output.append( "<--- TINDERBOX FINISHED (SUCCESS) %(time_end)s" ) - str = "tinderbox: administrator: %s\n" % data.getVar('TINDER_ADMIN', da, True) - str += "tinderbox: starttime: %s\n" % tinder_tinder_start(data.getVar('TINDER_START', da, True) or data.getVar('BUILDSTART', da, True), data.getVar('TINDER_TZ', da, True)) - str += "tinderbox: buildname: %s\n" % data.getVar('TINDER_BUILD', da, True) - str += "tinderbox: errorparser: %s\n" % data.getVar('TINDER_ERROR', da, True) - str += "tinderbox: status: %s\n" % status - str += "tinderbox: timenow: %s\n" % tinder_tinder_time(data.getVar('TINDER_TZ', da, True)) - str += "tinderbox: tree: %s\n" % data.getVar('TINDER_TREE', da, True) - str += "tinderbox: buildfamily: %s\n" % "unix" - str += "tinderbox: END" + return "\n".join(output) % vars() + +def tinder_tinder_start(d): + """ + PRINT the configuration of this build + """ - return str + time_start = tinder_time_string() + config = tinder_print_info(d) + env = tinder_print_env() + time_end = tinder_time_string() + + output = [] + output.append( "---> TINDERBOX PRINTING CONFIGURATION %(time_start)s" ) + output.append( config ) + output.append( env ) + output.append( "<--- TINDERBOX FINISHED PRINTING CONFIGURATION %(time_end)s" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): """ - Report to the tinderbox. Either we will report every step - (depending on TINDER_VERBOSE_REPORT) at the end we will send the - tinderclient.log + Report to the tinderbox: + On the BuildStart we will inform the box directly + On the other events we will write to the TINDER_LOG and + when the Task is finished we will send the report. + + The above is not yet fully implemented. Currently we send + information immediately. The caching/queuing needs to be + implemented. Also sending more or less information is not + implemented yet. """ from bb.event import getName from bb import data, mkdirhier @@ -77,74 +248,57 @@ def tinder_do_tinder_report(event): # variables name = getName(event) log = "" - header = "" - verbose = data.getVar('TINDER_VERBOSE_REPORT', event.data, True) == "1" + status = 1 # Check what we need to do Build* shows we start or are done if name == "BuildStarted": - header = tinder_prepare_mail_header(event.data, 'building') - # generate - for var in os.environ: - log += "%s=%s\n" % (var, os.environ[var]) - - mkdirhier(data.getVar('TMPDIR', event.data, True)) - file = open(data.getVar('TINDER_LOG', event.data, True), 'w') - file.write(log) - - if not verbose: - header = "" - - if name == "PkgFailed" or name == "BuildCompleted": - status = 'build_failed' - if name == "BuildCompleted": - status = "success" - header = tinder_prepare_mail_header(event.data, status) - # append the log - log_file = data.getVar('TINDER_LOG', event.data, True) - file = open(log_file, 'r') - for line in file.readlines(): - log += line - - if verbose and name == "TaskStarted": - header = tinder_prepare_mail_header(event.data, 'building') - log = "Task %s started" % event.task - - if verbose and name == "PkgStarted": - header = tinder_prepare_mail_header(event.data, 'building') - log = "Package %s started" % data.getVar('P', event.data, True) - - if verbose and name == "PkgSucceeded": - header = tinder_prepare_mail_header(event.data, 'building') - log = "Package %s done" % data.getVar('P', event.data, True) - - # Append the Task Log + tinder_build_start(event.data) + log = tinder_tinder_start(event.data) + + try: + # truncate the tinder log file + f = file(data.getVar('TINDER_LOG', event.data, True), 'rw+') + f.truncate(0) + f.close() + except IOError: + pass + + # Append the Task-Log (compile,configure...) to the log file + # we will send to the server if name == "TaskSucceeded" or name == "TaskFailed": log_file = glob.glob("%s/log.%s.*" % (data.getVar('T', event.data, True), event.task)) if len(log_file) != 0: to_file = data.getVar('TINDER_LOG', event.data, True) - log_txt = open(log_file[0], 'r').readlines() - to_file = open(to_file, 'a') - - to_file.writelines(log_txt) + log = open(log_file[0], 'r').readlines() - # append to the log - if verbose: - header = tinder_prepare_mail_header(event.data, 'building') - for line in log_txt: - log += line + # set the right 'HEADER'/Summary for the TinderBox + if name == "TaskStarted": + log += "--> TINDERBOX Task %s started" % event.task + elif name == "TaskSucceeded": + log += "<-- TINDERBOX Task %s done (SUCCESS)" % event.task + elif name == "TaskFailed": + log += "<-- TINDERBOX Task %s failed (FAILURE)" % event.task + elif name == "PkgStarted": + log += "--> TINDERBOX Package %s started" % data.getVar('P', event.data, True) + elif name == "PkgSucceeded": + log += "<-- TINDERBOX Package %s done (SUCCESS)" % data.getVar('P', event.data, True) + elif name == "PkgFailed": + log += "<-- TINDERBOX Package %s failed (FAILURE)" % data.getVar('P', event.data, True) + status = 200 + elif name == "BuildCompleted": + status = 100 - # now mail the log - if len(log) == 0 or len(header) == 0: + # now post the log + if len(log) == 0: return - log_post_method = tinder_send_email - if data.getVar('TINDER_SENDLOG', event.data, True) == "http": - log_post_method = tinder_send_http - - log_post_method(event.data, header, log) + # for now we will use the http post method as it is the only one + log_post_method = tinder_send_http + log_post_method(event.data, status, log) +# we want to be an event handler addhandler tinderclient_eventhandler python tinderclient_eventhandler() { from bb import note, error, data diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf new file mode 100644 index 0000000000..cb4ba04876 --- /dev/null +++ b/conf/distro/angstrom-2006.9.conf @@ -0,0 +1,65 @@ +#DISTRO_VERSION = "2006.9" +DISTRO_VERSION = "test-${DATE}" + +include conf/distro/angstrom.conf + + +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" +#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! + + +FEED_URIS += " \ + base##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ + updates##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + +#CVSDATE = 20050331 + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +#EABI stuff +#PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate" + +PREFERRED_PROVIDER_x11=diet-x11 + +#use EABI toolchain +#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214" +#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214" +#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214" +#PREFERRED_VERSION_binutils ?= "2.16.91.0.4" +#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.4" +#PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214" +#PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214" + +# +# Opie +# + +PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" +PREFERRED_VERSION_qte = "2.3.10" + +OPIE_VERSION = "1.2.1" +include conf/distro/preferred-opie-versions.inc + +# +# GPE +# + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_x11 = "diet-x11" + +include conf/distro/preferred-gpe-versions-2.8.inc + +# +# E +# + +include conf/distro/preferred-e-versions.inc + diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf new file mode 100644 index 0000000000..eaf3fb61e7 --- /dev/null +++ b/conf/distro/angstrom.conf @@ -0,0 +1,30 @@ +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: Distribution configuration for Angstrom + +DISTRO = "angstrom" +DISTRO_NAME = "Angstrom" + +#we'll use this till we get a real domain +ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom" + +#Set the default maintainer to angstrom-dev +MAINTAINER ?= "Angstrom Developers <angstrom-dev@handhelds.org>" + +#use ipkg package format with debian style naming +INHERIT += "package_ipk debian" + +#EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime +#TARGET_OS = "none-linux-gnueabi" +TARGET_OS = "linux" + +PARALLEL_INSTALL_MODULES = "1" + +BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version" +BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version" + +#Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" + + +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index d32ea7058c..e51d15b90f 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -1,7 +1,6 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "unstable-${DATE}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" # Do not touch this file before notifying familiar-dev@handhelds.org include conf/distro/familiar.conf diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 28b85cd57e..b9ac309a60 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -146,6 +146,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netcat/*.bb \ ${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nfs-utils/*.bb \ ${PKGDIR}/packages/nis/*.bb \ diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf new file mode 100644 index 0000000000..7155eb9e81 --- /dev/null +++ b/conf/machine/include/tune-iwmmxt.conf @@ -0,0 +1,5 @@ +# Configurations for the Intel PXA27x Appications Processor Family. +# Please use tune-xscale for PXA255/PXA26x based processors. +TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH = "iwmmxt" + diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index ff899f44e1..604748b0ed 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-xscale.conf +include conf/machine/include/tune-iwmmxt.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/tinder.conf b/conf/tinder.conf index 2c50b62a17..99e263c96c 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -1,37 +1,26 @@ INHERIT += "tinderclient" -# the name of the admin (e.g you) -#TINDER_ADMIN = "you@yourhost" #Name of the client -#DO NOT USE '/' or ' ' in a name!! -#TINDER_BUILD = "Test-NameOfClient" +#TINDER_MACHINE = "Test-NameOfClient-build-image" -#What error parser to use -#TINDER_ERROR = "unix" -#One mail/post per task -#TINDER_VERBOSE_REPORT = "1" -#TINDER_LOG = "${TMPbDIR}/tinder.log" -#TINDER_TREE = "OpenEmbeddedBuild" +# Which lof file to write to, which tree to report to +#TINDER_LOG = "${TMPDIR}/tinder.log" +#TINDER_TREE = "OpenEmbeddedBuilds" -# Mail posting -#We have fixed procmail rules for the subject -#TINDER_SUBJECT = "OpenEmbedded Tinder Log" -#TINDER_MAILTO = "tinderbox-oe@gmx.net" -#TINDER_FROM = "you@yourhost" - # HTTP posting #TINDER_HOST = "ewi546.ewi.utwente.nl" #TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi" -# Select the submit method http or mail -#TINDER_SENDLOG = "http" - +# Which branch do we build +#TINDER_BRANCH = "org.openembedded.dev" -# TimeZone handling -#TINDER_TZ = "+0200" +# Clobbing +# 0 for rebuilding everything from scratch +# 1 for incremental builds +#TINDER_CLOBBER = "0" # Do a report at all #TINDER_REPORT = "1" diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb new file mode 100644 index 0000000000..f4322e06f1 --- /dev/null +++ b/packages/angstrom/angstrom-version.bb @@ -0,0 +1,8 @@ +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +PV = ${DISTRO_VERSION} + +do_compile() { + mkdir -p ${D}${sysconfdir} + echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version + +} diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb index a49022ab18..f1a69a0451 100644 --- a/packages/avahi/avahi_0.6.5.bb +++ b/packages/avahi/avahi_0.6.5.bb @@ -1,11 +1,10 @@ DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +SECTION = "network" +PRIORITY = "optional" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://avahi.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE= "GPL" -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" -SECTION = "net" -PRIORITY = "optional" -PR = "r0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" diff --git a/packages/avahi/avahi_0.6.3.bb b/packages/avahi/avahi_0.6.7.bb index fbd7208d1d..f41b22017a 100644 --- a/packages/avahi/avahi_0.6.3.bb +++ b/packages/avahi/avahi_0.6.7.bb @@ -1,11 +1,13 @@ DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +SECTION = "network" +PRIORITY = "optional" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://avahi.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE= "GPL" -DEPENDS = "expat libdaemon dbus-0.60" + +DEPENDS = "expat libdaemon dbus" RRECOMMENDS = "libnss-mdns" -SECTION = "net" -PRIORITY = "optional" -PR = "r0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" @@ -31,8 +33,7 @@ FILES_avahi-utils = "${bindir}/avahi-*" CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools -inherit update-rc.d +inherit autotools pkgconfig update-rc.d INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" diff --git a/packages/gdbm/gdbm-1.8.3/libtool-mode.patch b/packages/gdbm/gdbm-1.8.3/libtool-mode.patch new file mode 100644 index 0000000000..c56bac2ca9 --- /dev/null +++ b/packages/gdbm/gdbm-1.8.3/libtool-mode.patch @@ -0,0 +1,20 @@ +--- gdbm-1.8.3/Makefile.in.orig 2006-02-16 15:17:25.000000000 +0000 ++++ gdbm-1.8.3/Makefile.in 2006-02-16 15:18:08.000000000 +0000 +@@ -131,7 +131,7 @@ + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) \ + $(DESTDIR)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la + $(INSTALL_DATA) gdbm.h \ + $(DESTDIR)$(includedir)/gdbm.h + $(INSTALL_DATA) $(srcdir)/gdbm.3 \ +@@ -142,7 +142,7 @@ + install-compat: + $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ + $(DESTDIR)$(libdir)/libgdbm_compat.la + $(INSTALL_DATA) $(srcdir)/dbm.h \ + $(DESTDIR)$(includedir)/dbm.h diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index 7429f41679..ecef5fc414 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -6,7 +6,8 @@ LICENSE = "GPL" PR = "r2" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ - file://makefile.patch;patch=1" + file://makefile.patch;patch=1 \ + file://libtool-mode.patch;patch=1" inherit autotools diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index e7adcd0a39..396d2375bd 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r1" +PR = "r2" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -41,8 +41,8 @@ INHIBIT_DEFAULT_DEPS = "1" # \ # file://arm-ioperm.patch;patch=1;pnum=0 \ # file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ - cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ +SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat.com__20050627.tar.gz \ + http://familiar.handhelds.org/source/v0.8.3/stash_ports_sources.redhat.com__20050627.tar.gz \ file://arm-audit.patch;patch=1 \ file://arm-audit2.patch;patch=1 \ file://arm-no-hwcap.patch;patch=1 \ diff --git a/packages/gnome/gnome-icon-theme_1.3.3.bb b/packages/gnome/gnome-icon-theme_1.3.3.bb index e44a06697e..1e693e6f74 100644 --- a/packages/gnome/gnome-icon-theme_1.3.3.bb +++ b/packages/gnome/gnome-icon-theme_1.3.3.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2" -DEPENDS = "glib intltool-native" +DEPENDS = "glib-2.0 intltool-native" PR="r1" FILES_${PN} += "${datadir}/*" diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb new file mode 100644 index 0000000000..8eb1360e92 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.1.30.bb @@ -0,0 +1,27 @@ +PACKAGES = "gpe-conf gpe-conf-panel" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +inherit gpe +PR="r0" + +DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" +RDEPENDS_gpe-conf-panel = "gpe-conf" +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + +do_compile () { + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} + +do_install () { + oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program +} + + diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session index 03d0df414e..bffd69a244 100644 --- a/packages/gpe-session-scripts/files/matchbox-session +++ b/packages/gpe-session-scripts/files/matchbox-session @@ -4,6 +4,6 @@ XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` matchbox-desktop & -matchbox-panel --orientation south & +MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south & exec matchbox-window-manager $@ diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb index 52dcc5bdaa..c57366399d 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r1" +PR = "r3" inherit gpe @@ -7,7 +7,7 @@ DESCRIPTION = "GPE session startup scripts" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" +RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" # more rdepends: keylaunch ipaq-sleep apmd blueprobe DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 7a4f79c20b..0b983ab1ec 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -43,13 +43,13 @@ do_install_append() { 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}/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/S40umountfs rm ${D}${sysconfdir}/rc0.d/S90halt rm ${D}${sysconfdir}/rcS.d/S02banner rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 4e11097f89..5ea7cfe95e 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r67" +PR = "r68" SRC_URI = "file://halt \ file://ramdisk \ @@ -127,14 +127,14 @@ do_install () { ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc6.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh -# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/ramdisk ${D}${sysconfdir}/rcS.d/S30ramdisk ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs # ln -sf ../init.d/urandom ${D}${sysconfdir}/rc0.d/S30urandom ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh -# ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs + ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/inkscape/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/xserver-common/files/.mtn2git_empty +++ b/packages/inkscape/files/.mtn2git_empty diff --git a/packages/inkscape/files/no-boehm-version-check.patch b/packages/inkscape/files/no-boehm-version-check.patch new file mode 100644 index 0000000000..4a9c036142 --- /dev/null +++ b/packages/inkscape/files/no-boehm-version-check.patch @@ -0,0 +1,28 @@ +--- /tmp/configure.ac 2006-02-19 10:43:44.525208784 +0100 ++++ inkscape-0.43/configure.ac 2006-02-19 10:43:55.582527816 +0100 +@@ -133,24 +133,7 @@ + [gc_ok=no]) + if test "x$gc_ok" = "xyes"; then + AC_MSG_CHECKING([libgc version 6.4+]) +- AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ +- #ifdef HAVE_GC_GC_H +- # include <gc/gc.h> +- #else +- # include <gc.h> +- #endif +- #include <stdio.h> +- extern unsigned GC_version; +- int main(void){ +- unsigned min = ((6 << 16) | (4 << 8) | 0); +- printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); +- if (GC_version>=min) return 0; +- return 1; +- }]])], +- [gc_ok=yes], +- [gc_ok=no] +- ) ++ [gc_ok=yes] + AC_MSG_RESULT([$gc_ok]) + fi + if test "x$gc_ok" != "xyes"; then diff --git a/packages/inkscape/inkscape_0.43.bb b/packages/inkscape/inkscape_0.43.bb new file mode 100644 index 0000000000..48b4334291 --- /dev/null +++ b/packages/inkscape/inkscape_0.43.bb @@ -0,0 +1,17 @@ +SECTION = "x11/utils" +DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ +blending, node editing, SVG to PNG export, and more. Its goal is for features \ +similar to Illustrator, CorelDraw, Visio, etc." +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt" +LICENSE = "GPL" + +#we know that GC version is 6.5, so we patch out the version check, since gc_open was already detected +SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2 \ + file://no-boehm-version-check.patch;patch=1" + +S = "${WORKDIR}/inkscape-${PV}" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-mmx" diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map b/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map index d139bde4cd..d33d4de1aa 100644 --- a/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map +++ b/packages/keymap-locales/files/akita/keymap-extension-2.6-de.map @@ -1,9 +1,10 @@ # German keymapping -altgr keycode 24 = +odiaresis -altgr keycode 30 = +adiaresis -altgr keycode 22 = +udiaresis -shift altgr keycode 24 = +Odiaresis -shift altgr keycode 30 = +Adiaresis -altgr shift keycode 22 = +Udiaresis +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis altgr keycode 31 = ssharp diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map index d139bde4cd..d33d4de1aa 100644 --- a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map +++ b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-de.map @@ -1,9 +1,10 @@ # German keymapping -altgr keycode 24 = +odiaresis -altgr keycode 30 = +adiaresis -altgr keycode 22 = +udiaresis -shift altgr keycode 24 = +Odiaresis -shift altgr keycode 30 = +Adiaresis -altgr shift keycode 22 = +Udiaresis +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis altgr keycode 31 = ssharp diff --git a/packages/keymap-locales/files/c7x0/.mtn2git_empty b/packages/keymap-locales/files/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymap-locales/files/c7x0/.mtn2git_empty diff --git a/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map new file mode 100644 index 0000000000..d33d4de1aa --- /dev/null +++ b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-de.map @@ -0,0 +1,10 @@ +# German keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis +altgr keycode 31 = ssharp + diff --git a/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map b/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map index d139bde4cd..d33d4de1aa 100644 --- a/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map +++ b/packages/keymap-locales/files/spitz/keymap-extension-2.6-de.map @@ -1,9 +1,10 @@ # German keymapping -altgr keycode 24 = +odiaresis -altgr keycode 30 = +adiaresis -altgr keycode 22 = +udiaresis -shift altgr keycode 24 = +Odiaresis -shift altgr keycode 30 = +Adiaresis -altgr shift keycode 22 = +Udiaresis +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +altgr keycode 22 = +udiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis +altgr shift keycode 22 = +Udiaeresis altgr keycode 31 = ssharp diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index a490656cce..5ba84e69ca 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "file://*.map" diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb index 0c1908c3ac..6f4c5eac54 100644 --- a/packages/libdaemon/libdaemon_0.10.bb +++ b/packages/libdaemon/libdaemon_0.10.bb @@ -1,6 +1,8 @@ -SECTION = "libs" DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." +SECTION = "libs" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE = "LGPL" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" diff --git a/packages/libdaemon/libdaemon_0.3.bb b/packages/libdaemon/libdaemon_0.3.bb deleted file mode 100644 index 0d0b563de6..0000000000 --- a/packages/libdaemon/libdaemon_0.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." -LICENSE ="GPL" -SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" - -inherit autotools - -EXTRA_OECONF = "--disable-lynx" - -do_stage () { - oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/libdaemon - for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do - install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/ - done -} diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb index 578c9b7674..2bdf8cb5cc 100644 --- a/packages/libdaemon/libdaemon_0.6.bb +++ b/packages/libdaemon/libdaemon_0.6.bb @@ -1,6 +1,8 @@ -SECTION = "libs" DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." +SECTION = "libs" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" LICENSE = "GPLv2" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" diff --git a/packages/libgpewidget/libgpewidget_0.102.bb b/packages/libgpewidget/libgpewidget_0.102.bb index 35f09b5c21..58e8c71c18 100644 --- a/packages/libgpewidget/libgpewidget_0.102.bb +++ b/packages/libgpewidget/libgpewidget_0.102.bb @@ -1,15 +1,15 @@ LICENSE = "LGPL" -PR = "r2" +PR = "r3" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \ - file://cairo.patch;patch=1;pnum=1" +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools -inherit pkgconfig autotools +SRC_URI += "file://cairo.patch;patch=1;pnum=1" EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb index 0d8dcf23cf..b174398670 100644 --- a/packages/libgpewidget/libgpewidget_0.103.bb +++ b/packages/libgpewidget/libgpewidget_0.103.bb @@ -1,14 +1,13 @@ LICENSE = "LGPL" -PR = "r2" +PR = "r3" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -inherit pkgconfig autotools +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.105.bb b/packages/libgpewidget/libgpewidget_0.105.bb index f7d45ff0e8..884c55c9d3 100644 --- a/packages/libgpewidget/libgpewidget_0.105.bb +++ b/packages/libgpewidget/libgpewidget_0.105.bb @@ -3,11 +3,11 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r1" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -inherit pkgconfig autotools +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.107.bb b/packages/libgpewidget/libgpewidget_0.107.bb index 3bd2996e67..6ebab6db35 100644 --- a/packages/libgpewidget/libgpewidget_0.107.bb +++ b/packages/libgpewidget/libgpewidget_0.107.bb @@ -2,14 +2,13 @@ LICENSE = "LGPL" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r1" -PACKAGES =+ "libgpewidget-bin" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -inherit pkgconfig autotools +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools +PACKAGES =+ "libgpewidget-bin" FILES_libgpewidget-bin = "${bindir}" EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libgpewidget/libgpewidget_0.109.bb b/packages/libgpewidget/libgpewidget_0.109.bb index bab62fd3dc..f1078860d7 100644 --- a/packages/libgpewidget/libgpewidget_0.109.bb +++ b/packages/libgpewidget/libgpewidget_0.109.bb @@ -2,23 +2,22 @@ LICENSE = "LGPL" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -PR = "r1" +PR = "r2" -PACKAGES =+ "libgpewidget-bin" - -PARALLEL_MAKE = "" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \ - file://pkgconfig.patch;patch=1;pnum=0" +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools -inherit pkgconfig autotools +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" +PACKAGES =+ "libgpewidget-bin" FILES_libgpewidget-bin = "${bindir}" EXTRA_OECONF = "--enable-cairo" +PARALLEL_MAKE = "" + LDFLAGS += " -L${STAGING_LIBDIR}" do_stage () { diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb index 6e60b95133..e321d51c7d 100644 --- a/packages/libgpewidget/libgpewidget_cvs.bb +++ b/packages/libgpewidget/libgpewidget_cvs.bb @@ -2,19 +2,19 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co SECTION = "gpe/libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" +DEPENDS = "gtk+ cairo libxrender gtk-doc" LICENSE = "LGPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.107+cvs${SRCDATE}" +PV = "0.109+cvs${SRCDATE}" PR = "r0" -inherit autotools pkgconfig +inherit gpe autotools pkgconfig -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" EXTRA_OECONF = "--enable-cairo" diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb index fa2a6f4c8a..834691cd3d 100644 --- a/packages/libtool/libtool-native_1.5.10.bb +++ b/packages/libtool/libtool-native_1.5.10.bb @@ -1,5 +1,6 @@ SECTION = "devel" include libtool_${PV}.bb +DEPENDS += "autoconf-native" PR = "r3" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" diff --git a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch b/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch new file mode 100644 index 0000000000..0a370b9579 --- /dev/null +++ b/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch @@ -0,0 +1,138 @@ +--- xine-lib-1.0.orig/src/xine-engine/post.c 2004-10-17 22:14:30.000000000 +0300 ++++ xine-lib-1.0/src/xine-engine/post.c 2006-02-09 22:15:08.000000000 +0200 +@@ -241,7 +241,7 @@ + if (!*input) return port; + (*input)->xine_in.name = "video in"; + (*input)->xine_in.type = XINE_POST_DATA_VIDEO; +- (xine_video_port_t *)(*input)->xine_in.data = &port->new_port; ++ (*input)->xine_in.data = &port->new_port; + (*input)->post = post; + xine_list_append_content(post->input, *input); + } +@@ -251,7 +251,7 @@ + if (!*output) return port; + (*output)->xine_out.name = "video out"; + (*output)->xine_out.type = XINE_POST_DATA_VIDEO; +- (xine_video_port_t **)(*output)->xine_out.data = &port->original_port; ++ (*output)->xine_out.data = &port->original_port; + (*output)->xine_out.rewire = post_video_rewire; + (*output)->post = post; + (*output)->user_data = port; +@@ -718,7 +718,7 @@ + if (!*input) return port; + (*input)->xine_in.name = "audio in"; + (*input)->xine_in.type = XINE_POST_DATA_AUDIO; +- (xine_audio_port_t *)(*input)->xine_in.data = &port->new_port; ++ (*input)->xine_in.data = &port->new_port; + (*input)->post = post; + xine_list_append_content(post->input, *input); + } +@@ -728,7 +728,7 @@ + if (!*output) return port; + (*output)->xine_out.name = "audio out"; + (*output)->xine_out.type = XINE_POST_DATA_AUDIO; +- (xine_audio_port_t **)(*output)->xine_out.data = &port->original_port; ++ (*output)->xine_out.data = &port->original_port; + (*output)->xine_out.rewire = post_audio_rewire; + (*output)->post = post; + (*output)->user_data = port; +--- xine-lib-1.0.orig/src/xine-utils/color.c 2003-12-09 02:02:38.000000000 +0200 ++++ xine-lib-1.0/src/xine-utils/color.c 2006-02-09 22:13:36.000000000 +0200 +@@ -495,8 +495,10 @@ + + /* process blocks of 4 pixels */ + for (x=0; x < (width / 4); x++) { +- n1 = *(((unsigned int *) src1)++); +- n2 = *(((unsigned int *) src2)++); ++ n1 = *((unsigned int *) src1); ++ src1+=sizeof(unsigned int); ++ n2 = *((unsigned int *) src2); ++ src2+=sizeof(unsigned int); + n3 = (n1 & 0xFF00FF00) >> 8; + n4 = (n2 & 0xFF00FF00) >> 8; + n1 &= 0x00FF00FF; +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/avcodec.h 2004-05-30 22:24:19.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/avcodec.h 2006-02-09 22:33:27.000000000 +0200 +@@ -1639,6 +1639,13 @@ + #define FF_OPT_MAX_DEPTH 10 + } AVOption; + ++#ifdef HAVE_MMX ++extern const struct AVOption avoptions_common[3 + 5]; ++#else ++extern const struct AVOption avoptions_common[3]; ++#endif ++extern const struct AVOption avoptions_workaround_bug[11]; ++ + /** + * Parse option(s) and sets fields in passed structure + * @param strct structure where the parsed results will be written +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/common.h 2004-05-30 22:24:19.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/common.h 2006-02-09 22:32:56.000000000 +0200 +@@ -66,13 +66,13 @@ + #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr } + #define AVOPTION_END() AVOPTION_SUB(NULL) + +-struct AVOption; ++/*struct AVOption; + #ifdef HAVE_MMX + extern const struct AVOption avoptions_common[3 + 5]; + #else + extern const struct AVOption avoptions_common[3]; + #endif +-extern const struct AVOption avoptions_workaround_bug[11]; ++extern const struct AVOption avoptions_workaround_bug[11];*/ + + #endif /* HAVE_AV_CONFIG_H */ + +--- xine-lib-1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h 2004-05-30 22:24:22.000000000 +0300 ++++ xine-lib-1.0/src/libffmpeg/libavcodec/mpegvideo.h 2006-02-09 22:35:54.000000000 +0200 +@@ -904,7 +904,7 @@ + int ff_h263_resync(MpegEncContext *s); + int ff_h263_get_gob_height(MpegEncContext *s); + int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); +-int ff_h263_round_chroma(int x); ++/*int ff_h263_round_chroma(int x);*/ + void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); + int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); + +--- xine-lib-1.0.orig/src/libxineadec/nosefart/nes_apu.c 2004-12-12 08:55:59.000000000 +0200 ++++ xine-lib-1.0/src/libxineadec/nosefart/nes_apu.c 2006-02-11 22:42:29.000000000 +0200 +@@ -1012,9 +1012,15 @@ + + /* signed 16-bit output, unsigned 8-bit */ + if (16 == apu->sample_bits) +- *((int16 *) buffer)++ = (int16) accum; ++ { ++ *((int16 *) buffer) = (int16) accum; ++ buffer=((int16 *)buffer)+1; ++ } + else +- *((uint8 *) buffer)++ = (accum >> 8) ^ 0x80; ++ { ++ *((uint8 *) buffer) = (accum >> 8) ^ 0x80; ++ buffer=((int8 *)buffer)+1; ++ } + } + + /* resync cycle counter */ +--- xine-lib-1.0.orig/src/post/audio/stretch.c 2004-10-30 02:11:38.000000000 +0300 ++++ xine-lib-1.0/src/post/audio/stretch.c 2006-02-11 22:45:14.000000000 +0200 +@@ -476,7 +476,7 @@ + memcpy( outbuf->mem, data_out, + outbuf->num_frames * this->bytes_per_frame ); + num_frames_out -= outbuf->num_frames; +- (uint8_t *)data_out += outbuf->num_frames * this->bytes_per_frame; ++ data_out = (uint8_t *)data_out + outbuf->num_frames * this->bytes_per_frame; + + outbuf->vpts = this->pts; + this->pts = 0; +@@ -587,7 +587,7 @@ + memcpy( (uint8_t *)this->audiofrag + this->num_frames * this->bytes_per_frame, + data_in, frames_to_copy * this->bytes_per_frame ); + +- (uint8_t *)data_in += frames_to_copy * this->bytes_per_frame; ++ data_in = (uint8_t *)data_in + frames_to_copy * this->bytes_per_frame; + this->num_frames += frames_to_copy; + buf->num_frames -= frames_to_copy; + diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index fe809c1248..b8f22e7dc4 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -21,7 +21,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \ file://libxine-cut-memusage.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ - file://libxine-libavcodec.patch;patch=1" + file://libxine-libavcodec.patch;patch=1 \ + file://libxine-gcc4.patch;patch=1" S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" diff --git a/packages/linux/LAB-kernel/h2200/defconfig b/packages/linux/LAB-kernel/h2200/defconfig index f964289927..466c2072f5 100644 --- a/packages/linux/LAB-kernel/h2200/defconfig +++ b/packages/linux/LAB-kernel/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-hh1 -# Wed Nov 30 09:48:34 2005 +# Thu Feb 16 14:58:20 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -111,6 +111,8 @@ CONFIG_H2200_PM=y # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set # CONFIG_PXA_SHARPSL is not set CONFIG_PXA25x=y CONFIG_PXA_KEYS=y @@ -156,7 +158,7 @@ CONFIG_ARMBOOT_LBL_SYSCALL=y CONFIG_LAB_ARMBOOT=y CONFIG_LAB_NANDDUMP=y CONFIG_LAB_NANDCHECK=y -# CONFIG_LAB_RUN is not set +CONFIG_LAB_RUN=y # # Processor Type @@ -241,7 +243,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 cachepolicy=writeback root=/dev/mmcblk0p1" +CONFIG_CMDLINE="console=ttyS0,115200n8 mem=64M" # CONFIG_XIP_KERNEL is not set # @@ -282,7 +284,7 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=m +CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set @@ -349,28 +351,7 @@ CONFIG_NETFILTER=y # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -# CONFIG_BT_SCO is not set -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set -# CONFIG_BT_HIDP is not set - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIUART_BCSP_TXCRC is not set -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBTUART is not set -# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT is not set # # Device Drivers @@ -473,13 +454,10 @@ CONFIG_MTD_NAND_HAMCOP=y # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CDROM_PKTCDVD is not set @@ -606,19 +584,19 @@ CONFIG_INPUT=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_H2200 is not set +CONFIG_KEYBOARD_H2200=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -718,7 +696,7 @@ CONFIG_I2C_PXA=y # # CONFIG_WATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=m +# CONFIG_SA1100_RTC is not set # CONFIG_S3C2410_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -756,8 +734,8 @@ CONFIG_SOC_MQ11XX=y # # Misc devices # -CONFIG_BATTERY_MONITOR=m -# CONFIG_H2200_BATTERY is not set +CONFIG_BATTERY_MONITOR=y +CONFIG_H2200_BATTERY=y # # Multimedia Capabilities Port drivers @@ -796,18 +774,7 @@ CONFIG_FB_MQ1100=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=m -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -# CONFIG_FONT_8x16 is not set -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set +# CONFIG_FRAMEBUFFER_CONSOLE is not set # # Logo configuration @@ -828,11 +795,12 @@ CONFIG_BACKLIGHT_H2200=y # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y # CONFIG_W1_THERM is not set # CONFIG_W1_SMEM is not set -# CONFIG_W1_SAMCOP is not set -CONFIG_W1_DS2760=m +CONFIG_W1_SAMCOP=y +CONFIG_W1_SAMCOP_ONE_DEVICE=y +CONFIG_W1_DS2760=y # # USB support @@ -881,8 +849,7 @@ CONFIG_MMC_SAMCOP=y # # LED devices # -CONFIG_CLASS_LEDS=m -# CONFIG_LEDS_H2200 is not set +# CONFIG_CLASS_LEDS is not set # # File systems @@ -956,7 +923,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=y +# CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1034,7 +1001,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -1047,7 +1014,7 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # # Profiling support diff --git a/packages/linux/LAB-kernel/h2200/labrun.patch b/packages/linux/LAB-kernel/h2200/labrun.patch new file mode 100644 index 0000000000..29ff10eda2 --- /dev/null +++ b/packages/linux/LAB-kernel/h2200/labrun.patch @@ -0,0 +1,85 @@ +Index: lab/lab-main.c +=================================================================== +RCS file: /cvs/linux/kernel26/lab/lab-main.c,v +retrieving revision 1.9 +diff -u -p -r1.9 lab-main.c +--- kernel26/lab/lab-main.c 22 Dec 2005 02:17:57 -0000 1.9 ++++ kernel26/lab/lab-main.c 16 Feb 2006 22:02:29 -0000 +@@ -18,7 +18,7 @@ + #include <linux/lab/lab.h> + #include <linux/lab/commands.h> + +- ++void lab_runfile(char *source, char *sourcefile); + + int globfail; + EXPORT_SYMBOL (globfail); +@@ -67,7 +67,7 @@ static void parseargs (char *argstr, int + while ((c = *argstr) != 0) { + enum ParseState newState; + +- if (c == ';' && lastState != PS_STRING && lastState != PS_ESCAPE) ++ if ((c == ';' || c == '\n') && lastState != PS_STRING && lastState != PS_ESCAPE) + break; + + if (lastState == PS_ESCAPE) { +@@ -106,7 +106,7 @@ static void parseargs (char *argstr, int + if (argc_p != NULL) + *argc_p = argc; + +- if (*argstr == ';') ++ if (*argstr == ';' || *argstr == '\n') + *argstr++ = 0; + + *resid = argstr; +@@ -189,6 +189,7 @@ EXPORT_SYMBOL (lab_exec_string); + + static char *blockdevs[] = { + "/dev/mmc/blk0/part1", "ext2", ++ "/dev/ide/host0/bus0/target0/lun0/part1", "ext2", + "/dev/mtdblock/3", "jffs2", + NULL + }; +@@ -222,19 +223,19 @@ void lab_main (int cmdline) + } + lab_puts ("\r\n" + ">> Booting now.\r\n"); +- sys_mkdir("/fs", 0000); ++ sys_mkdir("/mnt", 0000); + sys_mount("/dev", "/dev", "devfs", 0, ""); + lab_puts (">> Looking for filesystems...\r\n"); + blockdev = blockdevs; + while (*blockdev) { + lab_printf(" >> Trying \"%s\"... ", blockdev[0]); +- if (sys_mount(blockdev[0], "/fs", blockdev[1], MS_RDONLY, "") >= 0) { ++ if (sys_mount(blockdev[0], "/mnt", blockdev[1], MS_RDONLY, "") >= 0) { + struct stat sstat; +- ++ + lab_printf("ok"); +- if (sys_newstat("/fs/boot/zImage", &sstat) < 0) { +- lab_printf(", but no zImage.\r\n"); +- sys_oldumount("/fs"); ++ if (sys_newstat("/mnt/boot/labrun", &sstat) < 0) { ++ lab_printf(", but no labrun.\r\n"); ++ sys_oldumount("/mnt"); + blockdev += 2; + continue; + } +@@ -249,12 +250,10 @@ void lab_main (int cmdline) + lab_printf(">> No bootable filesystems found!\r\n"); + goto domenu; + } +- lab_printf(">> Copying zImage... "); +- lab_copy("fs", "/fs/boot/zImage", "fs", "/zImage"); +- lab_printf("done\r\n>> Unmounting filesystem... "); +- sys_oldumount("/fs"); +- lab_printf("done\r\n>> Booting kernel.\r\n"); +- lab_armboot("fs", "/zImage", NULL); ++ ++ lab_printf(">> Executing labrun...\r\n"); ++ lab_runfile("fs", "/mnt/boot/labrun"); ++ lab_printf("done\r\n"); + } + + domenu: diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb new file mode 100644 index 0000000000..f50baf64ad --- /dev/null +++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb @@ -0,0 +1,38 @@ +SECTION = "kernel" +DESCRIPTION = "Liux As Bootloader kernelm" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +LICENSE = "GPL" + +KERNEL_CCSUFFIX = "-3.4.4" +COMPATIBLE_HOST = "arm.*-linux" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://labrun.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 6258a113d6..25241cec1e 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -3,17 +3,21 @@ DESCRIPTION = "Liux As Bootloader kernelm" MAINTAINER = "Koen Kooi <koen@handhelds.org>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -# + +#!BIG FAT WARNING: +#build this *before* building your real kernel, otherwise external modules will pickup the wrong headers + +DEFAULT_PREFERENCE = "-1" + KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ + file://labrun.patch;patch=1 \ file://defconfig" -#SRC_URI += bootshim? - S = "${WORKDIR}/kernel26" inherit kernel @@ -21,7 +25,7 @@ inherit kernel K_MAJOR = "2" K_MINOR = "6" K_MICRO = "13" -HHV = "1" +HHV = "2" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" @@ -36,6 +40,11 @@ do_deploy() { #add the bootshim? } +do_stage() { +#do nothing +} + + do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile diff --git a/packages/linux/ep93xx-kernel_2.6.15.bb b/packages/linux/ep93xx-kernel_2.6.15.bb index 7c9f81a924..500cae5fee 100644 --- a/packages/linux/ep93xx-kernel_2.6.15.bb +++ b/packages/linux/ep93xx-kernel_2.6.15.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" LICENSE = "GPL" -PR = "r0" +PR = "r3" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://linux-2.6.15-ep93xx-gao19.diff;patch=1 \ - file://defconfig" + http://wantstofly.org/~buytenh/ep93xx/derevo2.diff;patch=1 \ + " S = "${WORKDIR}/linux-${PV}" @@ -13,8 +13,8 @@ inherit kernel KERNEL_IMAGETYPE = "zImage" -do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config +do_configure() { + make ep93xx_defconfig } do_deploy() { diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig index 3a35128627..d1790dfe27 100644 --- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig @@ -642,7 +642,7 @@ CONFIG_MTD_NAND_HAMCOP=y # # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y @@ -992,7 +992,7 @@ CONFIG_SA1100_WATCHDOG=m # # CONFIG_USBPCWATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=y +CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -1444,7 +1444,7 @@ CONFIG_RAMFS=y # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set -CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_SUMMARY=y diff --git a/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch b/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch new file mode 100644 index 0000000000..1938f72829 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch @@ -0,0 +1,114 @@ +Index: linux-2.6.13/drivers/ide/ide-probe.c +=================================================================== +--- linux-2.6.13.orig/drivers/ide/ide-probe.c 2005-08-29 00:41:01.000000000 +0100 ++++ linux-2.6.13/drivers/ide/ide-probe.c 2005-09-21 20:57:34.000000000 +0100 +@@ -125,45 +125,6 @@ + } + + /** +- * drive_is_flashcard - check for compact flash +- * @drive: drive to check +- * +- * CompactFlash cards and their brethern pretend to be removable +- * hard disks, except: +- * (1) they never have a slave unit, and +- * (2) they don't have doorlock mechanisms. +- * This test catches them, and is invoked elsewhere when setting +- * appropriate config bits. +- * +- * FIXME: This treatment is probably applicable for *all* PCMCIA (PC CARD) +- * devices, so in linux 2.3.x we should change this to just treat all +- * PCMCIA drives this way, and get rid of the model-name tests below +- * (too big of an interface change for 2.4.x). +- * At that time, we might also consider parameterizing the timeouts and +- * retries, since these are MUCH faster than mechanical drives. -M.Lord +- */ +- +-static inline int drive_is_flashcard (ide_drive_t *drive) +-{ +- struct hd_driveid *id = drive->id; +- +- if (drive->removable) { +- if (id->config == 0x848a) return 1; /* CompactFlash */ +- if (!strncmp(id->model, "KODAK ATA_FLASH", 15) /* Kodak */ +- || !strncmp(id->model, "Hitachi CV", 10) /* Hitachi */ +- || !strncmp(id->model, "SunDisk SDCFB", 13) /* old SanDisk */ +- || !strncmp(id->model, "SanDisk SDCFB", 13) /* SanDisk */ +- || !strncmp(id->model, "HAGIWARA HPC", 12) /* Hagiwara */ +- || !strncmp(id->model, "LEXAR ATA_FLASH", 15) /* Lexar */ +- || !strncmp(id->model, "ATA_FLASH", 9)) /* Simple Tech */ +- { +- return 1; /* yes, it is a flash memory card */ +- } +- } +- return 0; /* no, it is not a flash memory card */ +-} +- +-/** + * do_identify - identify a drive + * @drive: drive to identify + * @cmd: command used +@@ -278,13 +239,17 @@ + /* + * Not an ATAPI device: looks like a "regular" hard disk + */ +- if (id->config & (1<<7)) +- drive->removable = 1; + +- if (drive_is_flashcard(drive)) +- drive->is_flash = 1; ++ /* ++ * 0x848a = CompactFlash device ++ * These are *not* removable in Linux definition of the term ++ */ ++ ++ if ((id->config != 0x848a) && (id->config & (1<<7))) ++ drive->removable = 1; ++ + drive->media = ide_disk; +- printk("%s DISK drive\n", (drive->is_flash) ? "CFA" : "ATA" ); ++ printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" ); + QUIRK_LIST(drive); + return; + +Index: linux-2.6.13/drivers/ide/ide.c +=================================================================== +--- linux-2.6.13.orig/drivers/ide/ide.c 2005-09-19 10:53:59.000000000 +0100 ++++ linux-2.6.13/drivers/ide/ide.c 2005-09-21 20:52:53.000000000 +0100 +@@ -242,7 +242,6 @@ + drive->name[2] = 'a' + (index * MAX_DRIVES) + unit; + drive->max_failures = IDE_DEFAULT_MAX_FAILURES; + drive->using_dma = 0; +- drive->is_flash = 0; + drive->vdma = 0; + INIT_LIST_HEAD(&drive->list); + sema_init(&drive->gendev_rel_sem, 0); +Index: linux-2.6.13/drivers/ide/ide-disk.c +=================================================================== +--- linux-2.6.13.orig/drivers/ide/ide-disk.c 2005-09-19 10:53:59.000000000 +0100 ++++ linux-2.6.13/drivers/ide/ide-disk.c 2005-09-21 20:51:31.000000000 +0100 +@@ -895,11 +895,7 @@ + if (drive->id_read == 0) + return; + +- /* +- * CompactFlash cards and their brethern look just like hard drives +- * to us, but they are removable and don't have a doorlock mechanism. +- */ +- if (drive->removable && !(drive->is_flash)) { ++ if (drive->removable) { + /* + * Removable disks (eg. SYQUEST); ignore 'WD' drives + */ +Index: linux-2.6.13/include/linux/ide.h +=================================================================== +--- linux-2.6.13.orig/include/linux/ide.h 2005-08-29 00:41:01.000000000 +0100 ++++ linux-2.6.13/include/linux/ide.h 2005-09-21 20:56:29.000000000 +0100 +@@ -697,7 +697,6 @@ + unsigned noprobe : 1; /* from: hdx=noprobe */ + unsigned removable : 1; /* 1 if need to do check_media_change */ + unsigned attach : 1; /* needed for removable devices */ +- unsigned is_flash : 1; /* 1 if probed as flash */ + unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */ + unsigned no_unmask : 1; /* disallow setting unmask bit */ + unsigned no_io_32bit : 1; /* disallow enabling 32bit I/O */ diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig index 2345e08518..e4f9028150 100644 --- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig +++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15-hh0 -# Thu Feb 2 11:51:53 2006 +# Wed Feb 15 12:18:35 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -236,6 +236,11 @@ CONFIG_CMDLINE="keepinitrd" # CONFIG_XIP_KERNEL is not set # +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# # Floating point emulation # @@ -1117,7 +1122,6 @@ CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CONFIG_SND_GENERIC_DRIVER=y # # Generic devices @@ -1134,13 +1138,14 @@ CONFIG_SND_GENERIC_DRIVER=y # CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set CONFIG_SND_HX4700=m -# CONFIG_SND_PXA2XX_UDA1380 is not set # CONFIG_SND_H5XXX_AK4535 is not set +CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set # # PCMCIA devices # +CONFIG_SND_AK4641=m # # Open Sound System diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb new file mode 100644 index 0000000000..f0fe6f32e9 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb @@ -0,0 +1,36 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." +MAINTAINER = "Greg Gilbert <greg@treke.net>" +LICENSE = "GPL" + +COMPATIBLE_HOST = "arm.*-linux" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://ide_not_removable-r0.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index e7973518c7..0862199528 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1596,7 +1596,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set +CONFIG_CODA_FS=m # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.15.2.bb b/packages/linux/ixp4xx-kernel_2.6.15.3.bb index 10163296b6..d62147392c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.3.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "0" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r2.${PR_CONFIG}" +PR = "r0.${PR_CONFIG}" include ixp4xx-kernel.inc diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index 6369eb9abc..a034fca982 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "2" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches diff --git a/packages/matchbox-common/matchbox-common/add-media-category.patch b/packages/matchbox-common/matchbox-common/add-media-category.patch new file mode 100644 index 0000000000..5c502b3797 --- /dev/null +++ b/packages/matchbox-common/matchbox-common/add-media-category.patch @@ -0,0 +1,37 @@ +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am matchbox-common-0.9.1/data/vfolders-pda/Makefile.am +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am 2004-12-01 12:22:30.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Makefile.am 2006-02-16 21:32:57.000000000 +0100 +@@ -1,5 +1,6 @@ + desktop_files = Applications.directory \ + Games.directory \ ++ Media.directory \ + Other.directory \ + Root.directory \ + Settings.directory \ +@@ -11,4 +12,4 @@ + vfolders_DATA = $(desktop_files) + endif + +-EXTRA_DIST = $(desktop_files) +\ No newline at end of file ++EXTRA_DIST = $(desktop_files) +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory matchbox-common-0.9.1/data/vfolders-pda/Media.directory +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory 1970-01-01 01:00:00.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Media.directory 2006-02-16 21:16:29.000000000 +0100 +@@ -0,0 +1,8 @@ ++[Desktop Entry] ++Name=Media ++Name[de]=Medien ++Comment=View media files ++Comment[de]=Programme zur Wiedergabe von audiovisuellen Medien ++Icon=mbfolder.png ++Type=Directory ++Match=AudioVideo;Graphics;Media;Viewer; +diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order matchbox-common-0.9.1/data/vfolders-pda/Root.order +--- matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order 2006-02-16 20:51:36.000000000 +0100 ++++ matchbox-common-0.9.1/data/vfolders-pda/Root.order 2006-02-16 20:53:23.000000000 +0100 +@@ -1,3 +1,4 @@ ++Media + Games + Settings + Other diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index 27c2bdf508..d2db4683e1 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -2,10 +2,11 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager common files" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ - file://no-utilities-category.patch;patch=1" + file://no-utilities-category.patch;patch=1 \ + file://add-media-category.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/.mtn2git_empty diff --git a/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch new file mode 100644 index 0000000000..e4c245e5f0 --- /dev/null +++ b/packages/matchbox-desktop/matchbox-desktop-0.9.1/mb-desktop-multi-category-matching.patch @@ -0,0 +1,39 @@ +--- matchbox-desktop-0.9.1/modules/dotdesktop.c.orig 2006-02-15 23:08:31.000000000 +0100 ++++ matchbox-desktop-0.9.1/modules/dotdesktop.c 2006-02-16 00:31:46.000000000 +0100 +@@ -84,9 +84,33 @@ + item_fallback = item; + continue; + } +- if (category && strstr(category, match_str)) +- { +- return item; ++ if (category) ++ { ++ if (strstr(match_str, ";")) ++ { ++ char *s; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ if (strstr (category, tok)) ++ { ++ free (tok); ++ return item; ++ } ++ match_str = s + 1; ++ ++ free (tok); ++ } ++ } ++ else if (strstr(category, match_str)) ++ { ++ return item; ++ } + } + } + } diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 5b1e472de7..5e9748c4d9 100644 --- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,8 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" +PR = "r1" -SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ + file://mb-desktop-multi-category-matching.patch;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-allow-disabling-menu-panel.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-allow-disabling-menu-panel.patch new file mode 100644 index 0000000000..fb1a021c31 --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-allow-disabling-menu-panel.patch @@ -0,0 +1,33 @@ +--- matchbox-panel-0.9.2.multi/applets/mb-applet-menu-launcher.c 2006-02-16 00:43:28.000000000 +0100 ++++ matchbox-panel-0.9.2/applets/mb-applet-menu-launcher.c 2006-02-17 20:25:14.000000000 +0100 +@@ -392,7 +392,8 @@ + FILE *fp; + char *buf; + int len; +- MBMenuMenu *menu_panel; ++ MBMenuMenu *menu_panel = NULL; ++ char *menu_panel_disabled = getenv ("MB_MENU_PANEL_DISABLED"); + char *tmp_path = NULL, *tmp_path2 = NULL ; + + char vfolder_path_root[512]; +@@ -453,8 +454,8 @@ + + } + +- menu_panel = mb_menu_add_path(app_data->mbmenu, "Utilities/Panel" , NULL, MBMENU_NO_SORT ); +- ++ if (!menu_panel_disabled) ++ menu_panel = mb_menu_add_path(app_data->mbmenu, "Utilities/Panel" , NULL, MBMENU_NO_SORT ); + + tmp_path = mb_dot_desktop_icon_get_full_path (app_data->theme_name, + 16, +@@ -620,6 +621,9 @@ + && !strcmp(mb_dotdesktop_get(dd, "Type"), + "PanelApp")) + { ++ if (menu_panel_disabled) ++ continue; ++ + m = menu_panel; + } + diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch new file mode 100644 index 0000000000..3bd5d915b5 --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel-0.9.2/mb-panel-multi-category-matching.patch @@ -0,0 +1,32 @@ +--- matchbox-panel-0.9.2/applets/mb-applet-menu-launcher.c 2005-04-06 22:13:00.000000000 +0200 ++++ matchbox-panel-0.9.2.new/applets/mb-applet-menu-launcher.c 2006-02-16 00:43:28.000000000 +0100 +@@ -566,7 +566,28 @@ + { + fallback = menu_lookup[i].item; + } +- if (strstr(category, ++ if (strstr(menu_lookup[i].match_str, ";")) ++ { ++ char *s; ++ char *match_str = menu_lookup[i].match_str; ++ ++ while (s = strstr(match_str, ";")) ++ { ++ size_t len = s - match_str; ++ char *tok = (char *) malloc (sizeof (char) * (len + 1)); ++ ++ strncpy (tok, match_str, len); ++ tok[len] = 0; ++ match_str = s + 1; ++ ++ if (strstr (category, tok)) ++ { ++ m = menu_lookup[i].item; ++ } ++ free (tok); ++ } ++ } ++ else if (strstr(category, + menu_lookup[i].match_str)) + { + m = menu_lookup[i].item; diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb index 0e2ccf3f07..8be2174daf 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb @@ -1,11 +1,13 @@ include matchbox-panel.inc -PR="r10" +PR="r12" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://add_hostap.patch;patch=1 \ http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \ http://handhelds.org/~pb/mb-panel-0.9.2-msgcancel.patch;patch=1 \ file://mb-applet-battery-repaint.patch;patch=1 \ + file://mb-panel-multi-category-matching.patch;patch=1 \ + file://mb-panel-allow-disabling-menu-panel.patch;patch=1 \ file://system-monitor-crash-fix.patch;patch=1 " diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index d4b3830e6e..f4d8dbf30b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -109,6 +109,7 @@ SLUGOS_PACKAGES = "\ nano \ ncftp \ ncurses \ + netcat \ netpbm \ nmap \ ntp \ diff --git a/packages/offlineimap/offlineimap_4.0.11.bb b/packages/offlineimap/offlineimap_4.0.11.bb new file mode 100644 index 0000000000..80c3187419 --- /dev/null +++ b/packages/offlineimap/offlineimap_4.0.11.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "OfflineIMAP is a tool to simplify your e-mail reading." +HOMEPAGE = "http://gopher.quux.org:70/devel/offlineimap" +LICENSE = "GPL" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +SECTION = "console/network" +LICENSE = "GPL PSF" +RDEPENDS = "python-re python-netclient python-lang \ + python-threading python-stringold python-crypt python-mailbox" + +SRC_URI = "${DEBIAN_MIRROR}/main/o//offlineimap/offlineimap_${PV}.tar.gz" +S = "${WORKDIR}/offlineimap" + +inherit distutils + +do_install_append() { + sed -i -e 's|#!.*/python|#!${bindir}/python|' ${D}${bindir}/offlineimap +} diff --git a/packages/python/python-pylinda/honor-datadir.patch b/packages/python/python-pylinda/honor-datadir.patch index 9035804592..decf686e34 100644 --- a/packages/python/python-pylinda/honor-datadir.patch +++ b/packages/python/python-pylinda/honor-datadir.patch @@ -3,27 +3,13 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- linda-0.4/setup.py~honor-datadir.patch -+++ linda-0.4/setup.py -@@ -74,7 +74,7 @@ - class myinstall(install): - def run(self): - install.run(self) -- -+ return - print "PyLinda's post-install options" +--- linda-0.6/setup.py~honor-datadir.patch ++++ linda-0.6/setup.py +@@ -68,6 +68,7 @@ + f.close() - # the following is taken from the install_scripts standard command -@@ -123,9 +123,9 @@ - Topic :: System :: Distributed Computing""".split("\n"), - version="0.4", - scripts=["linda_server.py"], -- data_files=[(root_path+"/examples", glob.glob("examples/*.py")), -- (root_path+"/doc", glob.glob("doc/html/*")), -- (root_path, ["README"])], -+ data_files=[("examples", glob.glob("examples/*.py")), -+ ("doc", glob.glob("doc/html/*")), -+ (".", ["README"])], - ext_modules=ext, - packages=["linda"], - package_dir={"linda": ""}, + def getlibpath(): ++ return os.getenv("LINDA_DATADIR") + l = sys.path + l.reverse() + for x in l: diff --git a/packages/python/python-pylinda_0.5.bb b/packages/python/python-pylinda_0.6.bb index 788db867c4..3bcd1a1362 100644 --- a/packages/python/python-pylinda_0.5.bb +++ b/packages/python/python-pylinda_0.6.bb @@ -10,3 +10,5 @@ SRC_URI = "http://www-users.cs.york.ac.uk/~aw/pylinda/dist/linda-${PV}.tar.gz \ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +export LINDA_DATADIR = "${D}/${libdir}/${PYTHON_DIR}" diff --git a/packages/xserver-common/files/cxk-rotation.patch b/packages/xserver-common/files/cxk-rotation.patch deleted file mode 100644 index f29d052d8d..0000000000 --- a/packages/xserver-common/files/cxk-rotation.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur xserver-common-1.1~/X11/Xinit.d/11zaurus xserver-common-1.1/X11/Xinit.d/11zaurus ---- xserver-common-1.1~/X11/Xinit.d/11zaurus 2005-08-29 03:52:46.000000000 -0700 -+++ xserver-common-1.1/X11/Xinit.d/11zaurus 2005-09-12 11:03:37.000000000 -0700 -@@ -5,8 +5,19 @@ - exit 0 - fi - -+module_id() { -+ # Get model name -+ echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` -+} -+ - chkhinge -e - if [ $? = 12 ]; then -- xrandr -o right -+ case `module_id` in -+ *SPITZ | *AKITA | *BORZOI) -+ DIRECTION="left" ;; -+ default) -+ DIRECTION="right" ;; -+ esac -+ xrandr -o $DIRECTION - fi - diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb new file mode 100644 index 0000000000..125b138f02 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -0,0 +1,11 @@ +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe |