diff options
41 files changed, 526 insertions, 389 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 504707e37b..624722bf24 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -730,7 +730,7 @@ def base_after_parse(d): local = bb.data.expand(bb.fetch.localpath(s, d), d) for mp in paths: if local.startswith(mp): - #bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch)) + bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch)) bb.data.setVar('PACKAGE_ARCH', mach_arch, d) return diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b1855b0ea7..0669b09f1f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -73,6 +73,7 @@ FEED_URIS += " \ PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" +PREFERRED_VERSION_linux-handhelds-2.6_magician = "2.6.19-hh7+cvs${SRCDATE}" SRCDATE_gconf-dbus = "20060719" @@ -107,7 +108,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_gtk+ = "2.10.6" +PREFERRED_VERSION_gtk+ = "2.10.7" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" @@ -185,7 +186,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.71" +PREFERRED_VERSION_dbus-glib ?= "0.72" PREFERRED_VERSION_gstreamer ?= "0.10.11" @@ -213,7 +214,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5" # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace devmem2 procps",d)}' #this should go away soon EXTRA_STUFF ?= "" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index bf00aa8d01..1f38c9f767 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_gconf="gconf-dbus" PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" -PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" +#PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" # - the GPE roadmap doesn't state any versions for 2.8 yet # http://www.handhelds.org/moin/moin.cgi/GPERoadmap diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index f73fa22e34..47df4867c9 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -45,7 +45,7 @@ SRCDATE_libmimedir ?= "20060804" SRCDATE_gpesyncd ?= "20061128" # GNOME -SRCDATE_gconf-dbus ?= "20060719" +SRCDATE_gconf-dbus ?= "20060723" SRCDATE_gnome-vfs-dbus ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf index 8376faca74..5394ae5bdf 100644 --- a/conf/machine/include/tune-iwmmxt.conf +++ b/conf/machine/include/tune-iwmmxt.conf @@ -4,3 +4,6 @@ TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH = "iwmmxt" PACKAGE_EXTRA_ARCHS += "iwmmxt" +# HACK: don't build iwmmxt glibc because qemu doesn't support it +TARGET_CC_ARCH_pn-glibc = "-march=armv5te -mtune=xscale" +PACKAGE_ARCH_pn-glibc = "armv5te" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 4e6c9a625a..3edf53ca6b 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -34,6 +34,16 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-pxaficp-ir \ kernel-module-uinput \ kernel-module-hci-usb \ + kernel-module-magician-flash \ + kernel-module-magician-ds1wm \ + kernel-module-magician-battery \ + kernel-module-magician-phone \ + kernel-module-snd-soc-magician \ + mplayer \ + gpe-scap \ + alsa-utils-alsamixer \ + alsa-utils-aplay \ + minicom \ " # @@ -44,6 +54,11 @@ module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_magician_ds1wm = "magician_ds1wm" +module_autoload_magician-battery = "magician-battery" +module_autoload_magician_phone = "magician_phone" +module_autoload_snd-soc-magician = "snd-soc-magician" +module_autoload_hci_usb = "hci_usb" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index c7ac97d2e5..36c2aefab8 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -10,10 +10,10 @@ PACKAGES = "\ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ angstrom-gpe-task-apps \ - angstrom-gpe-task-games \ - angstrom-task-office \ - angstrom-task-printing \ - angstrom-task-sectest" + angstrom-gpe-task-games" +# angstrom-task-office \ +# angstrom-task-printing \ +# angstrom-task-sectest" RDEPENDS_angstrom-x11-base-depends := "\ virtual/libx11 \ diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab index 3dfde917e6..087b469bdb 100644 --- a/packages/base-files/base-files/hx4700/fstab +++ b/packages/base-files/base-files/hx4700/fstab @@ -1,9 +1,15 @@ -/dev/mtdblock2 / jffs2 defaults 1 1 -/dev/mtdblock3 /home jffs2 defaults 1 1 +# HP iPAQ hx4700 fstab - for rootfs on flash partition 2 -proc /proc proc defaults 0 0 -sys /sys sysfs defaults 0 0 +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 +sys /sys sysfs defaults 0 0 +#/dev/mtdblock2 / jffs2 defaults 1 1 +#/dev/mtdblock3 /home jffs2 defaults 1 1 -/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 +# SD/MMC slot and CF slot +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto,noatime 0 0 +/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0 diff --git a/packages/base-files/base-files/magician/.mtn2git_empty b/packages/base-files/base-files/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/magician/.mtn2git_empty diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb index 40aabaab50..49e6ded250 100644 --- a/packages/bluez/bluez-utils_3.1.bb +++ b/packages/bluez/bluez-utils_3.1.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." SECTION = "console" PRIORITY = "optional" DEPENDS = "bluez-libs-${PV} dbus" +PROVIDES = "bluez-utils-dbus" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" RREPLACES = "bluez-utils-dbus" -RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" PR = "r1" diff --git a/packages/gaim/gaim_svn.bb b/packages/gaim/gaim_svn.bb index 8ef83c4b50..4533d8a07c 100644 --- a/packages/gaim/gaim_svn.bb +++ b/packages/gaim/gaim_svn.bb @@ -1,6 +1,6 @@ PR = "r0" #Remove the dash below when 2.0 changes in PV -DEFAULT_PREFERENCE = "-100000" +#DEFAULT_PREFERENCE = "-100000" PV = "1.9+2.0beta3cvs-${SRCDATE}" SRC_URI = "svn://svn.sourceforge.net/svnroot/gaim;module=trunk;proto=https \ diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb index c4b2ae7c2c..21bfc1a86d 100644 --- a/packages/gpe-nmf/gpe-nmf_0.22.bb +++ b/packages/gpe-nmf/gpe-nmf_0.22.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" inherit gpe pkgconfig DESCRIPTION = "GPE audio player" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good" RDEPENDS = "esd \ gst-plugins \ gst-plugin-audio \ diff --git a/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch b/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch new file mode 100644 index 0000000000..4bc164b646 --- /dev/null +++ b/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch @@ -0,0 +1,11 @@ +--- gpe-session-scripts-0.67/gpe-auto-bluetooth.sh.orig 2006-08-31 10:12:25.000000000 +0200 ++++ gpe-session-scripts-0.67/gpe-auto-bluetooth.sh 2006-08-31 10:14:27.000000000 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + + # start gpe-bluetooth if hardware is built in +-if [ -f /etc/sysconfig/bluetooth ]; then ++if [ -f /etc/sysconfig/bluetooth -a -x /usr/bin/gpe-bluetooth ]; then + . /etc/sysconfig/bluetooth + if [ "$BLUETOOTH" = "yes" ]; then + exec gpe-bluetooth diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 2cf63737bd..ada40a899c 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -6,10 +6,11 @@ SECTION = "gpe" PRIORITY = "optional" RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" # more rdepends: keylaunch ipaq-sleep apmd blueprobe -DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" +DEPENDS = "matchbox-wm matchbox-panel xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" SRC_URI += "file://matchbox-session \ - file://disable-composite.xsettings" + file://disable-composite.xsettings \ + file://gpe-bluetooth-optional.patch;patch=1" PR = "r4" diff --git a/packages/libxslt/libxslt_1.1.15.bb b/packages/libxslt/libxslt_1.1.15.bb new file mode 100644 index 0000000000..a360578f93 --- /dev/null +++ b/packages/libxslt/libxslt_1.1.15.bb @@ -0,0 +1,45 @@ +PR = "r0" +DESCRIPTION = "GNOME XSLT library" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +DEPENDS = "libxml2" +LICENSE = "MIT" +PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dev += "${bindir}/xslt-config" +FILES_${PN}-utils += "${bindir}" + +SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz" +S = "${WORKDIR}/libxslt-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug" + +xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \ + keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \ + templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \ + xsltexports.h xsltutils.h" +exsltheaders = "exslt.h exsltconfig.h exsltexports.h" + +do_stage () { + oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR} + oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/libxslt + for i in ${xsltheaders}; do + install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i + done + mkdir -p ${STAGING_INCDIR}/libexslt + for i in ${exsltheaders}; do + install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i + done + + cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \ + -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \ + -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ + -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config + chmod a+rx ${STAGING_BINDIR}/xslt-config + install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig index 7fadc7ae3a..7d1a138c64 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig @@ -1,13 +1,15 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-hh5 -# Thu Aug 10 16:39:20 2006 +# Linux kernel version: 2.6.17-hh0 +# Tue Aug 29 11:45:12 2006 # CONFIG_ARM=y CONFIG_MMU=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 # # Code maturity level options @@ -31,6 +33,7 @@ CONFIG_SYSCTL=y CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -48,10 +51,6 @@ CONFIG_EPOLL=y CONFIG_SHMEM=y # CONFIG_USELIB is not set CONFIG_CORE_DUMP=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -64,7 +63,6 @@ CONFIG_OBSOLETE_INTERMODULE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -72,19 +70,20 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_BLK_DEV_IO_TRACE is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -# CONFIG_IOSCHED_CFQ is not set -CONFIG_DEFAULT_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_DEFAULT_IOSCHED="cfq" # # System Type @@ -93,11 +92,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_IOP3XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set @@ -117,6 +118,7 @@ CONFIG_ARCH_PXA=y # Intel PXA2xx Implementations # # CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set # CONFIG_ARCH_ESERIES is not set @@ -134,6 +136,7 @@ CONFIG_HX4700_BLUETOOTH=y CONFIG_HX4700_PCMCIA=y CONFIG_HX4700_LCD=y CONFIG_HX4700_LEDS=y +CONFIG_HX4700_VOLTAGE=m # CONFIG_MACH_HX2750 is not set # CONFIG_ARCH_H5400 is not set # CONFIG_MACH_HIMALAYA is not set @@ -224,6 +227,7 @@ CONFIG_PCMCIA_PXA2XX=y # CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set @@ -318,6 +322,7 @@ CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y @@ -330,14 +335,15 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration @@ -359,6 +365,7 @@ CONFIG_IP_NF_IRC=m # CONFIG_IP_NF_TFTP is not set # CONFIG_IP_NF_AMANDA is not set # CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_H323 is not set # CONFIG_IP_NF_QUEUE is not set # @@ -367,11 +374,6 @@ CONFIG_IP_NF_IRC=m # CONFIG_IP6_NF_QUEUE is not set # -# Bridge: Netfilter Configuration -# -# CONFIG_BRIDGE_NF_EBTABLES is not set - -# # DCCP Configuration (EXPERIMENTAL) # # CONFIG_IP_DCCP is not set @@ -386,7 +388,7 @@ CONFIG_IP_NF_IRC=m # # CONFIG_TIPC is not set # CONFIG_ATM is not set -CONFIG_BRIDGE=m +# CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set @@ -452,8 +454,6 @@ CONFIG_IRPORT_SIR=m # # FIR device drivers # -# CONFIG_USB_IRDA is not set -# CONFIG_SIGMATEL_FIR is not set # CONFIG_PXA_FICP is not set CONFIG_BT=y CONFIG_BT_L2CAP=m @@ -468,23 +468,21 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # -# CONFIG_BT_HCIUSB is not set CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIDTL1 is not set # CONFIG_BT_HCIBT3C is not set # CONFIG_BT_HCIBLUECARD is not set CONFIG_BT_HCIBTUART=m # CONFIG_BT_HCIVHCI is not set -CONFIG_IEEE80211=y +CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=y -CONFIG_IEEE80211_CRYPT_CCMP=y -CONFIG_IEEE80211_CRYPT_TKIP=y +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -572,7 +570,6 @@ CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLKMTD is not set # CONFIG_MTD_BLOCK2MTD is not set # @@ -608,28 +605,24 @@ CONFIG_MTD_CFI_UTIL=y CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=m +CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=m +CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -728,7 +721,6 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # # CONFIG_NET_ETHERNET is not set -CONFIG_MII=m # # Ethernet (1000 Mbit) @@ -746,6 +738,7 @@ CONFIG_MII=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set # # Obsolete Wireless cards support (pre-802.11) @@ -777,7 +770,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m CONFIG_ACX=y -# CONFIG_ACX_USB is not set CONFIG_ACX_MEM=y CONFIG_ACX_HX4700=m CONFIG_NET_WIRELESS=y @@ -925,9 +917,7 @@ CONFIG_I2C_PXA=m # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCA9535 is not set # CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set -# CONFIG_RTC_X1205_I2C is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -959,11 +949,6 @@ CONFIG_WATCHDOG=y # # CONFIG_SOFT_WATCHDOG is not set CONFIG_SA1100_WATCHDOG=m - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set # CONFIG_NVRAM is not set CONFIG_SA1100_RTC=y # CONFIG_DTLK is not set @@ -997,10 +982,18 @@ CONFIG_SA1100_RTC=y # Dallas's 1-wire bus # CONFIG_W1=y -# CONFIG_W1_DS9490 is not set -# CONFIG_W1_THERM is not set -# CONFIG_W1_SMEM is not set -# CONFIG_W1_DS2433 is not set + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_DS2482 is not set + +# +# 1-wire Slaves +# +# CONFIG_W1_SLAVE_THERM is not set +# CONFIG_W1_SLAVE_SMEM is not set +# CONFIG_W1_SLAVE_DS2433 is not set CONFIG_W1_DS2760=y # @@ -1065,30 +1058,53 @@ CONFIG_BATTERY_MONITOR=y # CONFIG_MCP is not set # -# Multimedia Capabilities Port drivers +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers # # # Multimedia devices # CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y # -# Video For Linux +# Video Capture Adapters # # -# Video Adapters +# Video Capture Adapters # # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_EM28XX is not set # CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_VIDEO_AUDIO_DECODER is not set -# CONFIG_VIDEO_DECODER is not set + +# +# Encoders and Decoders +# +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_CX25840 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set # # Radio Adapters @@ -1108,6 +1124,7 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set +# CONFIG_FB_FIRMWARE_EDID is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set @@ -1151,20 +1168,22 @@ CONFIG_LCD_DEVICE=y # # Sound # -CONFIG_SOUND=y +CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -CONFIG_SND=y +CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -1182,6 +1201,7 @@ CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_A716 is not set # CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set +# CONFIG_SND_H4000 is not set # CONFIG_SND_HTCMAGICIAN is not set CONFIG_SND_HX4700=m # CONFIG_SND_HTCUNIVERSAL is not set @@ -1190,13 +1210,10 @@ CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set # -# USB devices -# -# CONFIG_SND_USB_AUDIO is not set - -# # PCMCIA devices # +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set CONFIG_SND_AK4641=m # @@ -1209,158 +1226,14 @@ CONFIG_SND_AK4641=m # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -# CONFIG_USB_DEVICEFS is not set -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_BIG_ENDIAN is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m - -# -# USB Device Class drivers -# -# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set -# CONFIG_USB_ACM is not set -CONFIG_USB_PRINTER=m +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # # -# may also be needed; see USB_STORAGE Help for more information -# -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_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_MTOUCH is not set -# CONFIG_USB_ITMTOUCH is not set -# CONFIG_USB_EGALAX is not set -# CONFIG_USB_YEALINK is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set -# CONFIG_USB_APPLETOUCH is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB Multimedia devices -# -# CONFIG_USB_DABUSB is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_ET61X251 is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -CONFIG_USB_SN9C102=m -# CONFIG_USB_STV680 is not set -# CONFIG_USB_PWC is not set - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_GL620A is not set -CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -CONFIG_USB_NET_CDC_SUBSET=m -# CONFIG_USB_ALI_M5632 is not set -# CONFIG_USB_AN2720 is not set -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_ZD1201=m -CONFIG_USB_MON=y - -# -# USB port drivers -# - -# -# USB Serial Converter support -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_LD is not set - -# -# USB DSL modem support -# - -# # USB Gadget Support # CONFIG_USB_GADGET=m @@ -1375,6 +1248,7 @@ CONFIG_USB_PXA27X=m # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set @@ -1398,45 +1272,35 @@ CONFIG_MMC_BLOCK=y CONFIG_MMC_ASIC3=y # -# LED devices +# Real Time Clock # -CONFIG_CLASS_LEDS=y +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set # # File systems # -CONFIG_EXT2_FS=m +CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set +CONFIG_EXT3_FS_POSIX_ACL=y # CONFIG_EXT3_FS_SECURITY is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_PROC_INFO=y -CONFIG_REISERFS_FS_XATTR=y -# CONFIG_REISERFS_FS_POSIX_ACL is not set -# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -CONFIG_XFS_EXPORT=y -CONFIG_XFS_QUOTA=y -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y +# CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=m CONFIG_INOTIFY=y # CONFIG_QUOTA is not set -CONFIG_QUOTACTL=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -1445,10 +1309,7 @@ CONFIG_DNOTIFY=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=m +# CONFIG_ISO9660_FS is not set CONFIG_UDF_FS=m CONFIG_UDF_NLS=y @@ -1460,9 +1321,7 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -1472,7 +1331,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -CONFIG_RELAYFS_FS=m CONFIG_CONFIGFS_FS=m # @@ -1481,7 +1339,7 @@ CONFIG_CONFIGFS_FS=m # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set -CONFIG_HFSPLUS_FS=m +# CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set @@ -1507,38 +1365,14 @@ CONFIG_CRAMFS=m # # Network File Systems # -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp437" -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -CONFIG_9P_FS=m +# CONFIG_9P_FS is not set # # Partition Types @@ -1564,46 +1398,46 @@ CONFIG_MSDOS_PARTITION=y # # Native Language Support # -CONFIG_NLS=y +CONFIG_NLS=m CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_437=m +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set 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_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set 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_ASCII=m -CONFIG_NLS_ISO8859_1=y -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_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m # # Profiling support @@ -1630,6 +1464,7 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_USER is not set @@ -1660,15 +1495,15 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_TEST is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig index e34bdb7916..a9befbd3f4 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig @@ -1475,7 +1475,7 @@ CONFIG_RTC_LIB=y # # File systems # -CONFIG_EXT2_FS=m +CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index f6572cad55..112a49f206 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -764,7 +764,7 @@ CONFIG_I2C_CHARDEV=m # # I2C Hardware Bus support # -CONFIG_I2C_PXA=m +CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb new file mode 100644 index 0000000000..1100e52c46 --- /dev/null +++ b/packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL" +require module-init-tools_${PV}.bb +inherit cross +DEFAULT_PREFERENCE = "1" +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" + +EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" + +do_stage () { + oe_runmake install + mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.6 +} + +do_install () { + : +} diff --git a/packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb b/packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb new file mode 100644 index 0000000000..b155b4a740 --- /dev/null +++ b/packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +removing kernel modules for Linux (versions 2.5.48 and above). It serves \ +the same function that the modutils package serves for Linux 2.4." +LICENSE = "GPL" +SECTION = "base" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.3-pre1.tar.bz2 \ + file://ignore_arch_directory;patch=1 \ + file://modutils_extension;patch=1 \ + file://no_man_rebuild;patch=1 \ + file://manpagesopt;patch=1 " +S = "${WORKDIR}/module-init-tools-3.3-pre1" + +EXTRA_OECONF = "--disable-manpages" + +bindir = "/bin" +sbindir = "/sbin" + +inherit autotools + +do_install() { + autotools_do_install + for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do + mv ${D}/$f ${D}/$f.26 + done +} + +pkg_postinst_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do +bn=`basename $f` + update-alternatives --install /$f $bn /$f.26 60 +done +update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 +update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 +} + +pkg_prerm_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do +bn=`basename $f` + update-alternatives --remove $bn /$f.26 +done +update-alternatives --remove bin-lsmod /bin/lsmod.26 +update-alternatives --remove lsmod /bin/lsmod.26 +} + +pkg_postinst_module-init-tools-depmod() { +#!/bin/sh +update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 +} + +pkg_prerm_module-init-tools-depmod() { +#!/bin/sh +update-alternatives --remove depmod /sbin/depmod.26 +} diff --git a/packages/multimachine/.mtn2git_empty b/packages/multimachine/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/multimachine/.mtn2git_empty diff --git a/packages/netbase/netbase/hx4700/.mtn2git_empty b/packages/netbase/netbase/hx4700/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/hx4700/.mtn2git_empty diff --git a/packages/netbase/netbase/magician/.mtn2git_empty b/packages/netbase/netbase/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/magician/.mtn2git_empty diff --git a/packages/openswan/openswan-2.4.4/.mtn2git_empty b/packages/openswan/openswan-2.4.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openswan/openswan-2.4.4/.mtn2git_empty diff --git a/packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch b/packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch new file mode 100644 index 0000000000..e3cc8762cc --- /dev/null +++ b/packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch @@ -0,0 +1,26 @@ +--- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200 ++++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100 +@@ -30,10 +30,6 @@ + + CFLAGS+= ${WERROR} + +-ifneq ($(LD_LIBRARY_PATH),) +-LDFLAGS=-L$(LD_LIBRARY_PATH) +-endif +- + MANDIR8=$(MANTREE)/man8 + MANDIR5=$(MANTREE)/man5 + +--- openswan-2.2.0.orig/programs/pluto/Makefile 2005-01-03 20:40:45.000000000 +0100 ++++ openswan-2.2.0/programs/pluto/Makefile 2005-03-05 13:51:21.000000000 +0100 +@@ -234,10 +234,6 @@ + LIBSPLUTO+=${CURL_LIBS} + LIBSPLUTO+= -lgmp -lresolv # -lefence + +-ifneq ($(LD_LIBRARY_PATH),) +-LDFLAGS=-L$(LD_LIBRARY_PATH) +-endif +- + LIBSADNS = $(OPENSWANLIB) + LIBSADNS += -lresolv # -lefence + diff --git a/packages/openswan/openswan_2.4.4.bb b/packages/openswan/openswan_2.4.4.bb new file mode 100644 index 0000000000..ea4a0c2d66 --- /dev/null +++ b/packages/openswan/openswan_2.4.4.bb @@ -0,0 +1,33 @@ +SECTION = "console/network" +DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \ +Linux operating system." +HOMEPAGE = "http://www.openswan.org" +LICENSE = "GPLv2" +DEPENDS = "gmp flex-native" +RRECOMMENDS = "kernel-module-ipsec" +RDEPENDS_nylon = "perl" +PR = "r0" + +SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \ + file://ld-library-path-breakage.patch;patch=1" +S = "${WORKDIR}/openswan-${PV}" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "DESTDIR=${D} \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=${sysconfdir}/ipsec \ + INC_RCDEFAULT=${sysconfdir}/init.d \ + INC_USRLOCAL=${prefix} \ + INC_MANDIR=share/man WERROR=''" + +do_compile () { + oe_runmake programs +} + +do_install () { + oe_runmake install +} + +FILES_${PN} += "${libdir}/ipsec/" + +CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf" diff --git a/packages/poweroffkey/.mtn2git_empty b/packages/poweroffkey/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/poweroffkey/.mtn2git_empty diff --git a/packages/poweroffkey/poweroffkey_0.1.bb b/packages/poweroffkey/poweroffkey_0.1.bb new file mode 100644 index 0000000000..2bf39ebf99 --- /dev/null +++ b/packages/poweroffkey/poweroffkey_0.1.bb @@ -0,0 +1,9 @@ +LICENSE = "PD" +inherit gpe + +DESCRIPTION = "power off key hack" + +SECTION = "base" +PRIORITY = "optional" + +SRC_URI="file:///home/ph5/src/hx4700/${PN}-${PV}.tar.gz" diff --git a/packages/snes9x/snes9x/configure-sizeof-void-int.patch b/packages/snes9x/snes9x/configure-sizeof-void-int.patch new file mode 100644 index 0000000000..2659608633 --- /dev/null +++ b/packages/snes9x/snes9x/configure-sizeof-void-int.patch @@ -0,0 +1,23 @@ +--- snes9x-1.5-src/configure.in.orig 2006-08-04 16:27:35.693980458 +0200 ++++ snes9x-1.5-src/configure.in 2006-08-04 16:28:11.704193040 +0200 +@@ -655,20 +655,6 @@ + fi + ]) + +-AC_MSG_CHECKING(if sizeof(void *) == sizeof(int)) +-AC_TRY_RUN([ +- int main() +- { +- return(!(sizeof(void *) == sizeof(int))); +- } +-], snes9x_ptr_is_int=yes) +-if test x$snes9x_ptr_is_int = xyes; then +- AC_MSG_RESULT(yes) +-else +- AC_MSG_RESULT(no) +- SYSDEFINES="$SYSDEFINES -DPTR_NOT_INT" +-fi +- + AC_MY_CHECK_SAR(int8) + AC_MY_CHECK_SAR(int16) + AC_MY_CHECK_SAR(int32) diff --git a/packages/snes9x/snes9x/makefile-1.5.patch b/packages/snes9x/snes9x/makefile-1.5.patch new file mode 100644 index 0000000000..b4cc561516 --- /dev/null +++ b/packages/snes9x/snes9x/makefile-1.5.patch @@ -0,0 +1,39 @@ +--- snes9x-1.5-src/Makefile.in.orig 2006-08-04 16:50:34.310687060 +0200 ++++ snes9x-1.5-src/Makefile.in 2006-08-04 16:54:22.216690330 +0200 +@@ -187,7 +187,7 @@ + OPTIMISE=-O4 -ffreestanding -ffast-math -fschedule-insns2 -fomit-frame-pointer -fno-inline-functions -fno-defer-pop -fforce-addr -fstrict-aliasing -funroll-loops -fdelete-null-pointer-checks -fno-exceptions + CPUFLAGS=-ml -m4-single-only + else +-OPTIMISE = @OPTIMIZE@ ++OPTIMISE = $(filter-out @OPTIMIZE@,-pedantic) + endif + + DEFS += \ +@@ -207,7 +207,7 @@ + $(SDD1DEFINES) \ + $(CORRVRAMDEFINES) \ + $(JOYDEFINES) \ +--DNO_INLINE_SET_GET @SYSDEFINES@ ++-DNO_INLINE_SET_GET @SYSDEFINES@ $(OECFLAGS) + + CCFLAGS = $(OPTIMISE) $(CPUFLAGS) $(INCLUDES) $(DEFS) + +@@ -245,15 +245,15 @@ + OFFSET= + endif + +-offsets: offsets.o +- $(CCC) $(INCLUDES) -o $@ offsets.o ++offsets: offsets.cpp ++ $(BUILD_CXX) $(INCLUDES) -o $@ $< + ./offsets >$(CPU)/offsets.h + + #../zlib/libz.a: + # cd ../zlib && sh ./configure && make + + snes9x: $(OBJECTS) unix/x11.o $(AIDOOBJS) $(OFFSET) +- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm ++ $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(OELDFLAGS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm + + unix/svga_keynames.h: unix/svga_get_keynames.pl + unix/svga_get_keynames.pl /usr/include/vgakeyboard.h > unix/svga_keynames.h diff --git a/packages/snes9x/snes9x_1.5.bb b/packages/snes9x/snes9x_1.5.bb new file mode 100644 index 0000000000..6d6b7355c5 --- /dev/null +++ b/packages/snes9x/snes9x_1.5.bb @@ -0,0 +1,25 @@ +SECTION = "x11/games" +PR = "r3" +LICENSE = "snes9x" +DEPENDS = "virtual/libx11 zlib" +#DEPENDS = "libxxf86dga libxxf86vm" +DEPENDS_append_i686 = " nasm-native" +RDEPENDS_epia = "kernel-module-joydev" + +SRC_URI = "http://files.ipherswipsite.com/snes9x/snes9x-1.5-src.tar.bz2" +# file://makefile.patch;patch=1;pnum=2 \ +# file://private.patch;patch=1;pnum=0" + +S = "${WORKDIR}/snes9x-1.5-src" + +inherit autotools + +export OECFLAGS="${CFLAGS}" +export OELDFLAGS="${LDFLAGS}" + +EXTRA_OECONF = "--without-extensions" + +do_install() { + install -d ${D}${bindir} + install snes9x ${D}${bindir} +} diff --git a/packages/sysvinit/sysvinit/rcS b/packages/sysvinit/sysvinit/rcS index e7a7e617d0..d589b76cfd 100755 --- a/packages/sysvinit/sysvinit/rcS +++ b/packages/sysvinit/sysvinit/rcS @@ -60,7 +60,7 @@ do [ ! -f "$i" ] && continue # Handle verbosity - [ "$VERBOSE" = very ] && echo "INIT: Running $i..." + [ "$VERBOSE" = very ] && echo -n `date +%Y%m%d\ %H%M%S`" INIT: Running $i..." if [ "$PROGRESS" = yes ]; then export PROGRESS_value=`expr $PROGRESS_value + $PROGRESS_incstep` echo "$PROGRESS_value Starting $i..." >/proc/progress diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default index 82bf55970c..99076790b2 100644 --- a/packages/sysvinit/sysvinit/rcS-default +++ b/packages/sysvinit/sysvinit/rcS-default @@ -12,7 +12,7 @@ DELAYLOGIN=no # Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not. # UTC=yes # Set VERBOSE to "no" if you would like a more quiet bootup. -VERBOSE=no +VERBOSE=very # Set EDITMOTD to "no" if you don't want /etc/motd to be editted automatically EDITMOTD=no # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup. diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b4266a0940..256ebadf5f 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -169,20 +169,20 @@ task-base-alsa-rrecommends = "\ kernel-module-snd-pcm-oss" task-base-pcmcia-rdepends = "\ - ${PCMCIA_MANAGER} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}" + ${PCMCIA_MANAGER}" +# ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ +# ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \ +# ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \ +# ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \ +# ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}" task-base-pcmcia-rrecommends = "\ kernel-module-pcmcia \ kernel-module-airo-cs \ kernel-module-pcnet-cs \ kernel-module-serial-cs \ - kernel-module-ide-cs \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " + kernel-module-ide-cs" +# ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " task-base-pcmcia24-rrecommends = "\ ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \ @@ -265,8 +265,8 @@ task-distro-ipsec-rrecommends = "\ task-distro-wifi-rdepends = "\ wireless-tools \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ +# ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ +# ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ wpa-supplicant" task-distro-wifi-rrecommends = "\ diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index b59b3ceea3..1ca5f03a63 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -11,10 +11,7 @@ PACKAGES = "\ gpe-task-apps \ gpe-task-games \ gpe-task-connectivity \ - gpe-task-apps-extra \ - gpe-task-web \ - gpe-task-desktopapps \ - gpe-task-sectest" + gpe-task-apps-extra" RDEPENDS_gpe-base-depends := "\ diet-x11 \ @@ -22,7 +19,7 @@ RDEPENDS_gpe-base-depends := "\ RDEPENDS_gpe-task-base := "\ gpe-bootsplash \ - bluez-utils-dbus \ + bluez-utils \ matchbox \ xcursor-transparent-theme \ rxvt-unicode \ @@ -101,38 +98,12 @@ RDEPENDS_gpe-task-games := "\ RDEPENDS_gpe-task-connectivity := "\ gpe-mini-browser" -# gaim +# gaim" # linphone-hh RDEPENDS_gpe-task-apps-extra := "\ gpe-filemanager \ +# gpe-nmf \ gpe-soundbite \ mbmerlin" - -RDEPENDS_gpe-task-web := "\ - gpe-irc \ - minimo \ - gaim" - -RDEPENDS_gpe-task-desktopapps := "\ - firefox \ - thunderbird \ - galculator \ - gnumeric \ - gpdf \ - totem" - -RDEPENDS_gpe-task-sectest := "\ - mbmerlin \ - nmap \ - ettercap \ - stunnel \ - curl \ - dsniff \ - prismstumbler \ - tcpdump \ - kismet \ - hydra \ - thcrut \ - miniclipboard" # driftnet \ diff --git a/packages/udev/files/mount.sh b/packages/udev/files/mount.sh index be8b3dfca9..2220c020c8 100644 --- a/packages/udev/files/mount.sh +++ b/packages/udev/files/mount.sh @@ -10,16 +10,23 @@ PMOUNT="/usr/bin/pmount" UMOUNT="/bin/umount" name="`basename "$DEVNAME"`" -for line in `cat /etc/udev/mount.blacklist | grep -v ^#` -do - if ( echo "$DEVNAME" | grep -q "$line" ) +cat /etc/udev/mount.whitelist | sed -n 's/^#.*/;/[^[:space:]]/p' > /tmp/mount.whitelist +if ( echo "$DEVNAME" | grep -q -f /tmp/mount.whitelist ) +then + logger "udev/mount.sh" "[$DEVNAME] is not whitelisted, ignoring" + exit 0 +fi +rm /tmp/mount.whitelist + +automount() { + # don't mount a block device if it contains partitions + if ( echo "$DEVNAME" | grep -q "[0-9]$" ) then - logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" - exit 0 + ls "$DEVNAME"p[1-9] > /dev/null 2>&1 && return + else + ls "$DEVNAME"[1-9] > /dev/null 2>&1 && return fi -done -automount() { ! test -d "/media/$name" && mkdir -p "/media/$name" if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name" diff --git a/packages/udev/files/mount.whitelist b/packages/udev/files/mount.whitelist new file mode 100644 index 0000000000..b078373b1d --- /dev/null +++ b/packages/udev/files/mount.whitelist @@ -0,0 +1,4 @@ +# This is a grep pattern matched against the device name +# Only matched patterns will be mounted / removed by udevd +/dev/mmcblk[01] +/dev/hd[ab] diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index 288157ef3f..7c3058ee06 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -1,4 +1,3 @@ -DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_slugos = "1" DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index a5ff009669..6d16c2af45 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -11,7 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.b file://make_include \ file://swapargs.h \ file://fdiskbsdlabel_thumb.diff;patch=1 \ - file://umount.diff;patch=1 \ + file://glibc-umount2.patch;patch=1 \ +# file://umount.diff;patch=1 \ file://defines.h" PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile " diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 64a49aed68..a96d20b9c8 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -43,6 +43,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta file://enable-epson.patch;patch=1 \ file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://w100.patch;patch=1 \ + file://w100-use-evdev.patch;patch=1 \ file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 0fc9ec1997..2c641e917f 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -34,7 +34,7 @@ RDEPENDS_xserver-kdrive-epson = "${PN}" RDEPENDS_xserver-kdrive-sdl = "${PN}" RDEPENDS_xserver-kdrive-w100 = "${PN}" -SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ +SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;tag=input-hotplug;protocol=git \ file://kmode.patch;patch=1 \ file://disable-apm.patch;patch=1 \ file://no-serial-probing.patch;patch=1 \ |