diff options
58 files changed, 2328 insertions, 88 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8d448ce0d3..927e3432b7 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -151,15 +151,32 @@ autotools_stage_includes() { } autotools_stage_all() { - if [ "${INHIBIT_AUTO_STAGE}" != "1" ] + if [ "${INHIBIT_AUTO_STAGE}" = "1" ] then - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install - cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} - cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} - rm -rf ${STAGE_TEMP} + return + fi + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + if [ -d ${STAGE_TEMP}/${includedir} ]; then + cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + fi + if [ -d ${STAGE_TEMP}/${libdir} ] + then + for i in ${STAGE_TEMP}/${libdir}/*.la + do + if [ ! -f "$i" ]; then + cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + break + fi + oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR} + done + fi + if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then + install -d ${STAGING_DATADIR}/aclocal + cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal fi + rm -rf ${STAGE_TEMP} } EXPORT_FUNCTIONS do_configure do_install diff --git a/classes/base.bbclass b/classes/base.bbclass index c5359b20f8..1ff729822e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -171,9 +171,8 @@ oe_libinstall() { if [ -z "$dir" ]; then dir=`pwd` fi - if [ -d "$dir/.libs" ]; then - dir=$dir/.libs - fi + dotlai=$libname.lai + dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir @@ -191,14 +190,13 @@ oe_libinstall() { if [ -f "$dota" -o -n "$require_static" ]; then __runcmd install -m 0644 $dota $destpath/ fi - dotlai=$libname.lai if [ -f "$dotlai" -a -n "$libtool" ]; then if test -n "$staging_install" then # 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/' $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/image_ipk.bbclass b/classes/image_ipk.bbclass index 5fdd340673..37d4b338d6 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -53,6 +53,32 @@ fakeroot do_rootfs () { ${IMAGE_POSTPROCESS_COMMAND} } +DISTRO_LOCALE_FEEDS_PREFIXES ?= "" +DISTRO_LOCALE_FEEDS_HEADER ?= "" + +python __anonymous() { + prefixes = bb.data.getVar("DISTRO_LOCALE_FEEDS_PREFIXES", d, 1).split() + locale_feeds = bb.data.getVar("DISTRO_LOCALE_FEEDS_HEADER", d, 1) + + # add template + locale_feeds += "# For each supported locale there is a subfeed in each of the feed folders.\n" + locale_feeds += "# You can use your webbrowser to check for valid locale codes.\n\n" + locale_feeds += "# To point ipkg at packages for your locale, replace <my_locale> with the\n" + locale_feeds += "# locale code in the template below and remove the leading '#' characters.\n\n" + for p in prefixes: + locale_feeds += "# src/gz %s-locale-<my_locale> %s/locale/<my_locale>\n" % (p.split('/')[-1], p) + + # add feed for each IMAGE_LINGUA + linguas = bb.data.getVar("IMAGE_LINGUAS", d, 1).split() + for l in linguas: + fst = l.split('-')[0] + locale_feeds += "\n# %s locale feeds\n" % fst + for p in prefixes: + locale_feeds += "src/gz %s-locale-%s %s/locale/%s\n" % (p.split('/')[-1], fst, p, fst) + + bb.data.setVar("DISTRO_LOCALE_FEEDS", locale_feeds, d) +} + insert_feed_uris () { echo "Building feeds for [${DISTRO}].." @@ -69,4 +95,14 @@ insert_feed_uris () { # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf done + + if [ -z ${FEED_URIS} ]; then +cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-feeds.conf <<EOF +${DISTRO_FEEDS} +EOF + +cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-locale-feeds.conf <<EOF +${DISTRO_LOCALE_FEEDS} +EOF + fi } diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ff9aeeab78..e663643ce5 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -185,6 +185,7 @@ fi } # autoload defaults (alphabetically sorted) +module_autoload_evdev = "evdev" module_autoload_hidp = "hidp" module_autoload_ipv6 = "ipv6" module_autoload_ipsec = "ipsec" @@ -231,12 +232,13 @@ python populate_packages_prepend () { kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1) kernelver_stripped = kernelver m = re.match('^(.*-hh.*)[\.\+].*$', kernelver) - if m: + if m and not bb.data.getVar('KERNEL_PRESERVE_HH_MINOR_VER', d, 1): kernelver_stripped = m.group(1) path = bb.data.getVar("PATH", d, 1) host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or "" cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped) + bb.debug (1, cmd) f = os.popen(cmd, 'r') deps = {} @@ -267,7 +269,9 @@ python populate_packages_prepend () { m4 = re.match(pattern4, line) deps[m2.group(1)].extend(m4.group(1).split()) line = f.readline() - f.close() + if f.close() or not deps: + # depmod returned an error or no deps found (very unlikely) + raise bb.build.FuncFailed("Failed to extract module dependencies.") return deps def get_dependencies(file, pattern, format): diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 062c957359..8b8c951a2e 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -130,7 +130,13 @@ create_etc_timestamp() { date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp } +make_zimage_symlink_relative () { + if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then + (cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done) + fi +} + # export the zap_root_password and create_etc_timestamp -EXPORT_FUNCTIONS zap_root_password create_etc_timestamp +EXPORT_FUNCTIONS zap_root_password create_etc_timestamp make_zimage_symlink_relative addtask rootfs before do_build after do_install diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index d397babb88..0de7d7c2c8 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -40,9 +40,6 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" CVSDATE_handhelds-pxa-2.6 = "20051221" CVSDATE_LAB-kernel = "20051221" -#gomunicator version which adds support for iPAQ h6300. -CVSDATE_gomunicator = "20060518" - #The CSL compiler is unusable because # 1) certain programs stop to compile # 2) more programs segfault diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index aea603f33c..cc487d59fe 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -23,7 +23,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.6.4" PREFERRED_VERSION_gtk+ ?= "2.6.10" PREFERRED_VERSION_pango ?= "1.8.1" PREFERRED_VERSION_librsvg ?= "2.6.5" -PREFERRED_VERSION_libgpewidget ?= "0.109" +PREFERRED_VERSION_libgpewidget ?= "0.112" PREFERRED_VERSION_libgpepimc ?= "0.6" PREFERRED_VERSION_libgpevtype ?= "0.15" PREFERRED_VERSION_libschedule ?= "0.15" @@ -44,7 +44,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_gpe-login ?= "0.86" -PREFERRED_VERSION_gpe-session-scripts ?= "0.66" +PREFERRED_VERSION_gpe-session-scripts ?= "0.67" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.55" PREFERRED_VERSION_gpe-calendar ?= "0.72" @@ -57,7 +57,7 @@ PREFERRED_VERSION_gpe-beam ?= "0.2.8" PREFERRED_VERSION_gpe-bluetooth ?= "0.51" PREFERRED_VERSION_gpe-su ?= "0.19" PREFERRED_VERSION_gpe-conf ?= "0.1.30" -PREFERRED_VERSION_gpe-clock ?= "0.23" +PREFERRED_VERSION_gpe-clock ?= "0.25" PREFERRED_VERSION_gpe-mininet ?= "0.7" PREFERRED_VERSION_gpe-mixer ?= "0.42" PREFERRED_VERSION_gpe-shield ?= "0.9" @@ -80,7 +80,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.07" PREFERRED_VERSION_gpe-lights ?= "0.13" #PREFERRED_VERSION_gpe-nmf ?= "0.21" PREFERRED_VERSION_gpe-othello ?= "0.2-1" -PREFERRED_VERSION_gpe-plucker ?= "0.2" +PREFERRED_VERSION_gpe-plucker ?= "0.4" PREFERRED_VERSION_gpe-tetris ?= "0.6-4" PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" PREFERRED_VERSION_xdemineur ?= "2.1.1" diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index 146cf9e17c..b68eb32c2a 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/preferred-gpe-versions.inc @@ -41,7 +41,7 @@ PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" #PREFERRED_VERSION_gpe-calendar ?= "0.61" #PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" #PREFERRED_VERSION_gpe-contacts ?= "0.36" -#PREFERRED_VERSION_gpe-today ?= "0.11" +#PREFERRED_VERSION_gpe-today ?= "0.08" #PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" #PREFERRED_VERSION_gpe-bluetooth ?= "0.38" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 7194eaf29f..76bf1eda9b 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -118,7 +118,7 @@ BBINCLUDELOGS = "yes" # Specifies a location to search for pre-generated tarballs when fetching # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" +CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/" # EDIT THIS FILE and then remove the line below before using! REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 15b7cdf706..ea81f8f536 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -39,3 +39,6 @@ GPE_EXTRA_DEPENDS += "gaim gpe-filemanager" GPE_EXTRA_INSTALL += "gaim gpe-filemanager" include conf/machine/tune-strongarm.conf + +# LAB can only resolve relative symlinks +ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 821f71c31a..71dc9becce 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3" +PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.15-hh1" PREFERRED_VERSION_orinoco-modules = "0.15rc1" @@ -35,7 +35,7 @@ include conf/machine/tune-strongarm.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" + hx4700_ts snd_hx4700_audio hx4700_power" module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index e335e20839..6aa91b0544 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/packages/apmd/apmd_3.2.2.bb @@ -3,12 +3,11 @@ SECTION = "base" PRIORITY = "required" DEPENDS = "libtool-cross" LICENSE = "GPL" -PR = "r9" +PR = "r10" SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \ file://debian.patch;patch=1 \ file://workaround.patch;patch=1 \ - file://select-instead-of-sleep.patch;patch=1 \ file://init \ file://default \ file://apmd_proxy \ diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab index 2a3929fd17..094b51347a 100644 --- a/packages/base-files/base-files/h3900/fstab +++ b/packages/base-files/base-files/h3900/fstab @@ -1,6 +1,5 @@ /dev/mtdblock/1 / jffs2 defaults 1 1 -#breaks h51xx -#/dev/mtdblock/2 /home jffs2 defaults 1 1 +/dev/mtdblock/2 /home jffs2 defaults 1 1 proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 /dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 diff --git a/packages/base-files/base-files/h6300/fstab b/packages/base-files/base-files/h6300/fstab index 6884b4cc6d..7204361a75 100644 --- a/packages/base-files/base-files/h6300/fstab +++ b/packages/base-files/base-files/h6300/fstab @@ -1,8 +1,8 @@ -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -sys /sys sysfs defaults 0 0 -tmpfs /var tmpfs defaults 0 0 +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +sys /sys sysfs defaults 0 0 +tmpfs /var tmpfs defaults 0 0 #The devpts file system provides an interface to pseudo terminal (pty) devices. -devpts /dev/pts devpts mode=0620,gid=5 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 #Mount first partition from the mmc card. -/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 6d5fb61dca..35357c93cd 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 = "r45" +PR = "r46" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb index 772b316cc8..35c0d0cbd6 100644 --- a/packages/freetype/freetype_2.1.10.bb +++ b/packages/freetype/freetype_2.1.10.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library" HOMEPAGE = "http://www.freetype.org" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://no-hardcode.patch;patch=1" S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 9c28833916..0d1d073f47 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" CVSDATE = "20050627" -PR = "r3" +PR = "r4" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -95,7 +95,12 @@ do_munge() { addtask munge before do_patch after do_unpack +export default_mmap_threshold_familiar = "32*1024" + do_configure () { + if [ "x$default_mmap_threshold" != "x" ]; then + echo "malloc-CPPFLAGS=-DDEFAULT_MMAP_THRESHOLD=\"(${default_mmap_threshold})\"" >configparms + fi # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now # don't pass CPPFLAGS into configure, since it upsets the kernel-headers diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb index 9a164978ff..cf58ea6d7b 100644 --- a/packages/gnuz/gnuz_0.3.bb +++ b/packages/gnuz/gnuz_0.3.bb @@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" AUTHOR = "Lukas Fraser" HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/" -PR = "r2" +PR = "r1" APPTYPE = "binary" APPNAME = "gnuz" APPDESKTOP = "${S}/data/" SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \ - http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2" + http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2" S = "${WORKDIR}/gnuz" diff --git a/packages/gpe-aerial/gpe-aerial_0.2.13.bb b/packages/gpe-aerial/gpe-aerial_0.2.13.bb index 987c6535f6..789c3d05f3 100644 --- a/packages/gpe-aerial/gpe-aerial_0.2.13.bb +++ b/packages/gpe-aerial/gpe-aerial_0.2.13.bb @@ -1,6 +1,6 @@ inherit gpe pkgconfig -PR = "r0" +PR = "r1" DESCRIPTION = "GPE wireless LAN communication applet" @@ -10,3 +10,4 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" +SRC_URI += "file://iconlist.patch;patch=1;pnum=0" diff --git a/packages/gpe-filemanager/gpe-filemanager_0.25.bb b/packages/gpe-filemanager/gpe-filemanager_0.25.bb index 898ff6002b..2beee83596 100644 --- a/packages/gpe-filemanager/gpe-filemanager_0.25.bb +++ b/packages/gpe-filemanager/gpe-filemanager_0.25.bb @@ -1,12 +1,12 @@ inherit gpe -PR = "r1" +PR = "r0" LICENSE = "GPL" DESCRIPTION = "GPE file manager" DEPENDS = "libgpewidget gnome-vfs dbus" SECTION = "gpe" RDEPENDS = "gpe-icons" -RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http" +RRECOMMENDS = "gnome-vfs-plugin-file" FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/gpe-today/gpe-today_0.11.bb b/packages/gpe-today/gpe-today_0.11.bb index 2b02195388..204a21afbb 100644 --- a/packages/gpe-today/gpe-today_0.11.bb +++ b/packages/gpe-today/gpe-today_0.11.bb @@ -1,12 +1,9 @@ +LICENSE = "GPL" +inherit gpe + DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" SECTION = "gpe" PRIORITY = "optional" -MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" - -LICENSE = "GPL" -inherit gpe pkgconfig - - -SRC_URI = "http://www.kernelconcepts.de/~fuchs/files/${P}.tar.gz" +SRC_URI += "file://no-transparency.patch;patch=1" diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb index d59eab3a61..35d654b07e 100644 --- a/packages/ipkg/ipkg-native_0.99.154.bb +++ b/packages/ipkg/ipkg-native_0.99.154.bb @@ -1,2 +1,6 @@ include ipkg_${PV}.bb include ipkg-native.inc + +PR = "r1" + +SRC_URI += "file://sw.patch;patch=1" diff --git a/packages/ipkg/ipkg_0.99.159.bb b/packages/ipkg/ipkg_0.99.159.bb index 47feccd27c..20e547d4b2 100644 --- a/packages/ipkg/ipkg_0.99.159.bb +++ b/packages/ipkg/ipkg_0.99.159.bb @@ -1,3 +1,6 @@ include ipkg.inc +PR = "r1" + #SRC_URI += "file://interceptor.patch;patch=1;pnum=1" +SRC_URI += "file://sw.patch;patch=1" diff --git a/packages/kbdd/files/kbdd.init b/packages/kbdd/files/kbdd.init index c9e0a0deac..00aec07aa7 100644 --- a/packages/kbdd/files/kbdd.init +++ b/packages/kbdd/files/kbdd.init @@ -12,6 +12,11 @@ case $1 in killall kbdd ;; +'restart') + $0 stop + $o start + ;; + *) echo "usage: $0 { start | stop | restart }" ;; diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index e3fc55a88f..3b2d5ea97c 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -1,7 +1,7 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" SECTION = "opie/applications" PRIORITY = "optional" -DEPENDS = "libqpe-opie openssl pcre" +DEPENDS = "libqpe-opie pcre" LICENSE = "LGPL/GPL" PR = "r3" @@ -30,7 +30,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir} --enable-static --disable-shared --disable-debug \ --with-javascript=static --enable-qpe --enable-qt-embedded \ --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} \ - --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --without-ssl \ --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR} \ --enable-libsuffix="" ' diff --git a/packages/libopie/libopie2_1.2.1.bb b/packages/libopie/libopie2_1.2.1.bb index dbda15360c..2938537b8b 100644 --- a/packages/libopie/libopie2_1.2.1.bb +++ b/packages/libopie/libopie2_1.2.1.bb @@ -1,7 +1,8 @@ include ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://openzaurus-branding.patch;patch=1 \ + file://prelim-h191x-hx4700-supp.patch;patch=1;pnum=2 \ file://include.pro" diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/.mtn2git_empty b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/.mtn2git_empty diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 new file mode 100644 index 0000000000..4d012c89e0 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 @@ -0,0 +1,1627 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_REGISTERS is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +CONFIG_ARCH_H3900=y +CONFIG_ARCH_H1900=y +CONFIG_ARCH_H5400=y +# CONFIG_ARCH_H2200 is not set +CONFIG_ARCH_AXIM=y +CONFIG_PXA_USB=m +CONFIG_PXA_USB_NETLINK=m +CONFIG_PXA_USB_CHAR=m + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +CONFIG_XSCALE_PXA250=y +# CONFIG_XSCALE_80200_OLD is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set +# CONFIG_SA1100_IPAQ is not set +CONFIG_PXA_IPAQ=y +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +# CONFIG_H3600_MICRO is not set +CONFIG_IPAQ_HAS_ROSELLA=y +CONFIG_IPAQ_HAS_ASIC3=y +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=m +CONFIG_H5400_ASIC=m +CONFIG_H1900_ASIC=m +CONFIG_H1900_TS=m +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set + +# +# Dell Axim X5 +# +CONFIG_AXIM_HAL=m + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=m +# CONFIG_MERCURY_BACKPAQ is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SAMSUNG_ASIC=m +# CONFIG_MMC_S3C2410 is not set +CONFIG_MMC_H5400=m +CONFIG_MMC_ASIC3=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +# CONFIG_HWTIMER is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_PC_CML1=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_ARC is not set +# CONFIG_PARPORT_IDP is not set +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_MAP_BANK_WIDTH_8=y +CONFIG_MTD_MAP_BANK_WIDTH_16=y +CONFIG_MTD_MAP_BANK_WIDTH_32=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLKMTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m + +# +# IPSec options (FreeS/WAN) +# +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y + +# +# ESP always enabled with tunnel mode +# +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set + +# +# Wireless Pcmcia cards support +# +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_PXA_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_EXTENDED=y +# CONFIG_SERIAL_MANY_PORTS is not set +# CONFIG_SERIAL_SHARE_IRQ is not set +# CONFIG_SERIAL_DETECT_IRQ is not set +# CONFIG_SERIAL_MULTIPORT is not set +# CONFIG_HUB6 is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_NEWTONKBD=m +# CONFIG_SA1100_PROFILER is not set + +# +# Compaq iPAQ H3600 support +# +CONFIG_TOUCHSCREEN_H3600=m +# CONFIG_H3600_BACKPAQ_FPGA is not set +# CONFIG_H3600_BACKPAQ_ACCEL is not set +# CONFIG_H3600_BACKPAQ_GASGAUGE is not set +# CONFIG_H3600_BACKPAQ_SRAM is not set +# CONFIG_H3600_BACKPAQ_AUDIO is not set +# CONFIG_H3600_STOWAWAY is not set +# CONFIG_H3800_MICROKBD is not set +# CONFIG_SA1100_LIRC is not set +CONFIG_H5400_BUZZER=m +CONFIG_H5400_FSI=m + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=m +CONFIG_I2C_PXA_ADAP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_PROC=m +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +# CONFIG_L3_BACKPAQ is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m + +# +# Joysticks +# +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_PXA_WATCHDOG=m +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=m +CONFIG_PXA_RTC_HACK=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_TS is not set +CONFIG_AXIM_KEY=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +# CONFIG_VIDEO_H3600_BACKPAQ is not set +# CONFIG_VIDEO_HAWKEYE is not set + +# +# Video for Linux 2 (V4L2) +# +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_JFFS2_LZARI is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_PROC=y +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_8BPP is not set +CONFIG_FB_PXA_16BPP=y +CONFIG_FB_MQ1100=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_H3900_UDA1380=m +CONFIG_SOUND_H5400=m +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=m +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +# CONFIG_SWITCHES is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +CONFIG_USB_OHCI=m +# CONFIG_USB_OHCI_SA1111 is not set +CONFIG_USB_OHCI_H5400=m +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_AUDIO=m +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# USB Human Interface Devices (HID) +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +# CONFIG_USB_QC is not set +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_DABUSB is not set + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +CONFIG_USB_CDCETHER=m +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +CONFIG_USB_SERIAL_IPAQ=m +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Support for USB gadgets +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_PXA2XX=y +# CONFIG_USB_GADGET_N9604 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_SUPERH is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_CONTROLLER is not set +CONFIG_USB_PXA2XX=m +CONFIG_USB_GADGET_CONTROLLER=m +# CONFIG_USB_GADGET_DUALSPEED is not set + +# +# USB Gadget Drivers +# +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BLUEZ_HCIUSB=m +# CONFIG_BLUEZ_HCIUSB_SCO is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +# CONFIG_BLUEZ_HCIVHCI is not set + +# +# Kernel hacking +# +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_REED_SOLOMON is not set +CONFIG_FW_LOADER=m diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb index 983d59fd28..77c99bed89 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh1.bb @@ -2,6 +2,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." MAINTAINER = "Greg Gilbert <greg@treke.net>" LICENSE = "GPL" +PR = "r1" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb new file mode 100644 index 0000000000..a2f19aa74a --- /dev/null +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb @@ -0,0 +1,76 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +LICENSE = "GPL" +PR = "r1" + + +KERNEL_CCSUFFIX = "-3.3.4" +COMPATIBLE_HOST = "arm.*-linux" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig-${PACKAGE_ARCH} \ + file://ipaq-hal.init \ + file://linux-2.4-mmc-debugging.patch;patch=1 \ + file://linux-2.4-usb-gadget.patch;patch=1 \ + file://usb-gadget-ether-compat.patch;patch=1 \ + file://linux-2.4-no-short-loads.patch;patch=1 \ + file://linux-2.4-cpufreq.patch;patch=1" + +S = "${WORKDIR}/kernel" + +KERNEL_PRESERVE_HH_MINOR_VER = "1" + +inherit kernel update-rc.d + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +RMKV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}" +PXAV = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}" + +module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic" +module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic" +module_conf_pxa_ir = "alias irda0 pxa_ir" +module_conf_i2c-algo-pxa = "options i2c-algo-pxa pxa_scan=0" +module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1" +module_conf_ppp_async = "alias ppp0 ppp_async" +module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1" +module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1" +module_conf_hidp = "alias bt-prot-5 hidp" + +module_autoload_h3600_ts = "h3600_ts" +module_autoload_apm = "apm" +module_autoload_af_packet = "af_packet" +module_autoload_usb-ohci-h5400 = "usb-ohci-h5400" +module_autoload_ppp_async = "ppp_async" +module_autoload_usb-eth = "usb-eth" +module_autoload_h5400_buzzer = "h5400_buzzer" +# breaks booting on first install of h3900 handhelds +#module_autoload_mmc_asic3 = "mmc_asic3" +module_autoload_mmc_h5400 = "mmc_h5400" +module_autoload_h5400-audio = "h5400-audio" +module_autoload_h3900-uda1380 = "h3900-uda1380" +module_autoload_sa1100-rtc = "sa1100-rtc" +module_autoload_ak4535 = "ak4535" +module_autoload_i2c-adap-pxa = "i2c-adap-pxa" + +FILES_kernel += "/etc/init.d/ipaq-hal" +INITSCRIPT_NAME = "ipaq-hal" +INITSCRIPT_PARAMS = "start 21 S ." + +# extra depends +RDEPENDS_kernel-module-h5400-audio = "kernel-module-ak4535 kernel-module-i2c-adap-pxa" +RDEPENDS_kernel-module-h3900-uda1380 = "kernel-module-uda1380 kernel-module-i2c-adap-pxa" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal +} diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb index b360ac3674..f87cffbc46 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb @@ -47,7 +47,8 @@ module_autoload_usb-ohci-h5400 = "usb-ohci-h5400" module_autoload_ppp_async = "ppp_async" module_autoload_usb-eth = "usb-eth" module_autoload_h5400_buzzer = "h5400_buzzer" -module_autoload_mmc_asic3 = "mmc_asic3" +# breaks booting on first install of h3900 handhelds +#module_autoload_mmc_asic3 = "mmc_asic3" module_autoload_mmc_h5400 = "mmc_h5400" module_autoload_h5400-audio = "h5400-audio" module_autoload_h3900-uda1380 = "h3900-uda1380" diff --git a/packages/linux/linux-jlime-sh3_2.6.11.bb b/packages/linux/linux-jlime-sh3_2.6.11.bb index f77de8ab9e..1593452658 100644 --- a/packages/linux/linux-jlime-sh3_2.6.11.bb +++ b/packages/linux/linux-jlime-sh3_2.6.11.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" LICENSE = "GPL" PR = "r0" -SRC_URI = "http://www.jlime.com/downloads/releases/shrek/kernels/6xx/sources/linuxsh-snapshot-050320-jlimepatched-3.tar.bz2 \ +SRC_URI = "http://www.jlime.com/downloads/Releases/shrek/kernels/6xx/sources/linuxsh-snapshot-050320-jlimepatched-3.tar.bz2 \ file://defconfig_jlime" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 66d155f690..7d37c4f4fc 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -1,9 +1,17 @@ FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 " FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" -FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" -PR = "r23" +DISTRO_FEEDS_append_familiar () { + +# x11 - additional packages specific to the x11 graphical environment +src/gz x11 ${DISTRO_FEED_PREFIX}/x11 +src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE} +} + +DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11" + +PR = "r21" export IMAGE_BASENAME = "gpe-image" @@ -23,6 +31,7 @@ GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" #ship more stuff with devices with >16MB of flash GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ gpe-theme-clearlooks \ + sylpheed \ figment \ ",d)}' @@ -54,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp " ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index ecbcbcec20..2c01c268bf 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,7 +1,7 @@ PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r44" +PR = "r45" ALLOW_EMPTY = "1" @@ -91,8 +91,10 @@ gpe-task-apps = "\ gpe-what \ matchbox-panel-hacks \ gpe-aerial \ - gpe-soundbite \ - rosetta" + gpe-soundbite" + +# causes a >15 secs delay on initial boot +# rosetta" RDEPENDS_gpe-task-apps := "${gpe-task-apps}" DEPENDS += " ${gpe-task-apps}" diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index f82a69f367..6cc4ccbf98 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -118,7 +118,7 @@ task-opie-apps = "opie-advancedfm opie-bartender opie-calculator \ opie-console opie-dagger opie-embeddedkonsole \ opie-euroconv opie-eye opie-ftp opie-gutenbrowser \ opie-helpbrowser opie-irc opie-keypebble opie-odict \ - opie-oxygen opie-rdesktop opie-reader opie-remote \ + opie-oxygen opie-reader opie-remote \ opie-sheet opie-tableviewer opie-tinykate \ opie-wellenreiter opie-write opie-zsafe" @@ -181,7 +181,7 @@ task-opie-irda = "irda-utils libopieobex0 obexftp obexpush" # task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-eye \ - opie-rdesktop opie-wellenreiter opie-irc \ + opie-wellenreiter opie-irc \ opie-mediaplayer2 \ konqueror-embedded qpdf2" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index e012b2c34f..5c30876dec 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -3,7 +3,15 @@ export IMAGE_LINGUAS = "" FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" -FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" + +DISTRO_FEEDS_append_familiar () { + +# opie - additional packages specific to the opie graphical environment +src/gz opie ${DISTRO_FEED_PREFIX}/opie +src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE} +} + +DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie" LICENSE = "MIT" PR = "r19" @@ -66,6 +74,6 @@ merge_feeds() { } # merge feed-sources into ipkg.conf and create /etc/timestamp from build date -IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" +IMAGE_PREPROCESS_COMMAND = "merge_feeds; " inherit image_ipk diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb index 31920135d4..1583e9976c 100644 --- a/packages/meta/task-bootstrap.bb +++ b/packages/meta/task-bootstrap.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Core packages required for a basic installation" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r25" +PR = "r26" # The BOOTSTRAP_EXTRA_ variables are often manipulated by the # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. 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/files/autofoo.patch b/packages/mysql/files/autofoo.patch new file mode 100644 index 0000000000..f2d5354572 --- /dev/null +++ b/packages/mysql/files/autofoo.patch @@ -0,0 +1,317 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- mysql-4.1.15/acinclude.m4~autofoo ++++ mysql-4.1.15/acinclude.m4 +@@ -1,5 +1,88 @@ + # Local macros for automake & autoconf + ++AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int]) ++AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *]) ++AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us]) ++ ++AC_DEFUN([MYSQL_SPRINTF_RET], [ ++ AC_CACHE_CHECK([return type of sprintf], ++ [mysql_cv_func_sprintf_ret], [ ++ old_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ AC_COMPILE_IFELSE([ ++#include <stdio.h> ++int sprintf(char *str, const char *format, ...); ++ ], [mysql_cv_func_sprintf_ret=int], ++ AC_COMPILE_IFELSE([ ++#include <stdio.h> ++char * sprintf(char *str, const char *format, ...); ++ ], [mysql_cv_func_sprintf_ret=ptr], ++ [mysql_cv_func_sprintf_ret=unknown]) ++ ) ++ CFLAGS="$old_CFLAGS" ++ ]) ++ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then ++ AC_DEFINE([SPRINTF_RETURNS_INT], [1]) ++ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then ++ AC_DEFINE([SPRINTF_RETURNS_PTR], [1]) ++ else ++ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1]) ++ fi ++]) ++ ++# _MYSQL_FUNC_ATOMIC_ADD ++# ---------------------- ++# Check for Linux specific atomic_add function ++AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD], ++[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]], ++ [ ++int main() ++{ ++ atomic_t v; ++ ++ atomic_set(&v, 23); ++ atomic_add(5, &v); ++ return atomic_read(&v) == 28 ? 0 : -1; ++} ++ ])], ++ [mysql_cv_func_atomic_add=yes], ++ [mysql_cv_func_atomic_add=no])]) ++ if test x"$mysql_func_atomic_add" = "xyes"; then ++ AC_DEFINE([HAVE_ATOMIC_ADD], [1]) ++ fi[]dnl ++])# _MYSQL_FUNC_ATOMIC_ADD ++ ++# _MYSQL_FUNC_ATOMIC_SUB ++# ---------------------- ++# Check for Linux specific atomic_sub function ++AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB], ++[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]], ++ [ ++int main() ++{ ++ atomic_t v; ++ ++ atomic_set(&v, 23); ++ atomic_sub(5, &v); ++ return atomic_read(&v) == 18 ? 0 : -1; ++} ++ ])], ++ [mysql_cv_func_atomic_sub=yes], ++ [mysql_cv_func_atomic_sub=no])]) ++ if test x"$mysql_func_atomic_sub" = "xyes"; then ++ AC_DEFINE([HAVE_ATOMIC_SUB], [1]) ++ fi[]dnl ++])# _MYSQL_FUNC_ATOMIC_SUB ++ ++# MYSQL_FUNCS_ATOMIC ++# ------------------ ++# Check for Linux specific atomic add and sub functions ++AC_DEFUN([MYSQL_FUNCS_ATOMIC], [ ++ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl ++ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl ++])# MYSQL_FUNCS_ATOMIC + + AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [ + AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, +@@ -340,7 +423,7 @@ + AC_DEFUN([MYSQL_CHECK_ULONG], + [AC_MSG_CHECKING(for type ulong) + AC_CACHE_VAL(ac_cv_ulong, +-[AC_TRY_RUN([#include <stdio.h> ++[AC_TRY_LINK([#include <stdio.h> + #include <sys/types.h> + main() + { +@@ -358,7 +441,7 @@ + AC_DEFUN([MYSQL_CHECK_UCHAR], + [AC_MSG_CHECKING(for type uchar) + AC_CACHE_VAL(ac_cv_uchar, +-[AC_TRY_RUN([#include <stdio.h> ++[AC_TRY_LINK([#include <stdio.h> + #include <sys/types.h> + main() + { +@@ -376,7 +459,7 @@ + AC_DEFUN([MYSQL_CHECK_UINT], + [AC_MSG_CHECKING(for type uint) + AC_CACHE_VAL(ac_cv_uint, +-[AC_TRY_RUN([#include <stdio.h> ++[AC_TRY_LINK([#include <stdio.h> + #include <sys/types.h> + main() + { +@@ -395,7 +478,7 @@ + AC_DEFUN([MYSQL_CHECK_IN_ADDR_T], + [AC_MSG_CHECKING(for type in_addr_t) + AC_CACHE_VAL(ac_cv_in_addr_t, +-[AC_TRY_RUN([#include <stdio.h> ++[AC_TRY_LINK([#include <stdio.h> + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> +@@ -456,7 +539,7 @@ + AC_DEFUN([MYSQL_CHECK_FP_EXCEPT], + [AC_MSG_CHECKING(for type fp_except) + AC_CACHE_VAL(ac_cv_fp_except, +-[AC_TRY_RUN([#include <stdio.h> ++[AC_TRY_LINK([#include <stdio.h> + #include <sys/types.h> + #include <ieeefp.h> + main() +--- mysql-4.1.15/configure.in~autofoo ++++ mysql-4.1.15/configure.in +@@ -234,8 +234,6 @@ + else + AC_PATH_PROG(AS, as, as) + fi +-# Still need ranlib for readline; local static use only so no libtool. +-AC_PROG_RANLIB + # We use libtool + #AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +@@ -256,44 +254,7 @@ + AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) + AC_CHECK_PROG(DVIS, tex, manual.dvi) + +-AC_MSG_CHECKING("return type of sprintf") +- +-#check the return type of sprintf +-case $SYSTEM_TYPE in +- *netware*) +- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int") +- ;; +- *) +-AC_TRY_RUN([ +- int main() +- { +- char* s = "hello"; +- char buf[6]; +- if((int)sprintf(buf, s) == strlen(s)) +- return 0; +- +- return -1; +- } +- ], +- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) +- AC_MSG_RESULT("int")], +- [AC_TRY_RUN([ +- int main() +- { +- char* s = "hello"; +- char buf[6]; +- if((char*)sprintf(buf,s) == buf + strlen(s)) +- return 0; +- return -1; +- } ], +- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) +- AC_MSG_RESULT("ptr")], +- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) +- AC_MSG_RESULT("garbage")]) +- ]) +- ;; +-esac +- ++MYSQL_SPRINTF_RET + + # option, cache_name, variable, + # code to execute if yes, code to exectute if fail +@@ -870,42 +831,7 @@ + AC_SUBST(WRAPLIBS) + + if test "$TARGET_LINUX" = "true"; then +- AC_MSG_CHECKING([for atomic operations]) +- +- atom_ops= +- AC_TRY_RUN([ +-#include <asm/atomic.h> +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_add(5, &v); +- return atomic_read(&v) == 28 ? 0 : -1; +-} +- ], +- [AC_DEFINE([HAVE_ATOMIC_ADD], [1], +- [atomic_add() from <asm/atomic.h> (Linux only)]) +- atom_ops="${atom_ops}atomic_add "], +- ) +- AC_TRY_RUN([ +-#include <asm/atomic.h> +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_sub(5, &v); +- return atomic_read(&v) == 18 ? 0 : -1; +-} +- ], +- [AC_DEFINE([HAVE_ATOMIC_SUB], [1], +- [atomic_sub() from <asm/atomic.h> (Linux only)]) +- atom_ops="${atom_ops}atomic_sub "], +- ) +- +- if test -z "$atom_ops"; then atom_ops="no"; fi +- AC_MSG_RESULT($atom_ops) ++ MYSQL_FUNCS_ATOMIC + + AC_ARG_WITH(pstack, + [ --with-pstack Use the pstack backtrace library], +@@ -958,13 +884,13 @@ + # Later in this script LIBS will be augmented with a threads library. + NON_THREADED_LIBS="$LIBS" + +-AC_MSG_CHECKING([for int8]) ++AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [ + case $SYSTEM_TYPE in + *netware) +- AC_MSG_RESULT([no]) ++ mysql_cv_type_int8=no + ;; + *) +-AC_TRY_RUN([ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_STDLIB_H + #include <stdlib.h> + #endif +@@ -975,22 +901,21 @@ + + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> +-#endif +- ++#endif]], [ + int main() + { + int8 i; + return 0; +-} +-], +-[AC_DEFINE([HAVE_INT_8_16_32], [1], +- [whether int8, int16 and int32 types exist]) +-AC_MSG_RESULT([yes])], +-[AC_MSG_RESULT([no])] +-) ++}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no]) + ;; + esac + ++if test x"$mysql_cv_type_int8" = "xyes"; then ++ AC_DEFINE([HAVE_INT_8_16_32], [1], ++ [whether int8, int16 and int32 types exist]) ++fi ++]) ++ + # + # Some system specific hacks + # +@@ -1798,7 +1723,7 @@ + AC_MSG_ERROR("MySQL needs a long long type.") + fi + # off_t is not a builtin type +-MYSQL_CHECK_SIZEOF(off_t, 4) ++AC_CHECK_SIZEOF(off_t, 4) + if test "$ac_cv_sizeof_off_t" -eq 0 + then + AC_MSG_ERROR("MySQL needs a off_t type.") +--- mysql-4.1.15/innobase/configure.in~autofoo ++++ mysql-4.1.15/innobase/configure.in +@@ -3,6 +3,7 @@ + AC_CANONICAL_SYSTEM + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(ib_config.h) ++AC_CONFIG_AUX_DIR([..]) + AM_INIT_AUTOMAKE(ib, 0.90) + + # This is need before AC_PROG_CC +@@ -32,7 +33,6 @@ + CXXFLAGS="$CXXFLAGS " + + AC_PROG_CC +-AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_CHECK_HEADERS(aio.h sched.h) diff --git a/packages/mysql/files/gen_lex_hash.patch b/packages/mysql/files/gen_lex_hash.patch new file mode 100644 index 0000000000..c398d048dc --- /dev/null +++ b/packages/mysql/files/gen_lex_hash.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- mysql-4.1.15/sql/Makefile.am~gen_lexhash ++++ mysql-4.1.15/sql/Makefile.am +@@ -137,8 +137,10 @@ + @echo "If it fails, re-run configure with --with-low-memory" + $(CXXCOMPILE) $(LM_CFLAGS) -c $< + ++GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT) ++ + lex_hash.h: gen_lex_hash$(EXEEXT) +- ./gen_lex_hash$(EXEEXT) > $@ ++ $(GEN_LEX_HASH) > $@ + + # For testing of udf_example.so; Works on platforms with gcc + # (This is not part of our build process but only provided as an example) diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb new file mode 100644 index 0000000000..c871a8f9da --- /dev/null +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -0,0 +1,16 @@ +SECTION = "console/network" +include mysql_${PV}.bb +inherit native + +PACKAGES = "" +DEPENDS = "ncurses-native" +EXTRA_OEMAKE = "" +EXTRA_OECONF = " --with-embedded-server " + +do_stage() { + install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ +} + +do_install() { + : +} diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb new file mode 100644 index 0000000000..fe8c42dd88 --- /dev/null +++ b/packages/mysql/mysql_4.1.18.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "The MySQL Open Source Database System" +SECTION = "libs" +DEPENDS += "ncurses mysql-native" +LICENSE = "GPL" + +SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ + file://autofoo.patch;patch=1 \ + file://gen_lex_hash.patch;patch=1" + +S = "${WORKDIR}/mysql-${PV}" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +BINCONFIG_GLOB = "mysql_config" +inherit autotools binconfig + + +EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" +EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " + +do_stage() { + autotools_stage_includes + oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} + oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql +} + +pkg_postinst () { + grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql +} + +pkg_postrm () { + grep mysql /etc/passwd && deluser mysql +} + +PACKAGES =+ "libmysqlclient libmysqlclient-dev" + +FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*" +FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \ + ${bindir}/mysql_config" + diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index e4988c2be7..c228409fc3 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -8,7 +8,7 @@ PRIORITY = "optional" LICENSE = "ntp" PR = "r7" -SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \ +SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \ file://ipv6only-workaround.patch;patch=1 \ file://ntpd \ diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb index 815ed14d3b..0d0426790f 100644 --- a/packages/ppp-dialin/ppp-dialin_0.1.bb +++ b/packages/ppp-dialin/ppp-dialin_0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Enables PPP dial-in through a serial connection" MAINTAINER = "Rene Wagner <rw@handhelds.org>" DEPENDS = "ppp" RDEPENDS = "ppp" -PR = "r4" +PR = "r5" LICENSE = "MIT" SRC_URI = "file://host-peer \ @@ -22,7 +22,11 @@ pkg_postinst() { if test "x$D" != "x"; then exit 1 else - adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp + if grep -q '^ppp:' /etc/passwd; then + echo "ppp: login exists" + else + adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp + fi fi } diff --git a/packages/qemu/qemu-native_0.7.0.bb b/packages/qemu/qemu-native_0.7.0.bb index caa6f6abc0..9e58b5f176 100644 --- a/packages/qemu/qemu-native_0.7.0.bb +++ b/packages/qemu/qemu-native_0.7.0.bb @@ -3,3 +3,13 @@ inherit native S = "${WORKDIR}/qemu-${PV}" prefix = "${STAGING_DIR}/${BUILD_SYS}" +python __anonymous() { + from bb import which, data + + path = data.getVar('PATH', d) + if len(which(path, 'gcc-3.4')) != 0: + data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d) + elif len(which(path, 'gcc-3.3')) != 0: + data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d) + +} diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb index c1528165ce..8d83421dd6 100644 --- a/packages/qpe-games/hexatrolic_1.0beta3.bb +++ b/packages/qpe-games/hexatrolic_1.0beta3.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Hexatrolic a Ball Game" SECTION = "opie/games" PRIORITY = "optional" -MAINTAINER = "none" LICENSE = "GPL" AUTHOR = "Helge Plehn" HOMEPAGE = "http://hexatrolic.i-networx.de/" APPNAME = "hexatrolic" +PR = "r1" SRC_URI = "http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2" diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb index e7468b507b..40b2f73b80 100644 --- a/packages/qpe-games/labyrinth_0.7.bb +++ b/packages/qpe-games/labyrinth_0.7.bb @@ -1,11 +1,11 @@ DESCRIPTION = "A traditional (german?) boardgame" SECTION = "opie/games" PRIORITY = "optional" -MAINTAINER = "none" LICENSE = "GPL" AUTHOR = "Helge Plehn" HOMEPAGE = "http://hexatrolic.i-networx.de/" APPNAME = "labyrinth" +PR = "r1" SRC_URI = "http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz" diff --git a/packages/strace/strace-4.5.12/strace-fix-arm-bad-syscall.patch b/packages/strace/strace-4.5.12/strace-fix-arm-bad-syscall.patch new file mode 100644 index 0000000000..d7d7426b74 --- /dev/null +++ b/packages/strace/strace-4.5.12/strace-fix-arm-bad-syscall.patch @@ -0,0 +1,18 @@ +--- strace-4.5.12-orig/syscall.c 2005-06-08 21:45:28.000000000 +0100 ++++ strace-4.5.12/syscall.c 2005-10-25 19:26:39.000000000 +0100 +@@ -1013,6 +1013,15 @@ struct tcb *tcp; + /* + * Note: we only deal with only 32-bit CPUs here. + */ ++ ++ if (!(tcp->flags & TCB_INSYSCALL) && ++ (tcp->flags & TCB_WAITEXECVE)) { ++ /* caught a fake syscall from the execve's exit */ ++ tcp->flags &= ~TCB_WAITEXECVE; ++ return 0; ++ } ++ ++ + if (regs.ARM_cpsr & 0x20) { + /* + * Get the Thumb-mode system call number diff --git a/packages/strace/strace_4.5.12.bb b/packages/strace/strace_4.5.12.bb index 95a5b7fa9b..3a15563100 100644 --- a/packages/strace/strace_4.5.12.bb +++ b/packages/strace/strace_4.5.12.bb @@ -1,12 +1,13 @@ LICENSE = "GPL" SECTION = "console/utils" -PR = "r0" +PR = "r1" DESCRIPTION = "strace is a system call tracing tool." SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ file://arm-syscallent.patch;patch=1 \ - file://quota.patch;patch=1" + file://quota.patch;patch=1 \ + file://strace-fix-arm-bad-syscall.patch;patch=1" inherit autotools diff --git a/packages/totem/totem_1.0.4.bb b/packages/totem/totem_1.0.4.bb index 617b4aa9d0..0d86faf9c9 100644 --- a/packages/totem/totem_1.0.4.bb +++ b/packages/totem/totem_1.0.4.bb @@ -6,6 +6,7 @@ SECTION = "x11/multimedia" DESCRIPTION="A GTK2 based media player" HOMEPAGE="http://www.gnome.org/projects/totem/" LICENSE="GPL" +PR = "r1" SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/totem/1.0/totem-${PV}.tar.gz \ file://include.patch;patch=1 \ @@ -19,7 +20,7 @@ DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libxml2" inherit autotools -EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla" +EXTRA_OECONF="--disable-schemas-install --disable-nvtv --enable-gtk --disable-debug --disable-gstreamer --disable-mozilla --disable-lirc" #SELECTED_OPTIMIZATION="-O0 -g" LDFLAGS_append = " -Wl,--export-dynamic" diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh index 7fa6492ce0..90d911818b 100644 --- a/packages/tslib/tslib/h2200/tslib.sh +++ b/packages/tslib/tslib/h2200/tslib.sh @@ -15,5 +15,7 @@ case `uname -r` in ;; esac -export TSLIB_TSDEVICE TSLIB_CONFFILE +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} + +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh index b07fce0aea..a1f5205c47 100644 --- a/packages/tslib/tslib/h3600/tslib.sh +++ b/packages/tslib/tslib/h3600/tslib.sh @@ -11,5 +11,7 @@ case `uname -r` in ;; esac -export TSLIB_TSDEVICE TSLIB_CONFFILE +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} + +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh index 7fa6492ce0..90d911818b 100644 --- a/packages/tslib/tslib/h3900/tslib.sh +++ b/packages/tslib/tslib/h3900/tslib.sh @@ -15,5 +15,7 @@ case `uname -r` in ;; esac -export TSLIB_TSDEVICE TSLIB_CONFFILE +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} + +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh index 95e6a2d02b..8b45c66a1f 100644 --- a/packages/tslib/tslib/h6300/tslib.sh +++ b/packages/tslib/tslib/h6300/tslib.sh @@ -2,6 +2,7 @@ TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300 +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} -export TSLIB_TSDEVICE TSLIB_CONFFILE +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh index a3eb096a30..3fba531561 100644 --- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh @@ -2,5 +2,6 @@ TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 +QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE} -export TSLIB_TSDEVICE TSLIB_CONFFILE +export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 53b4a0217c..72fb979e5e 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r33" +PR = "r34" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -41,10 +41,7 @@ EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable- EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " do_stage () { - oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR} - ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so - install -m 0644 src/tslib.h ${STAGING_INCDIR}/ - install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/ + autotools_stage_all } do_install_prepend () { diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 6bafa615d7..1078cc416c 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -13,7 +13,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r3" +PR = "r4" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" @@ -31,6 +31,7 @@ do_install () { install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf if [ "${UDEV_DEVFS_RULES}" = "1" ]; then install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules fi diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb index 3a298621f4..1925392b80 100644 --- a/packages/xserver-common/xserver-common_1.8.bb +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -2,6 +2,8 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" +PR = "r1" + DEPENDS = "xmodmap xrandr xdpyinfo xtscal" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" @@ -9,4 +11,5 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" # we are using a gpe-style Makefile inherit gpe -SRC_URI += "file://100dpi.patch;patch=1" +SRC_URI += "file://100dpi.patch;patch=1 \ + file://hx4700.patch;patch=1" |