[oe-commits] org.oe.dev merge of '030e4469b1b9b06a2653e1b2c5a505fe0a234237'
Laibsch commit
openembedded-commits at lists.openembedded.org
Tue Jul 10 01:04:45 UTC 2007
merge of '030e4469b1b9b06a2653e1b2c5a505fe0a234237'
and '3ab017d5460e18f9bb41bc07ddc69e86c27508c6'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: de5be4f08169fd57f5838742274262b0e9ec89bb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=de5be4f08169fd57f5838742274262b0e9ec89bb
Files:
1
packages/angstrom/angstrom-e-image.bb
packages/nonworking/angstrom/angstrom-e-image.bb
packages/nonworking/angstrom
packages/angstrom/angstrom-altboot-console-image.bb
packages/angstrom/angstrom-altboot-x11-image.bb
conf/machine/palmz72.conf
packages/libxosd/libxosd_svn.bb
packages/linux/linux-hackndev-2.6/palmz72/defconfig
packages/linux/linux-hackndev-2.6_svn.bb
packages/wireshark/wireshark_0.99.4.bb
packages/poboxserver/poboxserver_1.2.5.bb
Diffs:
#
# mt diff -r030e4469b1b9b06a2653e1b2c5a505fe0a234237 -rde5be4f08169fd57f5838742274262b0e9ec89bb
#
#
#
# rename "packages/angstrom/angstrom-e-image.bb"
# to "packages/nonworking/angstrom/angstrom-e-image.bb"
#
# add_dir "packages/nonworking/angstrom"
#
# add_file "packages/angstrom/angstrom-altboot-console-image.bb"
# content [de6ac85e788fa4616bcbde136db84b234d4155ae]
#
# add_file "packages/angstrom/angstrom-altboot-x11-image.bb"
# content [ea7b085e86a1cb22cef8f539203dfe9a98801b49]
#
# patch "conf/machine/palmz72.conf"
# from [27d88e5c63b991f8a04382c4da88440d8fa81a75]
# to [2643dcd48c5ef8d7db0dafebc412aac90abf7a6a]
#
# patch "packages/libxosd/libxosd_svn.bb"
# from [a4c0d1f79f10ad941aad14baa96a24ce4a54f563]
# to [efced9d9b09324606848358429b95165f7e5ec2b]
#
# patch "packages/linux/linux-hackndev-2.6/palmz72/defconfig"
# from [f84d05974a87f4d8290649f317846da27ae3a0d8]
# to [af20c920243feef216e18bbbcae35201646910b8]
#
# patch "packages/linux/linux-hackndev-2.6_svn.bb"
# from [98b0ad7705650196802daa4da3d54d58720ba83a]
# to [26f695138f79aa36b6295fed70133ebbe8bb094d]
#
# patch "packages/wireshark/wireshark_0.99.4.bb"
# from [02f89efe06384258d416aba0b238a6b1beb8c0e7]
# to [c61cc43651576c8d1d171c6b992819ce562e5639]
#
============================================================
--- packages/angstrom/angstrom-altboot-console-image.bb de6ac85e788fa4616bcbde136db84b234d4155ae
+++ packages/angstrom/angstrom-altboot-console-image.bb de6ac85e788fa4616bcbde136db84b234d4155ae
@@ -0,0 +1,6 @@
+require angstrom-console-image.bb
+
+ANGSTROM_EXTRA_INSTALL += " altboot "
+
+export IMAGE_BASENAME = "altboot-console-image"
+
============================================================
--- packages/angstrom/angstrom-altboot-x11-image.bb ea7b085e86a1cb22cef8f539203dfe9a98801b49
+++ packages/angstrom/angstrom-altboot-x11-image.bb ea7b085e86a1cb22cef8f539203dfe9a98801b49
@@ -0,0 +1,4 @@
+require angstrom-x11-image.bb
+
+ANGSTROM_EXTRA_INSTALL += " altboot "
+export IMAGE_BASENAME = "altboot-x11-image"
============================================================
--- conf/machine/palmz72.conf 27d88e5c63b991f8a04382c4da88440d8fa81a75
+++ conf/machine/palmz72.conf 2643dcd48c5ef8d7db0dafebc412aac90abf7a6a
@@ -21,5 +21,15 @@ require conf/machine/include/tune-thumb.
require conf/machine/include/tune-xscale.conf
require conf/machine/include/tune-thumb.conf
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-i2c-pxa \
+ kernel-module-i2c-core \
+ kernel-module-i2c-algo-pxa \
+ kernel-module-i2c-dev \
+ kernel-module-palmz72-battery"
+
module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+module_autoload_g_ether = "g_ether"
+
-module_autoload_palmz72-battery = "palmz72-battery"
============================================================
--- packages/libxosd/libxosd_svn.bb a4c0d1f79f10ad941aad14baa96a24ce4a54f563
+++ packages/libxosd/libxosd_svn.bb efced9d9b09324606848358429b95165f7e5ec2b
@@ -1,13 +1,14 @@ PV = "2.2.15+svn${SRCDATE}"
DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
SECTION = "libs/x11"
DEPENDS = "virtual/libx11 libxext"
LICENSE = "LGPL"
PV = "2.2.15+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
file://autofoo.patch;patch=1 \
file://use-sane-default-font.patch;patch=1"
+
S = "${WORKDIR}/current"
inherit autotools binconfig
@@ -16,5 +17,8 @@ do_stage() {
autotools_stage_all
}
+PACKAGES =+ "${PN}-examples-dbg ${PN}-examples"
+FILES_${PN}-examples = "${bindir}/osd_cat"
+FILES_${PN}-examples-dbg = "${bindir}/.debug/"
+FILES_${PN}-dev += "${bindir}/xosd-config"
+FILES_${PN} = "${libdir}/libxosd.so.*"
-PACKAGES =+ "${PN}-dbg ${PN}-examples"
-FILES_${PN}-examples = "${bindir}"
============================================================
--- packages/linux/linux-hackndev-2.6/palmz72/defconfig f84d05974a87f4d8290649f317846da27ae3a0d8
+++ packages/linux/linux-hackndev-2.6/palmz72/defconfig af20c920243feef216e18bbbcae35201646910b8
@@ -1,15 +1,27 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-hnd0
-# Sat Feb 3 23:56:17 2007
+# Linux kernel version: 2.6.21-hnd2
+# Sun Jul 1 04:44:00 2007
#
CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
@@ -26,18 +38,24 @@ CONFIG_SYSVIPC=y
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
# CONFIG_IKCONFIG is not set
-# CONFIG_MINIMAL_OOPS is not set
+CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
@@ -48,9 +66,9 @@ CONFIG_SHMEM=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
-CONFIG_USELIB=y
-# CONFIG_CORE_DUMP is not set
CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
@@ -68,7 +86,10 @@ CONFIG_KMOD=y
#
# Block layer
#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
#
# IO Schedulers
@@ -86,18 +107,29 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
#
# System Type
#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS7500 is not set
# 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_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX 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_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
@@ -105,12 +137,8 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
@@ -119,12 +147,14 @@ CONFIG_ARCH_PXA=y
# CONFIG_MACH_LOGICPD_PXA270 is not set
# CONFIG_MACH_MAINSTONE is not set
# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
# CONFIG_ARCH_ESERIES is not set
# CONFIG_MACH_A620 is not set
# CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
# CONFIG_ARCH_H1900 is not set
# CONFIG_ARCH_H2200 is not set
-# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H3900 is not set
# CONFIG_MACH_H4000 is not set
# CONFIG_MACH_H4700 is not set
# CONFIG_MACH_HX2750 is not set
@@ -136,8 +166,11 @@ CONFIG_ARCH_PXA=y
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
# CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_X50 is not set
# CONFIG_ARCH_ROVERP1 is not set
# CONFIG_ARCH_ROVERP5P is not set
# CONFIG_MACH_XSCALE_PALMLD is not set
@@ -151,16 +184,15 @@ CONFIG_PALMZ72_BATTERY=m
CONFIG_MACH_PALMZ72=y
CONFIG_PALMZ72_PM=y
CONFIG_PALMZ72_BATTERY=m
-CONFIG_GPIOED=m
-CONFIG_GPIOEDNG=m
# CONFIG_MACH_OMAP_PALMTC is not set
# CONFIG_MACH_ZIRE31 is not set
+CONFIG_GPIOED=m
+CONFIG_GPIOEDNG=m
+# CONFIG_MACH_GHI270HG is not set
+# CONFIG_MACH_GHI270 is not set
# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
-CONFIG_PXA_RTC_EPOCH=1970
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
#
# Linux As Bootloader
@@ -176,29 +208,20 @@ CONFIG_CPU_TLB_V4WBI=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
#
# Processor Features
#
CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+CONFIG_IWMMXT=y
# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
#
-# Compaq/iPAQ Platforms
-#
-
-#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-# CONFIG_IPAQ_HAMCOP is not set
-
-#
# Bus support
#
@@ -222,6 +245,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
@@ -231,6 +256,8 @@ CONFIG_CMDLINE="mem=32M"
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="mem=32M"
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -260,8 +287,10 @@ CONFIG_PM_LEGACY=y
#
CONFIG_PM=y
CONFIG_PM_LEGACY=y
-CONFIG_PM_DEBUG=y
-CONFIG_APM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_DPM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
#
# Networking
@@ -272,8 +301,13 @@ CONFIG_NET=y
# Networking options
#
# CONFIG_NETDEBUG is not set
-# CONFIG_PACKET is not set
+CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -289,13 +323,19 @@ CONFIG_IP_FIB_HASH=y
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
# CONFIG_NETFILTER is not set
#
@@ -321,7 +361,6 @@ CONFIG_TCP_CONG_BIC=y
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
@@ -335,14 +374,14 @@ CONFIG_TCP_CONG_BIC=y
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-CONFIG_IRDA=m
+CONFIG_IRDA=y
#
# IrDA protocols
#
-# CONFIG_IRLAN is not set
-# CONFIG_IRNET is not set
-# CONFIG_IRCOMM is not set
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=y
# CONFIG_IRDA_ULTRA is not set
#
@@ -369,27 +408,35 @@ CONFIG_IRTTY_SIR=m
#
# Old SIR device drivers
#
-# CONFIG_IRPORT_SIR is not set
+CONFIG_IRPORT_SIR=m
#
# Old Serial dongle support
#
+# CONFIG_DONGLE_OLD is not set
#
# FIR device drivers
#
-CONFIG_PXA_FICP=m
-CONFIG_BT=m
-# CONFIG_BT_L2CAP is not set
-# CONFIG_BT_SCO is not set
+CONFIG_PXA_FICP=y
+CONFIG_BT=y
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
CONFIG_BT_HCIUART=m
-# CONFIG_BT_HCIUART_H4 is not set
-# CONFIG_BT_HCIUART_BCSP is not set
-# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_BCM2035UART=m
+CONFIG_BT_HCIVHCI=m
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_IEEE80211_CRYPT_WEP=m
@@ -407,7 +454,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
#
# Connector - unified userspace <-> kernelspace linker
@@ -427,6 +475,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -438,7 +487,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -452,8 +501,14 @@ CONFIG_BLK_DEV_INITRD=y
#
# CONFIG_RAID_ATTRS is not set
# CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
@@ -492,6 +547,7 @@ CONFIG_MII=y
CONFIG_MII=y
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
#
# Ethernet (1000 Mbit)
@@ -516,15 +572,16 @@ CONFIG_PPP=y
# CONFIG_WAN is not set
CONFIG_PPP=y
# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PPPOE is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
+CONFIG_SLHC=y
+CONFIG_SHAPER=m
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -538,6 +595,7 @@ CONFIG_INPUT=y
# Input device support
#
CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
#
# Userland interfaces
@@ -549,6 +607,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_TSDEV_SCREEN_Y=480
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_LED_TRIGGER is not set
#
# Input Device Drivers
@@ -560,9 +619,12 @@ CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_PXA27x=y
# CONFIG_KEYBOARD_PALMIR is not set
CONFIG_KEYBOARD_PALMWK=m
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -571,6 +633,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_ELO is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
CONFIG_TOUCHSCREEN_WM97XX=y
# CONFIG_TOUCHSCREEN_WM9705 is not set
CONFIG_TOUCHSCREEN_WM9712=y
@@ -593,6 +660,7 @@ CONFIG_HW_CONSOLE=y
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -606,51 +674,78 @@ CONFIG_SERIAL_PXA_COUNT=4
CONFIG_SERIAL_PXA=y
CONFIG_SERIAL_PXA_CONSOLE=y
CONFIG_SERIAL_PXA_COUNT=4
+# CONFIG_SERIAL_PXA_IR is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
#
-# I2C support
+# IPMI
#
-# CONFIG_I2C is not set
+# CONFIG_IPMI_HANDLER is not %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r3ab017d5460e18f9bb41bc07ddc69e86c27508c6 -rde5be4f08169fd57f5838742274262b0e9ec89bb
#
#
#
# patch "packages/poboxserver/poboxserver_1.2.5.bb"
# from [6aecbf942a671f4e3d1798c31b9d01f26aad7afb]
# to [91abd57c95126fef5d6d73ca4ea32be437aef178]
#
============================================================
--- packages/poboxserver/poboxserver_1.2.5.bb 6aecbf942a671f4e3d1798c31b9d01f26aad7afb
+++ packages/poboxserver/poboxserver_1.2.5.bb 91abd57c95126fef5d6d73ca4ea32be437aef178
@@ -1,8 +1,8 @@ DEPENDS = "perl-native ruby-native nkf-n
DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Operation Based On eXample'"
SECTION = "inputmethods"
LICENSE = "GPL"
DEPENDS = "perl-native ruby-native nkf-native"
-PR = "r5"
+PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
@@ -10,12 +10,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei
file://remove-local-includes.patch;patch=1 \
file://unicode.patch;patch=1 \
file://pbserver.sh"
+
S = "${WORKDIR}/OpenPOBox"
inherit autotools update-rc.d
-FILES_${PN} = "${palmtopdir}/pobox/* ${sysconfdir}/init.d/pbserver"
-
INITSCRIPT_NAME = "pbserver"
INITSCRIPT_PARAMS = "start 99 5 . stop 01 0 ."
@@ -38,3 +37,6 @@ do_install() {
install -m 0755 ${WORKDIR}/pbserver.sh ${D}${sysconfdir}/init.d/pbserver
sed -i -e 's, at palmtopdir@,${palmtopdir},g' ${D}${sysconfdir}/init.d/pbserver
}
+
+FILES_${PN}-dbg += "${palmtopdir}/pobox/.debug"
+FILES_${PN} += "${palmtopdir}/pobox/* ${sysconfdir}/init.d/pbserver"
More information about the Openembedded-commits
mailing list