diff options
111 files changed, 2563 insertions, 234 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1728b65709..6a9077d55a 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 09b9cbac96..6e3d5f8ba2 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,11 +1,15 @@ +DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # # override variables set by qmake-base to compile Qt/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" + + diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 04aff565be..635fc67694 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,16 +1,17 @@ DEPENDS_prepend = "qmake2-native " +DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}" # # override variables set by qmake-base to compile Qt4/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" -export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" -export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" +export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4" +export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4" +export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/qmake2" +export OE_QMAKE_LINK = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/sip.bbclass b/classes/sip.bbclass index 7e049bc65a..adf179b130 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -1,6 +1,11 @@ -DEPENDS_prepend = "sip-native python-sip " +# Build Class for Sip based Python Bindings +# (C) Michael 'Mickey' Lauer <mickey@Vanille.de> +# -#EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" +DEPENDS =+ "sip-native python-sip" + +# default stuff, do not uncomment +# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" sip_do_generate() { if [ -z "${SIP_MODULES}" ]; then diff --git a/classes/sip4.bbclass b/classes/sip4.bbclass index d58c2d6381..ca2b1dae20 100644 --- a/classes/sip4.bbclass +++ b/classes/sip4.bbclass @@ -1,5 +1,10 @@ -DEPENDS_prepend = "sip4-native " -RDEPENDS_append = "python-sip4" +# Build Class for Sip based Python Bindings +# (C) Michael 'Mickey' Lauer <mickey@Vanille.de> +# +DEPENDS =+ "sip4-native" +RDEPENDS += "python-sip4" + +# default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1" sip4_do_generate() { diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 1f1be076c9..c80a574a0d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -15,6 +15,7 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" SRCDATE = "20060425" +SRCDATE_handhelds-pxa-2.6 = "20060506" # Opie diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index acb055eb42..b1591efadd 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -36,7 +36,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "3.6" +SLUGOS_VERSION = "3.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 03fa7faa62..5aa492f57d 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -2,9 +2,7 @@ #@NAME: HP Jornada 680 #@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer -TARGET_ARCH = "sh" +TARGET_ARCH = "sh3" IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}" -PREFERRED_VERSION_glibc = "2.3.4" -PREFERRED_VERSION_glibc-initial = "2.3.4" include conf/machine/include/tune-sh3.conf diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 8df7b51d69..68efccef32 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,18 +1,10 @@ TARGET_ARCH = "powerpc" -TARGET_OS = "linux" IPKG_ARCHS = "all ppc ${MACHINE}" UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" -DISTRO = "familiar" TARGET_PREFIX = powerpc-603e-linux-gnu- -ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" -PREFERRED_PROVIDERS += "virtual/qte:qte virtual/libqpe:libqpe-opie" -PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe" -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" IMAGE_FSTYPES = "jffs2 tar.bz2" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index b6fba3498d..d24324a598 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -13,7 +13,7 @@ XSERVER = "xserver-kdrive-omap" GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-arm926ejs.conf +#include conf/machine/include/tune-arm926ejs.conf #size of the root partition (yes, it is 123 MB) @@ -21,7 +21,6 @@ ROOT_FLASH_SIZE = "123" EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000" # serial console port on devboard rev. B3 -#SERIAL_CONSOLE = "115200 tts/0" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" @@ -29,24 +28,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ apm ppp wireless-tools console-tools" -# NFS Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" -# Crypto Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" -# SMB and CRAMFS -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" -# Serial Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 " -# Bluetooth Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "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" -# PPP Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" - -#USB Gadget Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ -# kernel-module-g-ether" - +#use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " diff --git a/packages/mysql/mysql-4.1.16/.mtn2git_empty b/contrib/qa/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mysql/mysql-4.1.16/.mtn2git_empty +++ b/contrib/qa/.mtn2git_empty diff --git a/contrib/qa/ipkg-diff/.mtn2git_empty b/contrib/qa/ipkg-diff/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/contrib/qa/ipkg-diff/.mtn2git_empty diff --git a/contrib/qa/ipkg-diff/README b/contrib/qa/ipkg-diff/README new file mode 100644 index 0000000000..7ddc4419cd --- /dev/null +++ b/contrib/qa/ipkg-diff/README @@ -0,0 +1,12 @@ +A Small utility to diff two directories of Itsy Packages. + +This utility will take two directories hopefully containing +Itsy Packages (ipk) and compare the ipks. It will find deleted +and new packages but will also compare packages with the same +name. And check file types, sizes, control files. And one time +it will be able to find upgrades and scan them as well. + +(this script is meant to be hacky, hacky, hacky and to do the + job) + +The only pattern applied is a Anti-Pattern: Time pressure diff --git a/contrib/qa/ipkg-diff/ipkg-diff b/contrib/qa/ipkg-diff/ipkg-diff new file mode 100644 index 0000000000..276b8b2e1e --- /dev/null +++ b/contrib/qa/ipkg-diff/ipkg-diff @@ -0,0 +1,134 @@ +#!/usr/bin/env python +# License of this file: +# Copy, Modify, Change, Sell it at your will. +# +# There is absolutely no warranty with this file +# +# (C) Copyright 2006 Holger Hans Peter Freyther + + + +def check_dir(name, error): + """ + Check if the given directory exists, if not error + is printed and the application is left. + """ + import os, sys + import stat + if not os.path.isdir(name): + print error + sys.exit(-1) + + +def find_packages(dir): + import os + contents = os.listdir(dir) + ipks = [] + for f in contents: + (root,ext) = os.path.splitext(f) + if ext == ".ipk": + ipks.append( f ) + return ipks + +def diff_dirs( old_ipks, new_ipks ): + """ + We will return three lists. The first one will + contain the files that are only in a, the second + the files in both directories and the third one + will + """ + only_old = [ i for i in old_ipks if i not in new_ipks] + both = [ i for i in old_ipks if i in new_ipks ] + only_new = [ i for i in new_ipks if i not in old_ipks] + + return only_old, both, only_new + +def diff_packages( old, new ): + def compare( name, version, method, txt ): + """ + Compare package with name and version with method + and print error message + """ + try: + if not method( old[package_name][version], new[package_name][version] ): + print txt + except: + print "Error with %s %s and '%s'" % (package_name,version, txt) + + for package_name in old.keys(): + for version in old[package_name].keys(): + print "Comparing %s %s" % (package_name, version) + compare( package_name, version, lambda x,y: x.get_maintainer() == y.get_maintainer(), "Maintainer is different" ) + compare( package_name, version, lambda x,y: x.get_architecture() == y.get_architecture(), "Architecture is different" ) + compare( package_name, version, lambda x,y: x.get_description() == y.get_description(), "Description is different" ) + compare( package_name, version, lambda x,y: x.get_depends() == y.get_depends(), "Depends are different" ) + compare( package_name, version, lambda x,y: x.get_provides() == y.get_provides(), "Provides are different" ) + compare( package_name, version, lambda x,y: x.get_conflicts() == y.get_conflicts(), "Provides are different" ) + compare( package_name, version, lambda x,y: x.get_suggests() == y.get_suggests(), "Suggests are different" ) + compare( package_name, version, lambda x,y: x.get_source() == y.get_source(), "Source is different" ) + compare( package_name, version, lambda x,y: x.get_section() == y.get_section(), "Section is different" ) + compare( package_name, version, lambda x,y: x.get_file_list() == y.get_file_list(), "Filelist is different" ) + compare( package_name, version, lambda x,y: x.md5 == y.md5, "MD5 is different" ) + +def print_result_start( old, both, new ): + """ + Print the findings of ipkg-diff + """ + print "ipkg-diff diff report" + print "%d packages found" % (len(old)+len(both)+len(new)) + print "# of old/removed packages: %d" % len(old) + print "# of new packages: %d" % len(new) + print "# of possible changed packages: %d" % len(both) + print "" + + if len(old) > 0: + for i in old: + print "Vanished ipk: %s" % i + + if len(new) > 0: + for i in new: + print "New ipk: %s" % i + + +def parse_packages(dir, package_names): + import ipkg, os + packages = {} + + for package in package_names: + p = ipkg.Package(os.path.join(dir, package)) + + if not p.get_package() in packages: + packages[p.get_package()] = {} + packages[p.get_package()][p.get_version()] = p + + return packages + + +if __name__ == "__main__": + import os,sys + + # sanity + if len(sys.argv) != 3: + print "ipkg-diff OLD NEW" + sys.exit(-2) + + # check dirs + check_dir(sys.argv[1], "Source Directory does not exist") + check_dir(sys.argv[2], "Dest Directory does not exists") + + # find packages + old_ipks = find_packages(sys.argv[1]) + new_ipks = find_packages(sys.argv[2]) + + # find removed and new files + only_old, both, only_new = diff_dirs( old_ipks, new_ipks ) + + # print a summary header + print_result_start( only_old, both, only_new ) + + # start diffing the content by parsing the packages + print "Loading Content into memory" + old_packages = parse_packages(sys.argv[1], both ) + new_packages = parse_packages(sys.argv[2], both ) + + diff_packages( old_packages, new_packages ) diff --git a/contrib/qa/ipkg-diff/ipkg.py b/contrib/qa/ipkg-diff/ipkg.py new file mode 100644 index 0000000000..02aab229ee --- /dev/null +++ b/contrib/qa/ipkg-diff/ipkg.py @@ -0,0 +1,462 @@ +#!/usr/bin/env python +# Copyright (C) 2001 Alexander S. Guy <a7r@andern.org> +# Andern Research Labs +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. */ +# +# Copyright 2001, Russell Nelson <ipkg.py@russnelson.com> +# Added reading in of packages. +# Added missing package information fields. +# Changed render_control() to __repr__(). +# +# Current Issues: +# The API doesn't validate package information fields. It should be +# throwing exceptions in the right places. +# Executions of tar could silently fail. +# Executions of tar *do* fail, and loudly, because you have to specify a full filename, +# and tar complains if any files are missing, and the ipkg spec doesn't require +# people to say "./control.tar.gz" or "./control" when they package files. +# It would be much better to require ./control or disallow ./control (either) +# rather than letting people pick. Some freedoms aren't worth their cost. + +import tempfile +import os +import sys +import glob +import md5 +import re +import string +import commands +from stat import ST_SIZE + +class Version: + """A class for holding parsed package version information.""" + def __init__(self, epoch, version): + self.epoch = epoch + self.version = version + + def _versioncompare(self, ref): + selfversion = self.version + refversion = ref.version + while 1: + ## first look for non-numeric version component + selfm = re.match('([^0-9]*)(.*)', selfversion) + #print 'selfm', selfm.groups() + (selfalpha, selfversion) = selfm.groups() + refm = re.match('([^0-9]*)(.*)', refversion) + #print 'refm', refm.groups() + (refalpha, refversion) = refm.groups() + if (selfalpha > refalpha): + return 1 + elif (selfalpha < refalpha): + return -1 + ## now look for numeric version component + (selfnum, selfversion) = re.match('([0-9]*)(.*)', selfversion).groups() + (refnum, refversion) = re.match('([0-9]*)(.*)', refversion).groups() + #print 'selfnum', selfnum, selfversion + #print 'refnum', refnum, refversion + if (selfnum != ''): + selfnum = int(selfnum) + else: + selfnum = -1 + if (refnum != ''): + refnum = int(refnum) + else: + refnum = -1 + if (selfnum > refnum): + return 1 + elif (selfnum < refnum): + return -1 + if selfversion == '' and refversion == '': + return 0 + + def compare(self, ref): + if (self.epoch > ref.epoch): + return 1 + elif (self.epoch < ref.epoch): + return -1 + else: + return self._versioncompare(ref) + +def parse_version(versionstr): + epoch = 0 + # check for epoch + m = re.match('([0-9]*):(.*)', versionstr) + if m: + (epochstr, versionstr) = m.groups() + epoch = int(epochstr) + return Version(epoch, versionstr) + +class Package: + """A class for creating objects to manipulate (e.g. create) ipkg + packages.""" + def __init__(self, fn=None): + self.package = None + self.version = 'none' + self.parsed_version = None + self.architecture = None + self.maintainer = None + self.source = None + self.description = None + self.depends = None + self.provides = None + self.replaces = None + self.conflicts = None + self.recommends = None + self.suggests = None + self.section = None + self.filename_header = None + self.file_list = [] + self.md5 = None + self.size = None + self.installed_size = None + self.filename = None + self.isdeb = 0 + + if fn: + # see if it is deb format + f = open(fn, "r") + magic = f.read(4) + f.close() + if (magic == "!<ar"): + self.isdeb = 1 + + # compute the MD5. + f = open(fn, "r") + sum = md5.new() + while 1: + data = f.read(1024) + if not data: break + sum.update(data) + f.close() + if sys.version[:1] > '2': + # when using Python 2.0 or newer + self.md5 = sum.hexdigest() + else: + self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'') + stat = os.stat(fn) + self.size = stat[ST_SIZE] + self.filename = os.path.basename(fn) + ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) + if self.isdeb: + control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r") + else: + control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r") + line = control.readline() + while 1: + if not line: break + line = string.rstrip(line) + lineparts = re.match(r'([\w-]*?):\s*(.*)', line) + if lineparts: + name = string.lower(lineparts.group(1)) + value = lineparts.group(2) + while 1: + line = control.readline() + if not line: break + if line[0] != ' ': break + line = string.rstrip(line) + value = value + '\n' + line + # don't allow package to override its own filename + if name == "filename": + self.filename_header = value + else: + if self.__dict__.has_key(name): + self.__dict__[name] = value + else: + line = control.readline() + control.close() + if self.isdeb: + data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r") + else: + data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r") + while 1: + line = data.readline() + if not line: break + self.file_list.append(string.rstrip(line)) + data.close() + + self.scratch_dir = None + self.file_dir = None + self.meta_dir = None + + def read_control(self, control): + import os + + line = control.readline() + while 1: + if not line: break + line = string.rstrip(line) + lineparts = re.match(r'([\w-]*?):\s*(.*)', line) + if lineparts: + name = string.lower(lineparts.group(1)) + value = lineparts.group(2) + while 1: + line = control.readline() + if not line: break + if line[0] != ' ': break + value = value + '\n' + line + if name == 'size': + self.size = int(value) + elif self.__dict__.has_key(name): + self.__dict__[name] = value + if line[0] == '\n': + return # consumes one blank line at end of package descriptoin + else: + line = control.readline() + pass + return + + def _setup_scratch_area(self): + self.scratch_dir = "%s/%sipkg" % (tempfile.gettempdir(), + tempfile.gettempprefix()) + self.file_dir = "%s/files" % (self.scratch_dir) + self.meta_dir = "%s/meta" % (self.scratch_dir) + + os.mkdir(self.scratch_dir) + os.mkdir(self.file_dir) + os.mkdir(self.meta_dir) + + def set_package(self, package): + self.package = package + + def get_package(self): + return self.package + + def set_version(self, version): + self.version = version + self.parsed_version = parse_version(version) + + def get_version(self): + return self.version + + def set_architecture(self, architecture): + self.architecture = architecture + + def get_architecture(self): + return self.architecture + + def set_maintainer(self, maintainer): + self.maintainer = maintainer + + def get_maintainer(self): + return self.maintainer + + def set_source(self, source): + self.source = source + + def get_source(self): + return self.source + + def set_description(self, description): + self.description = description + + def get_description(self): + return self.description + + def set_depends(self, depends): + self.depends = depends + + def get_depends(self, depends): + return self.depends + + def set_provides(self, provides): + self.provides = provides + + def get_provides(self, provides): + return self.provides + + def set_replaces(self, replaces): + self.replaces = replaces + + def get_replaces(self, replaces): + return self.replaces + + def set_conflicts(self, conflicts): + self.conflicts = conflicts + + def get_conflicts(self, conflicts): + return self.conflicts + + def set_suggests(self, suggests): + self.suggests = suggests + + def get_suggests(self, suggests): + return self.suggests + + def set_section(self, section): + self.section = section + + def get_section(self, section): + return self.section + + def get_file_list(self): + return self.file_list + + def write_package(self, dirname): + buf = self.render_control() + file = open("%s/control" % self.meta_dir, 'w') + file.write(buf) + + self._setup_scratch_area() + cmd = "cd %s ; tar cvfz %s/control.tar.gz control" % (self.meta_dir, + self.scratch_dir) + + cmd_out, cmd_in, cmd_err = os.popen3(cmd) + + while cmd_err.readline() != "": + pass + + cmd_out.close() + cmd_in.close() + cmd_err.close() + + bits = "control.tar.gz" + + if self.file_list: + cmd = "cd %s ; tar cvfz %s/data.tar.gz" % (self.file_dir, + self.scratch_dir) + + cmd_out, cmd_in, cmd_err = os.popen3(cmd) + + while cmd_err.readline() != "": + pass + + cmd_out.close() + cmd_in.close() + cmd_err.close() + + bits = bits + " data.tar.gz" + + file = "%s_%s_%s.ipk" % (self.package, self.version, self.architecture) + cmd = "cd %s ; tar cvfz %s/%s %s" % (self.scratch_dir, + dirname, + file, + bits) + + cmd_out, cmd_in, cmd_err = os.popen3(cmd) + + while cmd_err.readline() != "": + pass + + cmd_out.close() + cmd_in.close() + cmd_err.close() + + def compare_version(self, ref): + """Compare package versions of self and ref""" + if not self.version: + print 'No version for package %s' % self.package + if not ref.version: + print 'No version for package %s' % ref.package + if not self.parsed_version: + self.parsed_version = parse_version(self.version) + if not ref.parsed_version: + ref.parsed_version = parse_version(ref.version) + return self.parsed_version.compare(ref.parsed_version) + + def __repr__(self): + out = "" + + # XXX - Some checks need to be made, and some exceptions + # need to be thrown. -- a7r + + if self.package: out = out + "Package: %s\n" % (self.package) + if self.version: out = out + "Version: %s\n" % (self.version) + if self.depends: out = out + "Depends: %s\n" % (self.depends) + if self.provides: out = out + "Provides: %s\n" % (self.provides) + if self.replaces: out = out + "Replaces: %s\n" % (self.replaces) + if self.conflicts: out = out + "Conflicts: %s\n" % (self.conflicts) + if self.suggests: out = out + "Suggests: %s\n" % (self.suggests) + if self.recommends: out = out + "Recommends: %s\n" % (self.recommends) + if self.section: out = out + "Section: %s\n" % (self.section) + if self.architecture: out = out + "Architecture: %s\n" % (self.architecture) + if self.maintainer: out = out + "Maintainer: %s\n" % (self.maintainer) + if self.md5: out = out + "MD5Sum: %s\n" % (self.md5) + if self.size: out = out + "Size: %d\n" % int(self.size) + if self.installed_size: out = out + "InstalledSize: %d\n" % int(self.installed_size) + if self.filename: out = out + "Filename: %s\n" % (self.filename) + if self.source: out = out + "Source: %s\n" % (self.source) + if self.description: out = out + "Description: %s\n" % (self.description) + out = out + "\n" + + return out + + def __del__(self): + # XXX - Why is the `os' module being yanked out before Package objects + # are being destroyed? -- a7r + pass + +class Packages: + """A currently unimplemented wrapper around the ipkg utility.""" + def __init__(self): + self.packages = {} + return + + def add_package(self, pkg): + package = pkg.package + arch = pkg.architecture + name = ("%s:%s" % (package, arch)) + if (not self.packages.has_key(name)): + self.packages[name] = pkg + + if pkg.compare_version(self.packages[name]) >= 0: + self.packages[name] = pkg + return 0 + else: + return 1 + + def read_packages_file(self, fn): + f = open(fn, "r") + while 1: + pkg = Package() + pkg.read_control(f) + if pkg.get_package(): + self.add_package(pkg) + else: + break + f.close() + return + + def write_packages_file(self, fn): + f = open(fn, "w") + names = self.packages.keys() + names.sort() + for name in names: + f.write(self.packages[name].__repr__()) + return + + def keys(self): + return self.packages.keys() + + def __getitem__(self, key): + return self.packages[key] + +if __name__ == "__main__": + package = Package() + + package.set_package("FooBar") + package.set_version("0.1-fam1") + package.set_architecture("arm") + package.set_maintainer("Testing <testing@testing.testing>") + package.set_depends("libc") + package.set_description("A test of the APIs.") + + print "<" + sys.stdout.write(package) + print ">" + + package.write_package("/tmp") + diff --git a/packages/avahi/avahi_0.6.9.bb b/packages/avahi/avahi_0.6.10.bb index 95c930d8e8..95c930d8e8 100644 --- a/packages/avahi/avahi_0.6.9.bb +++ b/packages/avahi/avahi_0.6.10.bb diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 25cb1b1bbe..8fec5b01d4 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 = "r48" +PR = "r49" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb new file mode 100644 index 0000000000..a75d2b0de6 --- /dev/null +++ b/packages/fbreader/fbreader_0.7.3d.bb @@ -0,0 +1,24 @@ + +DESCRIPTION = "FBreader is an ebook reader" +LICENSE = "GPL2" +HOMEPAGE = "http://only.mawhrin.net/fbreader/" +SECTION = "x11/utils" +PRIORITY = "optional" +DEPENDS = "gtk+ enca expat" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" + +SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \ + file://fbreader-0.7.3d_buildsys_oe.patch;patch=1" + +FILES_${PN} += "${datadir}/FBReader" + +CFLAGS_append = " RESOLUTION=240x320 INSTALLDIR=/usr" + +inherit autotools pkgconfig + +do_install_append() { + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/openzaurus/gpe/fbreader.desktop ${D}${datadir}/applications/fbreader.desktop + install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/icons/34x28/FBReader.png ${D}${datadir}/pixmaps/fbreader.png +} diff --git a/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch b/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch new file mode 100644 index 0000000000..44efdd8583 --- /dev/null +++ b/packages/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch @@ -0,0 +1,158 @@ +diff -urd fbreader-0.7.3d_orig/fbreader/Makefile fbreader-0.7.3d/fbreader/Makefile +--- fbreader-0.7.3d_orig/fbreader/Makefile 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/fbreader/Makefile 2006-05-04 12:02:42.000000000 +0200 +@@ -47,7 +47,7 @@ + @$(LD) $(LDFLAGS) -o $(TARGET) `find common -name *.o` $(TARGET_ARCH)/$(UI_TYPE)/*.o $(LIBS) + @echo " OK" + +-install: all .really-install ++install: .really-install + + .really-install: + @cd $(TARGET_ARCH); make install +Nur in fbreader-0.7.3d/fbreader: Makefile~. +diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop +--- fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-05 09:42:06.000000000 +0200 +@@ -2,7 +2,7 @@ + Name=FBReader + Comment=E-Book Reader + Exec=FBReader +-Icon=fbreader/FBReader ++Icon=FBReader + Type=Application + Terminal=0 + Categories=Application;Utility +diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile fbreader-0.7.3d/fbreader/openzaurus/Makefile +--- fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/fbreader/openzaurus/Makefile 2006-05-05 12:32:28.000000000 +0200 +@@ -1,5 +1,6 @@ + ROOTDIR = $(PWD)/../.. + include $(ROOTDIR)/makefiles/platforms.mk ++include $(ROOTDIR)/makefiles/config.mk + + ifeq "$(UI_TYPE)" "opie" + BASEDIR = data/opt/QtPalmtop +@@ -7,7 +8,7 @@ + APPDIR = $(BASEDIR)/apps/Applications + STYLE = $(RESOLUTION) + else # UI_TYPE == gpe +- BASEDIR = data/usr ++ BASEDIR = /usr + PICSDIR = $(BASEDIR)/share/pixmaps/fbreader + APPDIR = $(BASEDIR)/share/applications + STYLE = gpe$(RESOLUTION) +@@ -34,7 +35,23 @@ + @make .cleandir + + install: +- ++ @install -d $(DESTDIR)$(INSTALLDIR)/bin ++ @install -s ../FBReader $(DESTDIR)$(INSTALLDIR)/bin ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html ++ @install -m 0644 ../share/FBReader/formats/html/html.ent $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader ++ @install -m 0644 ../icons/$(ICONSIZE)/FBReader.png $(DESTDIR)$(INSTALLDIR)/share/pixmaps/ ++ @install -m 0644 $(wildcard ../icons/$(ICONSIZE)/FBReader/*) $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader/ ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings ++ @install -m 0644 $(wildcard ../share/FBReader/encodings/*) $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings ++ @install -m 0644 $(wildcard ../share/FBReader/*.zip) $(DESTDIR)$(INSTALLDIR)/share/FBReader ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/help ++ @install -m 0644 ../data/help/HowToStart.brownish.$(RESOLUTION).fb2 $(DESTDIR)$(INSTALLDIR)/share/FBReader/help/HowToStart.fb2 ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/default ++ @install -m 0644 ../data/default/keymap.pdaxrom.xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/keymap.xml ++ @install -m 0644 ../data/default/styles.$(STYLE).xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/styles.xml ++ + clean: .cleandir + @rm -f *.ipk + +Nur in fbreader-0.7.3d/fbreader/openzaurus: Makefile~. +diff -urd fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk fbreader-0.7.3d/makefiles/arch/openzaurus.mk +--- fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/makefiles/arch/openzaurus.mk 2006-05-05 12:05:29.000000000 +0200 +@@ -1,28 +1,28 @@ + include $(ROOTDIR)/makefiles/arch/dummy.mk + +-BASEDIR = /opt/openzaurus-3.5.4/usr/local/arm/oe +-TOOLSDIR = $(BASEDIR)/bin +-INCDIR = $(BASEDIR)/arm-linux/include +-LIBDIR = $(BASEDIR)/arm-linux/lib ++INSTALLDIR=/usr/ + +-RM = rm -rvf +-RM_QUIET = rm -rf +-QTINCLUDE = -I $(INCDIR)/qt2 +-GTKINCLUDE = -I$(LIBDIR)/glib-2.0/include -I$(LIBDIR)/gtk-2.0/include -I$(INCDIR)/glib-2.0 -I$(INCDIR)/gtk-2.0 -I$(INCDIR)/pango-1.0 -I$(INCDIR)/atk-1.0 +-MOC = $(TOOLSDIR)/moc +-CC = $(TOOLSDIR)/arm-linux-gcc +-AR = $(TOOLSDIR)/arm-linux-ar rsu +-LD = $(TOOLSDIR)/arm-linux-g++ ++CC = $(CCLD) $(TARGET_CFLAGS) ++AR = ar rsu ++LD = $(CXX) + +-EXPATLIBS = -lexpat +-ENCALIBS = -lenca +-BZIP2LIBS = -lbz2 ++DEPGEN = $(CC) -MM ++CFLAGS = -pipe $(DUMMY_SECTIONS) -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DINSTALLDIR=\"$(INSTALLDIR)\" + +-ifeq "$(UI_TYPE)" "opie" +- UILIBS = -lqte -lqpe ++#MOC = moc-qt3 ++#QTINCLUDE = -I /usr/include/qt3 ++ ++GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0) ++ ++ifeq "$(UI_TYPE)" "qt" ++ UILIBS = -lqt-mt + else +- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 ++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget + endif + +-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG $(DUMMY_SECTIONS) -DINSTALLDIR=\"$(INSTALLDIR)\" -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline +-DEPGEN = $(CC) -MM ++EXPATLIBS = -lexpat ++ENCALIBS = -lenca ++BZIP2LIBS = -lbz2 ++ ++RM = rm -rvf ++RM_QUIET = rm -rf +diff -urd fbreader-0.7.3d_orig/makefiles/config.mk fbreader-0.7.3d/makefiles/config.mk +--- fbreader-0.7.3d_orig/makefiles/config.mk 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/makefiles/config.mk 2006-05-04 10:13:13.000000000 +0200 +@@ -7,7 +7,7 @@ + CFLAGS += -DLIBICONV_PLUG + + ifeq "$(TARGET_STATUS)" "release" +- CFLAGS += -O3 ++ CFLAGS += -Os + LDFLAGS += -s + endif + ifeq "$(TARGET_STATUS)" "debug" +diff -urd fbreader-0.7.3d_orig/makefiles/target.mk fbreader-0.7.3d/makefiles/target.mk +--- fbreader-0.7.3d_orig/makefiles/target.mk 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/makefiles/target.mk 2006-05-04 10:25:20.000000000 +0200 +@@ -1,6 +1,7 @@ +-#TARGET_ARCH = openzaurus ++TARGET_ARCH = openzaurus + #UI_TYPE = opie +-#UI_TYPE = gpe ++UI_TYPE = gpe ++RESOLUTION = 240x320 + + #TARGET_ARCH = opensimpad-0.9.0 + #UI_TYPE = opie +@@ -8,8 +9,8 @@ + #TARGET_ARCH = qvfb + #UI_TYPE = opie + +-TARGET_ARCH = maemo +-UI_TYPE = maemo ++#TARGET_ARCH = maemo ++#UI_TYPE = maemo + + #TARGET_ARCH = desktop + #UI_TYPE = gtk diff --git a/packages/fbreader/files/set-target.patch b/packages/fbreader/files/set-target.patch index 5a3b87d422..504e44aae0 100644 --- a/packages/fbreader/files/set-target.patch +++ b/packages/fbreader/files/set-target.patch @@ -1,3 +1,4 @@ + --- fbreader-0.7.1b/makefiles/target.mk.orig 2005-12-06 14:29:15.000000000 -0800 +++ fbreader-0.7.1b/makefiles/target.mk 2006-02-15 01:16:33.000000000 -0800 @@ -10,8 +10,8 @@ @@ -6,8 +7,8 @@ -#TARGET_ARCH = desktop -#UI_TYPE = gtk -+TARGET_ARCH = desktop -+UI_TYPE = gtk ++TARGET_ARCH = openzaurus ++UI_TYPE = gpe #UI_TYPE = qt #TARGET_ARCH = zaurus diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init index 0816e8bb7d..aabd3d40fc 100644 --- a/packages/ftpd-topfield/files/init +++ b/packages/ftpd-topfield/files/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/ftpd-topfield NAME=ftpd-topfield DESC="FTP daemon for the Topfield PVR" -ARGS="-D -P 21 -e" +ARGS="-D -P 21" test -f $DAEMON || exit 0 diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb index 72cf5ab057..f7fdfb5466 100755 --- a/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb @@ -6,8 +6,8 @@ MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" SECTION = "net" LICENSE = "MIT" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_3 \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_3 \ +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_6 \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_6 \ file://init" # The source will end up in the subdirectory 'ftpd-topfield' - no release name diff --git a/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch b/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch new file mode 100644 index 0000000000..fa21b26554 --- /dev/null +++ b/packages/gcc/gcc-csl-arm/gcc_optab_arm.patch @@ -0,0 +1,95 @@ +ARM is the only architecture that has a helper function that returns +an unbiased result. This fix is trivial enough that we can show it +doesn't effect any of the other arches. Can we consider this a +regression fix since it used to work until the helper was added :} + +Tested with no regressions on x86_64-pc-linux-gnu and arm-none-eabi. + +Cheers, +Carlos. +-- +Carlos O'Donell +CodeSourcery +carlos@codesourcery.com +(650) 331-3385 x716 + +gcc/ + +2006-01-27 Carlos O'Donell <carlos@codesourcery.com> + + * optabs.c (prepare_cmp_insn): If unbaised and unsigned then bias + the comparison routine return. + +gcc/testsuite/ + +2006-01-27 Carlos O'Donell <carlos@codesourcery.com> + + * gcc.dg/unsigned-long-compare.c: New test. + +Index: gcc/optabs.c +=================================================================== +--- 1/gcc/optabs.c (revision 110300) ++++ 2/gcc/optabs.c (working copy) +@@ -3711,18 +3711,24 @@ + result = emit_library_call_value (libfunc, NULL_RTX, LCT_CONST_MAKE_BLOCK, + word_mode, 2, x, mode, y, mode); + ++ /* There are two kinds of comparison routines. Biased routines ++ return 0/1/2, and unbiased routines return -1/0/1. Other parts ++ of gcc expect that the comparison operation is equivalent ++ to the modified comparison. For signed comparisons compare the ++ result against 1 in the unbiased case, and zero in the biased ++ case. For unsigned comparisons always compare against 1 after ++ biasing the unbased result by adding 1. This gives us a way to ++ represent LTU. */ + *px = result; + *pmode = word_mode; +- if (TARGET_LIB_INT_CMP_BIASED) +- /* Integer comparison returns a result that must be compared +- against 1, so that even if we do an unsigned compare +- afterward, there is still a value that can represent the +- result "less than". */ +- *py = const1_rtx; +- else ++ *py = const1_rtx; ++ ++ if (!TARGET_LIB_INT_CMP_BIASED) + { +- *py = const0_rtx; +- *punsignedp = 1; ++ if (*punsignedp) ++ *px = plus_constant (result, 1); ++ else ++ *py = const0_rtx; + } + return; + } +Index: gcc/testsuite/gcc.dg/unsigned-long-compare.c +=================================================================== +--- 1/gcc/testsuite/gcc.dg/unsigned-long-compare.c (revision 0) ++++ 2/gcc/testsuite/gcc.dg/unsigned-long-compare.c (revision 0) +@@ -0,0 +1,24 @@ ++/* Copyright (C) 2006 Free Software Foundation, Inc. */ ++/* Contributed by Carlos O'Donell on 2006-01-27 */ ++ ++/* Test a division corner case where the expression simplifies ++ to a comparison, and the optab expansion is wrong. The optab ++ expansion emits a function whose return is unbiased and needs ++ adjustment. */ ++/* Origin: Carlos O'Donell <carlos@codesourcery.com> */ ++/* { dg-do run { target arm-*-*eabi* } } */ ++/* { dg-options "" } */ ++#include <stdlib.h> ++ ++#define BIG_CONSTANT 0xFFFFFFFF80000000ULL ++ ++int main (void) ++{ ++ unsigned long long OneULL = 1ULL; ++ unsigned long long result; ++ ++ result = OneULL / BIG_CONSTANT; ++ if (result) ++ abort (); ++ exit (0); ++} diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb index 571ad216e2..dc8f434ecc 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -1,5 +1,7 @@ DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +LICENSE = "GPL" + PR= "r1" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb index 2da147863a..599abee8b4 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb @@ -1,5 +1,7 @@ DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +LICENSE = "GPL" + PR= "r0" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb index 3d6e1505fa..6999e87b86 100644 --- a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb +++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/foxbox" FILES_${PN} = "${datadir}/themes" -SRC_URI = "http://handhelds.org/~florian/themes/foxbox-${PV}.tar.gz" +SRC_URI = "http://dominion.kabel.utwente.nl/~florian/themes/foxbox-${PV}.tar.gz" diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb index ca396778c4..409f6d8a56 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb @@ -1,5 +1,6 @@ DESCRIPTION = "GTK+ industrial theme adjusted for GPE" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +LICENSE = "GPL" PR= "r0" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb index ca396778c4..aaf8e4c435 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb @@ -1,5 +1,7 @@ DESCRIPTION = "GTK+ industrial theme adjusted for GPE" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +LICENSE = "GPL" + PR= "r0" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gsoap/.mtn2git_empty b/packages/gsoap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gsoap/.mtn2git_empty diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb new file mode 100644 index 0000000000..3ee6daf247 --- /dev/null +++ b/packages/gsoap/gsoap-native_2.7.7.bb @@ -0,0 +1,11 @@ +require gsoap_${PV}.bb +inherit native + +do_stage() { + autotools_stage_all +} + +do_install() { + : +} + diff --git a/packages/gsoap/gsoap_2.7.7.bb b/packages/gsoap/gsoap_2.7.7.bb new file mode 100644 index 0000000000..fb782ecb0b --- /dev/null +++ b/packages/gsoap/gsoap_2.7.7.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ +for the development of SOAP Web Services and clients." +SECTION = "devel" +LICENSE = "GPL" +DEPENDS = "gsoap-native" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz" +S = "${WORKDIR}/gsoap-2.7" + +inherit autotools + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR}/soapcpp2" + +do_install_append() { + install -d ${D}${libdir} + for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck + do + oe_libinstall -C soapcpp2 $lib ${D}${libdir} + done +} + +PACKAGES = "gsoap-dev" +FILES_gsoap-dev = "${bindir}/wsdl2h ${bindir}/soapcpp2 ${libdir}" diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index bf498084e4..f22bf2fdfe 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -8,6 +8,35 @@ COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." +create_file() { + EXEC=" + touch \"$1\" + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " + + test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache + + eval $EXEC & +} + +mk_dir() { + EXEC=" + mkdir -p \"$1\" + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " + + test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache + + eval $EXEC & +} + +link_file() { + EXEC="test -e \"$2\" -o -L $2 || ln -s \"$1\" \"$2\" >/dev/tty0 2>&1" + + test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache + + eval $EXEC & +} check_requirements() { @@ -72,22 +101,21 @@ apply_cfgfile() { cat ${CFGFILE} | grep -v "^#" | \ while read LINE; do - TTYPE=`echo ${LINE} | cut -d " " -f 1` - TUSER=`echo ${LINE} | cut -d " " -f 2` - TGROUP=`echo ${LINE} | cut -d " " -f 3` - TMODE=`echo ${LINE} | cut -d " " -f 4` - TNAME=`echo ${LINE} | cut -d " " -f 5` + + # This is a hell of a lot faster than using cut or awk 5 times + eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"` [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." + [ "${TTYPE}" = "l" ] && { [ -e "${TNAME}" ] && { echo "Cannot create link over existing -${TNAME}-." >&2 } || { - TSOURCE=`echo ${LINE} | cut -d " " -f 6` + TSOURCE="$TLTARGET" [ -L "${TNAME}" ] || { [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." - ln -s "${TSOURCE}" "${TNAME}" + link_file "${TSOURCE}" "${TNAME}" & } } continue @@ -112,10 +140,10 @@ apply_cfgfile() { case "${TTYPE}" in "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." - touch "${TNAME}" + create_file "${TNAME}" & ;; "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." - mkdir -p "${TNAME}" + mk_dir "${TNAME}" & # Add check to see if there's an entry in fstab to mount. ;; *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-." @@ -123,9 +151,6 @@ apply_cfgfile() { ;; esac - chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2 - chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2 - chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2 done @@ -133,8 +158,12 @@ apply_cfgfile() { } - -for file in `ls -1 "${CFGDIR}" | sort`; do - apply_cfgfile "${CFGDIR}/${file}" - done - +if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" +then + sh /etc/volatile.cache +else + rm -f /etc/volatile.cache + for file in `ls -1 "${CFGDIR}" | sort`; do + apply_cfgfile "${CFGDIR}/${file}" + done +fi diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 37ce8b529a..2bc7d82fbd 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -21,19 +21,18 @@ # This explains the order of "link before object" as in the example above, where # a link will be created at /var/test pointing to /tmp/testfile and due to this # link the file defined as /var/test will actually be created as /tmp/testfile. -d root root 0775 /var -d root root 0755 /var/backups -d root root 0755 /var/cache -d root root 0755 /var/lib -d root root 0755 /var/lib/ipkg -d root root 0755 /var/lib/misc -d root root 2775 /var/local -d root root 1777 /var/lock -d root root 0755 /var/lock/subsys -d root root 0755 /var/log -d root root 0755 /var/run -d root root 0755 /var/spool -d root root 1777 /var/tmp -f root root 0664 /var/run/utmp -f root root 0664 /var/log/wtmp -f root root 0664 /var/log/lastlog +d root root 0775 /var none +d root root 0755 /var/backups none +d root root 0755 /var/cache none +d root root 0755 /var/lib none +d root root 0755 /var/lib/ipkg none +d root root 0755 /var/lib/misc none +d root root 2775 /var/local none +d root root 1777 /var/lock none +d root root 0755 /var/lock/subsys none +d root root 0755 /var/log none +d root root 0755 /var/run none +d root root 0755 /var/spool none +d root root 1777 /var/tmp none +f root root 0664 /var/run/utmp none +f root root 0664 /var/log/wtmp none diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 29886d0ac0..eebfbca7bf 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 = "r71" +PR = "r73" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc index f535cfbef0..8fc6c9efe0 100644 --- a/packages/ipkg/ipkg.inc +++ b/packages/ipkg/ipkg.inc @@ -16,6 +16,11 @@ S = "${WORKDIR}/ipkg/C" inherit autotools pkgconfig +# Define a variable to allow distros to run configure earlier. +# (for example, to enable loading of ethernet kernel modules before networking starts) +IPKG_INIT_POSITION = "98" +IPKG_INIT_POSITION_slugos = "41" + pkg_postinst_ipkg () { #!/bin/sh if [ "x$D" != "x" ]; then @@ -23,8 +28,8 @@ if [ "x$D" != "x" ]; then # this happens at S98 where our good 'ole packages script used to run echo -e "#!/bin/sh ipkg-cl configure -" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure - chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure +" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure + chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure fi update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100 diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb index 9285c61819..de6af147b6 100644 --- a/packages/ipkg/ipkg_0.99.154.bb +++ b/packages/ipkg/ipkg_0.99.154.bb @@ -1,2 +1,2 @@ include ipkg.inc -PR = "r2" +PR = "r3" diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb new file mode 100644 index 0000000000..98d28b60a3 --- /dev/null +++ b/packages/irda-utils/irdadump_0.9.16.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Utility to dump IrDA traffic." +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "glib-1.2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz" + +S="${WORKDIR}/irda-utils-${PV}/irdadump" + +EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/" +EXTRA_LDFLAGS += "-lglib" + +inherit autotools + +do_compile() { + oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${S}/shell/.libs/irdadump ${D}${bindir} +} diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb index d5553cf138..d92987adf3 100644 --- a/packages/libcroco/libcroco_0.6.1.bb +++ b/packages/libcroco/libcroco_0.6.1.bb @@ -3,10 +3,13 @@ SECTION = "x11/utils" MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" DEPENDS = "glib-2.0 libxml2" LICENSE = "LGPL" -PR = "r0" +PR = "r1" inherit autotools pkgconfig gnome do_stage() { - autotools_stage_all + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libcroco + install -m 644 src/*.h ${STAGING_INCDIR}/libcroco/ + install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/ } diff --git a/packages/libgpewidget/libgpewidget_0.111.bb b/packages/libgpewidget/libgpewidget_0.111.bb new file mode 100644 index 0000000000..780d1e920b --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.111.bb @@ -0,0 +1,26 @@ +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" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe 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 () { + autotools_stage_all +} + diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb index 8562a5f112..13ab88c3d2 100644 --- a/packages/libqanava/libqanava_0.0.7.bb +++ b/packages/libqanava/libqanava_0.0.7.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Qanava is a gtaph library based on the Qt4 Arthur framework." SECTION = "x11/libs" HOMEPAGE = "http://www.libqanava.org/" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "qt4x11" # LGPL after 0.0.7 LICENSE = "GPL" PR = "r0" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 0423268abe..e7df211acb 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -3,14 +3,13 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r1" +PR = "r2" # 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://eabi-enums.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/kernel26" diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index d4fe2dfa5c..ca8a64e9ed 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.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/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa index 36dd3c7888..ed4cfd8cb3 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa @@ -1335,7 +1335,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_SA1100 is not set +CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set # diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch new file mode 100644 index 0000000000..054b48d28d --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch @@ -0,0 +1,61 @@ + +The CSD contains a "read2write factor" which determines the multiplier to +be applied to the read timeout to obtain the write timeout. We were +ignoring this parameter, resulting in the possibility for writes being +timed out too early. + +Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> + +diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c +--- a/drivers/mmc/mmc.c ++++ b/drivers/mmc/mmc.c +@@ -549,6 +549,7 @@ static void mmc_decode_csd(struct mmc_ca + csd->read_partial = UNSTUFF_BITS(resp, 79, 1); + csd->write_misalign = UNSTUFF_BITS(resp, 78, 1); + csd->read_misalign = UNSTUFF_BITS(resp, 77, 1); ++ csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3); + csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4); + csd->write_partial = UNSTUFF_BITS(resp, 21, 1); + } else { +@@ -583,6 +584,7 @@ static void mmc_decode_csd(struct mmc_ca + csd->read_partial = UNSTUFF_BITS(resp, 79, 1); + csd->write_misalign = UNSTUFF_BITS(resp, 78, 1); + csd->read_misalign = UNSTUFF_BITS(resp, 77, 1); ++ csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3); + csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4); + csd->write_partial = UNSTUFF_BITS(resp, 21, 1); + } +diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c +--- a/drivers/mmc/mmc_block.c ++++ b/drivers/mmc/mmc_block.c +@@ -187,6 +187,12 @@ static int mmc_blk_issue_rq(struct mmc_q + brq.cmd.opcode = MMC_WRITE_BLOCK; + brq.data.flags |= MMC_DATA_WRITE; + brq.data.blocks = 1; ++ ++ /* ++ * Scale up the timeout by the r2w factor ++ */ ++ brq.data.timeout_ns <<= card->csd.r2w_factor; ++ brq.data.timeout_clks <<= card->csd.r2w_factor; + } + + if (brq.data.blocks > 1) { +diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h +--- a/include/linux/mmc/card.h ++++ b/include/linux/mmc/card.h +@@ -28,6 +28,7 @@ struct mmc_csd { + unsigned short cmdclass; + unsigned short tacc_clks; + unsigned int tacc_ns; ++ unsigned int r2w_factor; + unsigned int max_dtr; + unsigned int read_blkbits; + unsigned int write_blkbits; + + +------------------------------------------------------------------- +List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel +FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php +Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php + diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch new file mode 100644 index 0000000000..cef02436d6 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch @@ -0,0 +1,26 @@ + +Always send a stop command at the end of a data transfer. If we avoid +sending the stop command, some cards remain in data transfer mode, and +refuse to accept further read/write commands. + +Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> + +diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c +--- a/drivers/mmc/pxamci.c ++++ b/drivers/mmc/pxamci.c +@@ -291,7 +291,7 @@ static int pxamci_data_done(struct pxamc + pxamci_disable_irq(host, DATA_TRAN_DONE); + + host->data = NULL; +- if (host->mrq->stop && data->error == MMC_ERR_NONE) { ++ if (host->mrq->stop) { + pxamci_stop_clock(host); + pxamci_start_cmd(host, host->mrq->stop, 0); + } else { + + +------------------------------------------------------------------- +List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel +FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php +Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php + diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index b62bcba688..e37753ee16 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r15" +PR = "r20" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -13,6 +13,8 @@ PR = "r15" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ + file://rmk-mmc1.patch;patch=1 \ + file://rmk-mmc2.patch;patch=1 \ ${RPSRC}/led_core-r15.patch;patch=1 \ ${RPSRC}/led_triggers-r14.patch;patch=1 \ ${RPSRC}/led_trig_timer-r8.patch;patch=1 \ @@ -115,14 +117,19 @@ SRC_URI_append_tosa = "\ ${CHSRC}/tmio-nand-r5.patch;patch=1 \ ${CHSRC}/tmio-ohci-r3.patch;patch=1 \ ${CHSRC}/tmio-fb-r6.patch;patch=1 \ - ${DOSRC}/tosa-keyboard-r13.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r14.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r6.patch;patch=1 \ - ${RPSRC}/temp/tosa-tmio-r4-rp1.patch;patch=1 \ - ${DOSRC}/tosa-power-r14.patch;patch=1 \ - ${RPSRC}/tosa-tmio-lcd-r5-rp1.patch;patch=1 \ - ${DOSRC}/tosa-bluetooth-r5.patch;patch=1 \ + ${DOSRC}/tosa-tmio-r6.patch;patch=1 \ + ${DOSRC}/tosa-power-r15.patch;patch=1 \ + ${DOSRC}/tosa-tmio-lcd-r7.patch;patch=1 \ + ${DOSRC}/tosa-bluetooth-r6.patch;patch=1 \ ${DOSRC}/wm97xx-lg7-r0.patch;patch=1 \ - ${DOSRC}/tosa-asoc-r0.patch;patch=1 " + ${DOSRC}/wm9712-suspend-cold-res-r0.patch;patch=1 \ + ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \ + ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \ + ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \ + ${DOSRC}/wm9712-reset-loop-r0.patch;patch=1 \ + ${DOSRC}/tosa-asoc-r1.patch;patch=1 " SRC_URI_append_poodle = "\ ${RPSRC}/rp_poodle_hacks-r0.patch;patch=1" diff --git a/packages/lyx/lyx_1.4.0.bb b/packages/lyx/lyx_1.4.0.bb index b3f6a2c7ad..644d8bfa73 100644 --- a/packages/lyx/lyx_1.4.0.bb +++ b/packages/lyx/lyx_1.4.0.bb @@ -3,7 +3,7 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "boost qt3x11" +DEPENDS = "boost" RRECOMMENDS = "tetex" PR = "r0" diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb index 0cd925ad50..59dc35f0ff 100644 --- a/packages/lyx/lyx_1.4.1.bb +++ b/packages/lyx/lyx_1.4.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "boost qt3x11" +DEPENDS = "boost" RRECOMMENDS = "tetex" PR = "r0" diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb index 9434e5076f..428a48bc28 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/meta/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r26" +PR = "r28" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! diff --git a/packages/mysql/files/.mtn2git_empty b/packages/mysql/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mysql/files/.mtn2git_empty diff --git a/packages/mysql/mysql-4.1.16/autofoo.patch b/packages/mysql/files/autofoo.patch index f2d5354572..f2d5354572 100644 --- a/packages/mysql/mysql-4.1.16/autofoo.patch +++ b/packages/mysql/files/autofoo.patch diff --git a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch b/packages/mysql/files/gen_lex_hash.patch index c398d048dc..c398d048dc 100644 --- a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch +++ b/packages/mysql/files/gen_lex_hash.patch diff --git a/packages/mysql/mysql-native_4.1.16.bb b/packages/mysql/mysql-native_4.1.18.bb index c871a8f9da..c871a8f9da 100644 --- a/packages/mysql/mysql-native_4.1.16.bb +++ b/packages/mysql/mysql-native_4.1.18.bb diff --git a/packages/mysql/mysql_4.1.16.bb b/packages/mysql/mysql_4.1.18.bb index fe8c42dd88..fe8c42dd88 100644 --- a/packages/mysql/mysql_4.1.16.bb +++ b/packages/mysql/mysql_4.1.18.bb diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 89a7d3c7cd..d5526776eb 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ SECTION = "base" DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." LICENSE = "GPL" -PR = "r9" +PR = "r10" inherit update-rc.d @@ -12,7 +12,7 @@ INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ." # On SlugOS (NSLU2) delay the stop until after network apps have exited # Do not stop in single user - there's no way to sulogin! -INITSCRIPT_PARAMS_slugos = "start 40 S 0 6 ." +INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ." SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ file://options \ diff --git a/packages/nonworking/imkit/.mtn2git_empty b/packages/nonworking/imkit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/imkit/.mtn2git_empty diff --git a/packages/nonworking/imkit/imkit_0.4.5.bb b/packages/nonworking/imkit/imkit_0.4.5.bb new file mode 100644 index 0000000000..a07e2c4849 --- /dev/null +++ b/packages/nonworking/imkit/imkit_0.4.5.bb @@ -0,0 +1,20 @@ +# +# nonworking, because the c++ template syntax no longer compiles with modern compilers +# +DESCRIPTION = "An Inputmethod for Opie - frontend to the japanese anthy engine" +HOMEPAGE = "http://zaurus-ja.sourceforge.jp/imkit-anthy.html.en" +SECTION = "opie/inputmethods" +LICENSE = "GPL" +RDEPENDS = "anthy" + +SRC_URI = "http://downloads.sourceforge.jp/zaurus-ja/9316/imkit-0.4.5.tar.gz" +S = "${WORKDIR}/imkit-${PV}" + +inherit palmtop + +PARALLEL_MAKE = "" +QMAKE_PROFILES = "imkit.pro" + +do_configure_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro +} diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index ee5df1421d..2c0e035c4b 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -1,8 +1,6 @@ DEPENDS = "zlib openssl" -RREPLACES_openssh = "dropbear" RCONFLICTS_openssh = "dropbear" -RREPLACES_openssh-sshd = "dropbear" RCONFLICTS_openssh-sshd = "dropbear" SECTION = "console/network" @@ -17,7 +15,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r8" +PR = "r10" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -107,5 +105,5 @@ else fi } -CONFFILES_openssh-sshd_nylon = "${sysconfdir}/ssh/sshd_config" -CONFFILES_openssh-ssh_nylon = "${sysconfdir}/ssh/ssh_config" +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/packages/python/python-2.4.3/sitebranding.patch b/packages/python/python-2.4.3/sitebranding.patch new file mode 100644 index 0000000000..85bb83a506 --- /dev/null +++ b/packages/python/python-2.4.3/sitebranding.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- Python-2.4.3/Lib/site.py~sitebranding ++++ Python-2.4.3/Lib/site.py +@@ -305,8 +305,9 @@ + "Jython is maintained by the Jython developers (www.jython.org).") + else: + __builtin__.credits = _Printer("credits", """\ +- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands +- for supporting Python development. See www.python.org for more information.""") ++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). ++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by ++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") + here = os.path.dirname(os.__file__) + __builtin__.license = _Printer( + "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch index 02a4e80848..032824e39d 100644 --- a/packages/python/python-pyqt4/optional-features.patch +++ b/packages/python/python-pyqt4/optional-features.patch @@ -5,17 +5,16 @@ --- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch +++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip -@@ -21,7 +21,8 @@ +@@ -21,7 +21,7 @@ // PyQt; see the file LICENSE. If not, write to the Free Software Foundation, // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -+//%Feature SessionManager +%If (SessionManager) class QSessionManager : QObject { %TypeHeaderCode -@@ -58,3 +59,4 @@ +@@ -58,3 +58,4 @@ bool isPhase2() const; void requestPhase2(); }; diff --git a/packages/python/python-pyqt4_0.9.bb b/packages/python/python-pyqt4_0.9.2.bb index e56d6b36ef..099dc103ef 100644 --- a/packages/python/python-pyqt4_0.9.bb +++ b/packages/python/python-pyqt4_0.9.2.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" DEPENDS = "qt4x11" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml2" SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \ file://cross-compile.patch;patch=1 \ @@ -20,7 +20,7 @@ inherit qmake qt4x11 sip4 distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1 -xVendorID -xSessionManager -xAccessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xSessionManager -xAccessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" @@ -50,7 +50,7 @@ do_configure_prepend() { do_stage() { install -d ${STAGING_SIPDIR}/qt/ - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages for module in ${SIP_MODULES} do install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ @@ -59,11 +59,14 @@ do_stage() { } do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 for module in ${SIP_MODULES} do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so + echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so done + cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ } FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 289de18a53..30ce73abe2 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -6,14 +6,15 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.4" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://bindir-libdir.patch;patch=1 \ file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1" + file://fix-tkinter-detection.patch;patch=1 \ + file://sitebranding.patch;patch=1" S = "${WORKDIR}/Python-${PV}" inherit autotools diff --git a/packages/qscintilla/files/.mtn2git_empty b/packages/qscintilla/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qscintilla/files/.mtn2git_empty diff --git a/packages/qscintilla/files/no-external-lexers.patch b/packages/qscintilla/files/no-external-lexers.patch new file mode 100644 index 0000000000..5953043190 --- /dev/null +++ b/packages/qscintilla/files/no-external-lexers.patch @@ -0,0 +1,24 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- ../src/ExternalLexer.cpp~no-external-lexers ++++ ../src/ExternalLexer.cpp +@@ -110,7 +110,7 @@ + // Initialise some members... + first = NULL; + last = NULL; +- ++#ifndef ZPATCH + // Load the DLL + lib = DynamicLibrary::Load(ModuleName); + if (lib->IsValid()) { +@@ -155,6 +155,7 @@ + } + } + } ++#endif + next = NULL; + } + diff --git a/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb new file mode 100644 index 0000000000..1620ef62c5 --- /dev/null +++ b/packages/qscintilla/qscintilla_1.65-gpl-1.6.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Qt/Embedded bindings for the Scintilla source code editor component" +SECTION = "opie/libs" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.mneuroth.de/privat/zaurus/qscintilla-${PV}_zaurus.tar.gz \ + file://no-external-lexers.patch;patch=1;pnum=0" + +S = "${WORKDIR}/qscintilla-${PV}/qt" + +inherit opie + +QMAKE_PROFILES = "qscintilla.pro" + +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/patches \ + DEFINES+=ZPATCH DEFINES+=ZAURUS \ + HEADERS-=qextscintillaprinter.h \ + SOURCES-=qextscintillaprinter.cpp \ + SOURCES+=patches/qsettings.cpp \ + SOURCES+=patches/qsettings_unix.cpp \ + HEADERS+=patches/qsettings.h" + +PARALLEL_MAKE = "" + +do_stage() { + install -m 0644 qextscintilla*.h ${STAGING_INCDIR}/ + oe_libinstall -so libqscintilla ${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}${libdir} + oe_libinstall -so libqscintilla ${D}${libdir} +} + +FILES_${PN} = "${libdir}" diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch new file mode 100644 index 0000000000..ab943db1ff --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~configurable-cpu-extensions ++++ qt-x11-opensource-src-4.1.1/configure +@@ -564,6 +564,12 @@ + VAL=$1 + fi + ;; ++ -nosse) ++ CFG_SSE="no" ++ ;; ++ -sse) ++ CFG_SSE="yes" ++ ;; + -iwmmxt) + CFG_IWMMXT="yes" + ;; +@@ -1759,13 +1765,6 @@ + fi + fi + +-# detect sse support +-if $unixtests/sse.test $XQMAKESPEC $OPT_VERBOSE; then +- CFG_HAVE_SSE=no +-else +- CFG_HAVE_SSE=yes +-fi +- + # check iwmmxt support + if [ "$CFG_IWMMXT" = "yes" ]; then + if ! $unixtests/iwmmxt.test $XQMAKESPEC $OPT_VERBOSE; then diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch new file mode 100644 index 0000000000..7c8665c9c1 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch @@ -0,0 +1,159 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~cross-compile ++++ qt-x11-opensource-src-4.1.1/configure +@@ -534,7 +534,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL=$1 +@@ -845,6 +845,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -1698,131 +1701,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- x86_64) +- ARCH=x86_64 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:*) +- case "$UNAME_MACHINE" in +- sun4u) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- i86pc) +- case "$PLATFORM" in +- *-64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- ;; +- *) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- esac +- esac +- ;; +- Darwin:*:*) +- case "$UNAME_MACHINE" in +- Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ;; +- x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ;; +- esac +- ARCH=macosx +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64|*:*:amd64) +- if [ "$PLATFORM" = "linux-g++-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:s390*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " IBM S/390 (s390)" +- fi +- ARCH=s390 +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch new file mode 100644 index 0000000000..e927df9c7d --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch @@ -0,0 +1,102 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec ++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(OE_QMAKE_CC) + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -16,19 +16,19 @@ + QMAKE_YACCFLAGS_MANGLE = -p $base -b $base + QMAKE_YACC_HEADER = $base.tab.h + QMAKE_YACC_SOURCE = $base.tab.c +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w +-QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CFLAGS_RELEASE = -O2 + QMAKE_CFLAGS_DEBUG = -g + QMAKE_CFLAGS_SHLIB = -fPIC + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ +-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +@@ -41,37 +41,37 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) ++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = + +-QMAKE_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS = ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) ++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) + QMAKE_LIBS_NIS = -lnsl + QMAKE_LIBS_OPENGL = -lGLU -lGL + QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_THREAD = -lpthread + +-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -83,7 +83,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = $(OE_QMAKE_STRIP) + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch new file mode 100644 index 0000000000..fcd5de6f97 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration ++++ qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp +@@ -30,7 +30,7 @@ + # include <netinet/in.h> + # include <arpa/nameser.h> + # include <resolv.h> +-extern "C" int res_init(); ++extern "C" int res_init() throw(); + #endif + + // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch new file mode 100644 index 0000000000..392aaf4f5f --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch @@ -0,0 +1,50 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h +@@ -219,7 +219,7 @@ + inline const char toLatin1() const; + inline const ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- inline ushort &unicode() { return *(&ucs); } ++ inline ushort &unicode() { return *((ushort*)&ucs); } + #else + inline ushort &unicode() { return ucs; } + #endif +--- qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp +@@ -1193,6 +1193,18 @@ + } + } + ++static void getXDefault(const char *group, const char *key, float *val) ++{ ++ char *str = XGetDefault(X11->display, group, key); ++ if (str) { ++ char *end = 0; ++ float v = strtod(str, &end); ++ if (str != end) ++ *val = v; ++ } ++} ++ ++ + static void getXDefault(const char *group, const char *key, bool *val) + { + char *str = XGetDefault(X11->display, group, key); +--- qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h +@@ -720,8 +720,8 @@ + + #if defined(QT_COORD_TYPE) + typedef QT_COORD_TYPE qreal; +-#elif defined(__arm__) +-typedef float qreal; ++//#elif defined(__arm__) ++//typedef float qreal; + #else + typedef double qreal; + #endif diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch new file mode 100644 index 0000000000..324f44303a --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~no-qmake ++++ qt-x11-opensource-src-4.1.1/configure +@@ -2548,7 +2548,7 @@ + fi + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt/qt4-x11-free-4.1.2/no-tools.patch new file mode 100644 index 0000000000..2bda49c9c5 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/no-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/src.pro~no-tools ++++ qt-x11-opensource-src-4.1.1/src/src.pro +@@ -3,7 +3,7 @@ + + # this order is important + win32:SUBDIRS += winmain +-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network svg ++SUBDIRS += corelib xml gui sql network svg + !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, qt3support): SUBDIRS += qt3support + !cross_compile { diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb index 1d365c3b01..7a4874c83a 100644 --- a/packages/qt/qt4-x11-free_4.1.1.bb +++ b/packages/qt/qt4-x11-free_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://cross-compile.patch;patch=1 \ @@ -30,7 +30,6 @@ EXTRA_OEMAKE = "-e" # FIXME: # * add missing options -# * auto stl detection is broken, so we disable it QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ -nosse \ @@ -76,6 +75,7 @@ do_stage() { } # FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... +# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... do_install() { install -d ${D}${libdir} install -d ${D}${bindir} @@ -101,10 +101,14 @@ do_install() { } PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ - libqtdesigner4 libqtdesignercomponents4 \ + libqtdesigner4 libqtdesignercomponents4 libqt3support4 \ qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" +ALLOW_EMPTY = "1" +FILES_${PN} = "" +RDEPENDS_${PN} = "${PACKAGES}" + FILES_libqtcore4 = "${libdir}/libQtCore.so*" FILES_libqtgui4 = "${libdir}/libQtGui.so*" FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" @@ -114,6 +118,7 @@ FILES_libqttest4 = "${libdir}/libQtTest.so*" FILES_libqtxml4 = "${libdir}/libQtXml.so*" FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" +FILES_libqt3support4 = "${libdir}/libQt3Support.so*" FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" @@ -128,3 +133,6 @@ FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bind FILES_qt4-common = "${bindir}/qtconfig" FILES_qt4-examples = "${bindir}/qt4-examples/*" FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb new file mode 100644 index 0000000000..f769047d71 --- /dev/null +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -0,0 +1,138 @@ +DESCRIPTION = "Qt/X11 Version ${PV}" +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://fix-resinit-declaration.patch;patch=1 \ + file://no-tools.patch;patch=1 \ + file://no-qmake.patch;patch=1 \ + file://gcc4_1.patch;patch=1 \ + file://configurable-cpu-extensions.patch;patch=1 \ + file://fix-mkspecs.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +PARALLEL_MAKE = "" + +inherit qmake-base qt4x11 pkgconfig + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +export ARCH = "${TARGET_ARCH}" +export ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +# FIXME: +# * add missing options +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ + -nosse \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -verbose -stl -no-accessibility" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"' + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + echo "DEFINES += QT_NO_XIM" >>src/qbase.pri + unset QMAKESPEC + #export QMAKESPEC="linux-oe-g++" + ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake + #rm -rf ./mkspecs + #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs + echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +# FIXME: Might want to compile the cross tools for the -dev packages as well... +do_compile() { + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic + + oe_runmake ${EXTRA_ENV} +} + +PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml" + +do_stage() { + oe_runmake install INSTALL_ROOT=/ + install -m 0755 ${STAGING_BINDIR}/rcc4 ${STAGING_QT_DIR}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${STAGING_QT_DIR}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${STAGING_QT_DIR}/bin/uic + +} + +# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... +# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... +do_install() { + install -d ${D}${libdir} + install -d ${D}${bindir} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${D}${libdir} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -pPR include/* ${D}${incdir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} + + install -d ${D}${bindir}/qt4-examples + for binary in `find examples -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-examples/ + done + install -d ${D}${bindir}/qt4-demos + for binary in `find demos -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-demos/ + done +} + +PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ + libqtdesigner4 libqtdesignercomponents4 libqt3support4 \ + qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ + qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" + +ALLOW_EMPTY = "1" +FILES_${PN} = "" +RDEPENDS_${PN} = "${PACKAGES}" + +FILES_libqtcore4 = "${libdir}/libQtCore.so*" +FILES_libqtgui4 = "${libdir}/libQtGui.so*" +FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" +FILES_libqtsql4 = "${libdir}/libQtSql.so*" +FILES_libqtsvg4 = "${libdir}/libQtSvg.so*" +FILES_libqttest4 = "${libdir}/libQtTest.so*" +FILES_libqtxml4 = "${libdir}/libQtXml.so*" +FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" +FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" +FILES_libqt3support4 = "${libdir}/libQt3Support.so*" + +FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" + +FILES_qt4-assistant = "${bindir}/*assistant*" +FILES_qt4-designer = "${bindir}/*designer*" +FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" + +FILES_qt4-common = "${bindir}/qtconfig" +FILES_qt4-examples = "${bindir}/qt4-examples/*" +FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" diff --git a/packages/slugos-init/files/conffiles b/packages/slugos-init/files/conffiles index 68dd26d897..e1408a3227 100644 --- a/packages/slugos-init/files/conffiles +++ b/packages/slugos-init/files/conffiles @@ -31,6 +31,10 @@ diff etc/default/usbd preserve etc/defaultdomain preserve etc/dropbear/dropbear_dss_host_key preserve etc/dropbear/dropbear_rsa_host_key +preserve etc/ssh/ssh_host_dsa_key +preserve etc/ssh/ssh_host_dsa_key.pub +preserve etc/ssh/ssh_host_rsa_key +preserve etc/ssh/ssh_host_rsa_key.pub preserve etc/fstab preserve etc/group preserve etc/gshadow @@ -48,3 +52,4 @@ preserve etc/resolv.conf preserve etc/shadow preserve etc/syslog.conf preserve etc/timezone +preserve root/.ssh/authorized_keys diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 55750dd5fe..ff1397e4c1 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -406,12 +406,12 @@ boot_rootfs() { return 1 };; *) { echo '#!/bin/sh' - echo 'modprobe ehci-hcd' - echo 'modprobe ohci-hcd' - echo 'modprobe sd_mod' - echo 'modprobe usb-storage' - echo 'modprobe ext3' - echo 'sleep 5' +# echo 'modprobe ehci-hcd' +# echo 'modprobe ohci-hcd' +# echo 'modprobe sd_mod' +# echo 'modprobe usb-storage' +# echo 'modprobe ext3' +# echo 'sleep 5' echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 8b80bf4fda..6a46eb49d7 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r60" +PR = "r62" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default index 46e48b9796..82bf55970c 100644 --- a/packages/sysvinit/sysvinit/rcS-default +++ b/packages/sysvinit/sysvinit/rcS-default @@ -19,3 +19,5 @@ EDITMOTD=no FSCKFIX=yes # Set TICKADJ to the correct tick value for this specific machine #TICKADJ=10000 +# Enable caching in populate-volatile.sh +VOLATILE_ENABLE_CACHE=yes diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 98cc47bc2a..e2124c7fe9 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r23" +PR = "r24" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. diff --git a/packages/telepathy/.mtn2git_empty b/packages/telepathy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/telepathy/.mtn2git_empty diff --git a/packages/telepathy/telepathy-gabble_20060503.bb b/packages/telepathy/telepathy-gabble_20060503.bb new file mode 100644 index 0000000000..c873894f1c --- /dev/null +++ b/packages/telepathy/telepathy-gabble_20060503.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Gabble: a Jabber/XMPP connection manager" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus loudmouth" +LICENSE = "lgpl" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" + +SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/telepathy-gabble-${PV}.tar.bz2" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}/" + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb index 0ca09032cb..34704ba111 100644 --- a/packages/texmaker/texmaker_1.3.bb +++ b/packages/texmaker/texmaker_1.3.bb @@ -2,7 +2,6 @@ DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor" HOMEPAGE = "http://www.xm1math.net/texmaker" SECTION = "x11/apps" LICENSE = "GPL" -DEPENDS = "qt4x11" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2" diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh index 5e2bd5799a..5016328df4 100644 --- a/packages/udev/files/network.sh +++ b/packages/udev/files/network.sh @@ -6,6 +6,35 @@ test -x /sbin/cardctl && exit 0 # We get two "add" events for hostap cards due to wifi0 echo "$INTERFACE" | grep -q wifi && exit 0 + +# Check if /etc/init.d/network has been run yet to see if we are +# called by starting /etc/rcS.d/S03udev and not by hotplugging a device +# +# At this stage, network interfaces should not be brought up +# automatically because: +# a) /etc/init.d/network has not been run yet (security issue) +# b) /var has not been populated yet so /etc/resolv,conf points to +# oblivion, making the network unusable +# + +spoofp="`grep ^spoofprotect /etc/network/options`" +if test -z "$spoofp" +then + # This is the default from /etc/init.d/network + spoofp_val=yes +else + spoofp_val=${spoofp#spoofprotect=} +fi + +test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0 + +# I think it is safe to assume that "lo" will always be there ;) +if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val" +then + echo "$INTERFACE" >> /dev/udev_network_queue + exit 0 +fi + # # Code taken from pcmcia-cs:/etc/pcmcia/network # diff --git a/packages/udev/files/udev_network_queue.sh b/packages/udev/files/udev_network_queue.sh new file mode 100644 index 0000000000..05e08e9d1b --- /dev/null +++ b/packages/udev/files/udev_network_queue.sh @@ -0,0 +1,35 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: udev_network_queue.sh +# Date: 03-May-06 + +do_start() { + if test -e /dev/udev_network_queue + then + echo "Activating queued NICs..." + for NIC in `cat /dev/udev_network_queue` + do + export INTERFACE="$NIC" ; export ACTION=add + /etc/udev/scripts/network.sh + done + echo "" + else + echo "No NICs queued" + fi +} + +do_stop() { + /bin/true +} + +case "$1" in +start) do_start;; +stop) do_stop;; +restart) do_stop + do_start;; +*) echo "Usage: `basename $0` [ start | stop | restart ]" + exit 0;; +esac diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index d42366b992..0bb96c7f36 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -8,13 +8,14 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://flags.patch;patch=1 \ file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ - file://mount.blacklist" + file://mount.blacklist \ + file://udev_network_queue.sh" include udev.inc INITSCRIPT_PARAMS = "start 03 S ." -PR = "r11" +PR = "r12" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" @@ -26,7 +27,8 @@ do_install () { oe_runmake 'DESTDIR=${D}' INSTALL=install install install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev - + install -m 0755 ${WORKDIR}/udev_network_queue.sh ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ @@ -46,3 +48,13 @@ do_install () { install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize } + + +pkg_postinst_append() { + update-rc.d -s udev_network_queue.sh start 41 S . start 55 0 6 . +} + + +pkg_postrm_append() { + update-rc.d -f udev_network_queue.sh remove +} diff --git a/packages/visiscript/visiscript_0.4.3.bb b/packages/visiscript/visiscript_0.4.3.bb new file mode 100644 index 0000000000..977cb80738 --- /dev/null +++ b/packages/visiscript/visiscript_0.4.3.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "VisiScript is a simple graphical frontend for \ +scripting languages like minscript, Python,Ruby, Perl or others. \ +VisiScript runs on the Qtopia desktop environment of the Zaurus." +SECTION = "opie/applications" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "qscintilla" +LICENSE = "GPL" +APPNAME = "visiscript" +APPTYPE = "binary" +APPDESKTOP = "${S}" + +BROKEN = "1" + +SRC_URI = "http://www.mneuroth.de/privat/zaurus/visiscript_src_${PV}.tar.gz \ + file://qptrlist.h file://qcleanuphandler.h" + +S = "${WORKDIR}/visiscript-${PV}" + +inherit opie + +QMAKE_PROFILES = "zvisiscript.pro" +PARALLEL_MAKE = "" + +EXTRA_QMAKEVARS_POST += "LIBS-=../qscintilla-1.65-gpl-1.6/qt/libqscintilla.a LIBS+=-lqscintilla LIBS+=-ldl" +export OE_QMAKE_LINK="${CXX}" + +do_compile_prepend() { + install -m 0644 ${WORKDIR}/*.h ${S} +} + +do_install() { + install -d ${D}${palmtopdir}/pics/ + install -m 0644 Visiscript.png ${D}${palmtopdir}/pics +} + +#FIXME: package help and translation diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb new file mode 100644 index 0000000000..686545a148 --- /dev/null +++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Qt interface for choosing which configured network to connect \ +to. It also provides a method for browsing 802.11 SSID scan results, an event \ +history log of messages generated by wpa_supplicant, and a method to add or \ +edit wpa_supplicant networks." +SECTION = "network" +LICENSE = "GPL BSD" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +PR = "r1" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " + +S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/" + +inherit qmake qt3x11 + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_gui ${D}${sbindir} +} diff --git a/packages/x11-apps/app-common.inc b/packages/x11-apps/app-common.inc index 04daf02b59..9d668cd9b2 100644 --- a/packages/x11-apps/app-common.inc +++ b/packages/x11-apps/app-common.inc @@ -2,7 +2,9 @@ DESCRIPTION = "X application" SECTION = "x11/apps" LICENSE= "MIT-X" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2" + +S = ${WORKDIR}/${PN}-X11R7.0-${PV} inherit autotools pkgconfig diff --git a/packages/xcb/.mtn2git_empty b/packages/xcb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xcb/.mtn2git_empty diff --git a/packages/xcb/libxcb_0.9.bb b/packages/xcb/libxcb_0.9.bb new file mode 100644 index 0000000000..95ea4ab1a1 --- /dev/null +++ b/packages/xcb/libxcb_0.9.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto xproto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-0.9.tar.bz2" + +PACKAGES = "libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \ + libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \ + libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \ + libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \ + libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \ + libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \ + libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \ + libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \ + libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \ + libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev" + +FILES_${PN} = "${libdir}/libXCB.so.*" +FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \ + ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \ + ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h" +FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*" +FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h" +FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*" +FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h" +FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*" +FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h" +FILES_libxcbglx = "${libdir}/libXCBglx.so.*" +FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h" +FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*" +FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h" +FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*" +FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h" +FILES_libxcbrender = "${libdir}/libXCBrender.so.*" +FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h" +FILES_libxcbres = "${libdir}/libXCBres.so.*" +FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h" +FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*" +FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h" +FILES_libxcbshape = "${libdir}/libXCBshape.so.*" +FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h" +FILES_libxcbshm = "${libdir}/libXCBshm.so.*" +FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h" +FILES_libxcbsync = "${libdir}/libXCBsync.so.*" +FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h" +FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*" +FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h" +FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*" +FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h" +FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*" +FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h" +FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*" +FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h" +FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*" +FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h" +FILES_libxcbxv = "${libdir}/libXCBxv.so.*" +FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h" +FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*" +FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/libxcb_git.bb b/packages/xcb/libxcb_git.bb new file mode 100644 index 0000000000..1ca23bc946 --- /dev/null +++ b/packages/xcb/libxcb_git.bb @@ -0,0 +1,78 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.9+git" +PR = "r0" + +PARALLEL_MAKE = "" + + +DEPENDS = "xcb-proto xproto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb" + +PACKAGES = "libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \ + libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \ + libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \ + libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \ + libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \ + libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \ + libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \ + libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \ + libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \ + libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev" + +FILES_${PN} = "${libdir}/libXCB.so.*" +FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \ + ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \ + ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h" +FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*" +FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h" +FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*" +FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h" +FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*" +FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h" +FILES_libxcbglx = "${libdir}/libXCBglx.so.*" +FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h" +FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*" +FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h" +FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*" +FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h" +FILES_libxcbrender = "${libdir}/libXCBrender.so.*" +FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h" +FILES_libxcbres = "${libdir}/libXCBres.so.*" +FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h" +FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*" +FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h" +FILES_libxcbshape = "${libdir}/libXCBshape.so.*" +FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h" +FILES_libxcbshm = "${libdir}/libXCBshm.so.*" +FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h" +FILES_libxcbsync = "${libdir}/libXCBsync.so.*" +FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h" +FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*" +FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h" +FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*" +FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h" +FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*" +FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h" +FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*" +FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h" +FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*" +FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h" +FILES_libxcbxv = "${libdir}/libXCBxv.so.*" +FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h" +FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*" +FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-demo_0.1.bb b/packages/xcb/xcb-demo_0.1.bb new file mode 100644 index 0000000000..9f7ab023c6 --- /dev/null +++ b/packages/xcb/xcb-demo_0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +DEPENDS = "libxcb xcb-util" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-demo-0.1.tar.bz2" + +inherit autotools pkgconfig diff --git a/packages/xcb/xcb-demo_git.bb b/packages/xcb/xcb-demo_git.bb new file mode 100644 index 0000000000..6a98d240a3 --- /dev/null +++ b/packages/xcb/xcb-demo_git.bb @@ -0,0 +1,16 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.1+git" +PR = "r0" + +DEPENDS = "libxcb xcb-util" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-demo" + +inherit autotools pkgconfig diff --git a/packages/xcb/xcb-proto_0.9.bb b/packages/xcb/xcb-proto_0.9.bb new file mode 100644 index 0000000000..481f2c5a25 --- /dev/null +++ b/packages/xcb/xcb-proto_0.9.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-0.9.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-proto_git.bb b/packages/xcb/xcb-proto_git.bb new file mode 100644 index 0000000000..55b941a321 --- /dev/null +++ b/packages/xcb/xcb-proto_git.bb @@ -0,0 +1,18 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.9+git" +PR = "r0" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-proto" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-util_0.1.bb b/packages/xcb/xcb-util_0.1.bb new file mode 100644 index 0000000000..949d3db116 --- /dev/null +++ b/packages/xcb/xcb-util_0.1.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb new file mode 100644 index 0000000000..5e8c7d6536 --- /dev/null +++ b/packages/xcb/xcb-util_git.bb @@ -0,0 +1,46 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.1+git" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-util" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb index 14ec6ffac0..d102f7db7a 100644 --- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb +++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb @@ -7,8 +7,8 @@ LICENSE = "MIT-X" DEPENDS = "libx11 libice util-macros" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-1.0.0.tar.bz2" -S = "${WORKDIR}/libSM-1.0.0" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-${PV}.tar.bz2" +S = "${WORKDIR}/libSM-${PV}" inherit autotools pkgconfig diff --git a/packages/xlibs/libx11_git.bb b/packages/xlibs/libx11_git.bb new file mode 100644 index 0000000000..ed6623f03a --- /dev/null +++ b/packages/xlibs/libx11_git.bb @@ -0,0 +1,32 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb index 0f9fbf1860..be1b4c94e9 100644 --- a/packages/xlibs/libxt_1.0.0.bb +++ b/packages/xlibs/libxt_1.0.0.bb @@ -4,11 +4,11 @@ PRIORITY = "optional" #MAINTAINER = "" LICENSE = "X-MIT" -DEPENDS = "libx11 libsm util-macros" +DEPENDS = "libx11 libsm util-macros kbproto" PROVIDES = "xt" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-${PV}.tar.bz2" -S = "${WORKDIR}/libXt-${PV}" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-X11R7.0-${PV}.tar.bz2" +S = "${WORKDIR}/libXt-X11R7.0-${PV}" inherit autotools pkgconfig diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb index 87e2ecfa62..c019e94780 100644 --- a/packages/xlibs/util-macros_1.0.1.bb +++ b/packages/xlibs/util-macros_1.0.1.bb @@ -3,7 +3,9 @@ SECTION = "x11/libs" LICENSE= "Xorg" #MAINTAINER = "" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2" + +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" inherit autotools pkgconfig diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc index 4a712a810a..f35a791171 100644 --- a/packages/xproto/proto-common.inc +++ b/packages/xproto/proto-common.inc @@ -3,7 +3,9 @@ SECTION = "x11/libs" LICENSE= "MIT-X" #MAINTAINER = "" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2" + +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" inherit autotools pkgconfig diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch deleted file mode 100644 index e2d56874c9..0000000000 --- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- zaurusd/scripts/zaurus-hinge.in 2006-03-24 18:23:15.000000000 +0100 -+++ zaurusd/scripts/zaurus-hinge 2006-03-24 18:33:24.480748696 +0100 -@@ -18,6 +18,10 @@ - exit 1 - fi - -+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" -+ -+ -+ - STATE=$1 - - if [ $STATE = "3" ]; then -@@ -29,8 +33,21 @@ - fi - - if [ $STATE = "0" ]; then -- #echo "lanscape" -- killproc @bindir@/mbinputmgr -+ #echo "landscape" -+ -+ # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure -+ # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance -+ # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;) -+ -+ if ! test -e "/tmp/gpe-panel.session-$panel_user" -+ then -+ test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr -+ else -+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr -+ rm "/tmp/gpe-panel.session-$panel_user" -+ fi -+ - # urg mbinputmgr should kill below - killproc @bindir@/matchbox-keyboard - killproc @bindir@/matchbox-stroke -@@ -47,8 +64,25 @@ - fi - # just to be extra safe - sleep 1 -- if [ -x @bindir@/mbinputmgr ]; then -- @bindir@/mbinputmgr & -+ -+ echo "panel_user = [$panel_user]" -+ -+ if ! test -e "/tmp/gpe-panel.session-$panel_user" -+ then -+ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ else -+ rm "/tmp/gpe-panel.session-$panel_user" - fi -+ -+ if test -n "$panel_user" -+ then -+ echo "Running panel as user [$panel_user]" -+ ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr & -+ else -+ # A failsafe can't hurt -+ echo "Warning: Running mbinputmgr as root!" -+ ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr & -+ fi -+ - exit 0 - fi diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in new file mode 100644 index 0000000000..1d4682e603 --- /dev/null +++ b/packages/zaurusd/files/zaurus-hinge.in @@ -0,0 +1,91 @@ +#!/bin/sh +# +# Quick handler for chkhinge26 and X. +# + +killproc() { # kill the named process(es) + pid=`/bin/ps -e x | + /bin/grep $1 | + /bin/grep -v grep | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid +} + +export DISPLAY=:0 + +if [ -z "$1" ]; then + echo "Usage: hinge-handler <state> ( 3 = closed, 0 = landscape, 2 = portrait )" + exit 1 +fi + +panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" + + + +STATE=$1 + +if [ $STATE = "3" ]; then + #echo "sleeping" +# +# uncomment 'if' block below to have zaurus suspend on hinge close +# +# if [ -x @bindir@/apm ]; then +# apm -s +# fi + exit 0 +fi + +if [ $STATE = "0" ]; then + #echo "landscape" + + # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure + # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance + # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;) + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then + test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" + test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + else + cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + rm "/tmp/gpe-panel.session-$panel_user" + fi + + # urg mbinputmgr should kill below + killproc @bindir@/matchbox-keyboard + killproc @bindir@/matchbox-stroke + if [ -x @bindir@/xrandr ]; then + xrandr -o normal + fi + exit 0 +fi + +if [ $STATE = "2" ]; then + #echo "portrait" + if [ -x @bindir@/xrandr ]; then + @bindir@/xrandr -o left + fi + # just to be extra safe + sleep 1 + + echo "panel_user = [$panel_user]" + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then + cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" + else + rm "/tmp/gpe-panel.session-$panel_user" + fi + + if test -n "$panel_user" + then + echo "Running panel as user [$panel_user]" + ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr & + else + # A failsafe can't hurt + echo "Warning: Running mbinputmgr as root!" + ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr & + fi + + exit 0 +fi diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 52a7b353d3..ec385d4934 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -1,20 +1,23 @@ -LICENSE = "GPL" +DESCRIPTION = "Daemon to handle device specifc features." SECTION = "base" MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>" -DESCRIPTION = "Daemon to handle device specifc features." -PV = "0.0+svn${SRCDATE}" -PR = "r2" +LICENSE = "GPL" DEPENDS = "tslib" +PV = "0.0+svn${SRCDATE}" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ - file://mbinputmgr-honor-user-prefs.patch;patch=1" + file://zaurus-hinge.in" + S = "${WORKDIR}/${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools pkgconfig +do_configure_prepend () { + cp ${WORKDIR}/zaurus-hinge.in ${S}/scripts +} -inherit update-rc.d +inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "zaurusd" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." diff --git a/packages/zeroconf/files/.mtn2git_empty b/packages/zeroconf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zeroconf/files/.mtn2git_empty diff --git a/packages/zeroconf/files/debian-zeroconf b/packages/zeroconf/files/debian-zeroconf new file mode 100644 index 0000000000..c3705d2788 --- /dev/null +++ b/packages/zeroconf/files/debian-zeroconf @@ -0,0 +1,51 @@ +#!/bin/sh + +if [ ! -x /usr/sbin/zeroconf ]; then + exit 0 +fi + +# IPv4 link-local addresses (zeroconf) are +# only applicable on the 'inet' address family +[ "X$ADDRFAM" != "Xinet" ] && exit 0 + +# However there are some methods where it doesn't +# make any sense to configure an IPv4LL address + +# not on loopback +[ "X$METHOD" = "Xloopback" ] && exit 0 + +# not on ppp or wvdial either +[ "X$METHOD" = "Xppp" ] && exit 0 +[ "X$METHOD" = "Xwvdial" ] && exit 0 + +# The administrator may have blacklisted interfaces +# or only want zeroconf in a fallback situation +[ -f /etc/default/zeroconf ] && + . /etc/default/zeroconf + +[ -n "$DISABLE" ] && exit 0 + +for BLACK in $IFBLACKLIST; do + case $IFACE in + $BLACK) + exit 0 + ;; + esac +done + +# should we only allocate an address if we do not already have one? +if [ -n "$FALLBACK" ]; then + /bin/ip addr show $IFACE scope global | grep -q "inet" + IP=$? + if [ $IP -eq 0 ]; then + /bin/ip route add 169.254.0.0/16 dev $IFACE + exit 0 + fi +fi + +# otherwise, run if we aren't already going +if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then + /usr/sbin/zeroconf -i $IFACE +fi + +exit 0 diff --git a/packages/zeroconf/zeroconf-0.6.1/zeroconf-default b/packages/zeroconf/files/zeroconf-default index cc07b275f1..cc07b275f1 100644 --- a/packages/zeroconf/zeroconf-0.6.1/zeroconf-default +++ b/packages/zeroconf/files/zeroconf-default diff --git a/packages/zeroconf/zeroconf_0.9.bb b/packages/zeroconf/zeroconf_0.9.bb new file mode 100644 index 0000000000..c8f7ddfa3a --- /dev/null +++ b/packages/zeroconf/zeroconf_0.9.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "IPv4 link-local address allocator" +AUTHOR = "Anand Kumria <wildfire@progsoc.uts.edu.au>" +HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" +LICENSE = "GPL" +SECTION = "net" +PRIORITY = "optional" + +PR = "r0" + +SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \ + file://zeroconf-default \ + file://debian-zeroconf" + +do_install () { + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/network/if-up.d + install -d ${D}${sysconfdir}/default + install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf + install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf + install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf +} diff --git a/site/arm-linux-gnueabi b/site/arm-linux-gnueabi index aff569c013..7c9fb85d0b 100644 --- a/site/arm-linux-gnueabi +++ b/site/arm-linux-gnueabi @@ -367,3 +367,11 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# dpkg +dpkg_cv_va_copy=${ac_cv_va_copy=no} +dpkg_cv___va_copy=${ac_cv___va_copy=yes} + +# enca +yeti_cv_func_scanf_modif_size_t=yes + |