[oe-commits] org.oe.dev merge of '048900e1dc1296a50f90bf6b77b7be816922e4ac'
mickeyl commit
oe at amethyst.openembedded.net
Fri Mar 21 23:59:56 UTC 2008
merge of '048900e1dc1296a50f90bf6b77b7be816922e4ac'
and '8f046513c054e5ae4400145d7f5e0288953f7fab'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 90f7040fd7d6c4f3a3587d7fa7e1445858add5ae
ViewMTN: http://monotone.openembedded.org/revision/info/90f7040fd7d6c4f3a3587d7fa7e1445858add5ae
Files:
1
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/pango/files/pkgconfig_fixes.patch
packages/linux/linux-omap1-2.6.24-omap1
packages/openmoko-projects/illume
packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch
packages/linux/linux-omap1-2.6.24-omap1/defconfig
packages/linux/linux-omap1_2.6.24-omap1.bb
packages/openmoko-projects/illume/illume-fix-includes.patch
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/unslung.conf
conf/machine/omap5912osk.conf
packages/glib-2.0/glib-2.0_2.16.1.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/gtk+/gtk+_2.12.3.bb
packages/images/initramfs-bootmenu-image.bb
packages/images/initramfs-image.bb
packages/images/liveramdisk-image.bb
packages/linux/linux-openmoko_2.6.24.bb
packages/linux/linux_2.6.24.bb
packages/openmoko-projects/illume_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/pango/pango_1.8.2.bb
packages/twisted/twisted-2.5.0
packages/python/python-twisted-2.5.0
packages/twisted/twisted_2.5.0.bb
packages/python/python-twisted_2.5.0.bb
packages/tasks/task-python-everything.bb
Diffs:
#
# mt diff -r048900e1dc1296a50f90bf6b77b7be816922e4ac -r90f7040fd7d6c4f3a3587d7fa7e1445858add5ae
#
#
#
# rename "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
# to "packages/pango/files/pkgconfig_fixes.patch"
#
# add_dir "packages/linux/linux-omap1-2.6.24-omap1"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_file "packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch"
# content [d73ea33ce170fe68af071185f13fa2c5b6c19775]
#
# add_file "packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch"
# content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
#
# add_file "packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch"
# content [450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1]
#
# add_file "packages/linux/linux-omap1-2.6.24-omap1/defconfig"
# content [9f1536c5f2c793aa250eaf70e845ce53baae9521]
#
# add_file "packages/linux/linux-omap1_2.6.24-omap1.bb"
# content [4a6c582a9685167ac03820d31261bc5c2ed4d475]
#
# add_file "packages/openmoko-projects/illume/illume-fix-includes.patch"
# content [9c77a2deb5117d5264a62d14acac593527d9ec08]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [a93dbc58945bc2a58e31dc23c8a49662edf1ff28]
# to [d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [55633da67c926669fe7beb444ae99d39d9af5462]
# to [0269a178e7edbe8ac9c17cef3cc5878aa563ee30]
#
# patch "conf/distro/unslung.conf"
# from [6e8466f25497e8fbd8b7999239627f13a4cebdc8]
# to [0ef6d906a67568b77e1f68fc1ac5c65f65586c67]
#
# patch "conf/machine/omap5912osk.conf"
# from [0e95b09a1be375036ac3d8c2bde78501405ef4e3]
# to [550c9fd932094e999a41c4ac6321b068c9efec66]
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
# from [4630fa709394cd8074197afb37aaa2348f462950]
# to [d529224930628fa212035aa5d6d59d7868e6caf4]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [d45c132200ab0a148cc9c2d04e54ecf0bcf67549]
# to [781f9c4e4e641f3aa5c5c9123a630e74511798fb]
#
# patch "packages/gtk+/gtk+.inc"
# from [1aaf588548db151300913d0a15d5cc12dc7cdaa8]
# to [8aedbf6c56434aa2961e5238b7863e3537faba35]
#
# patch "packages/gtk+/gtk+_2.12.0.bb"
# from [08e63663afbf9b3a26edfaf43148e2e60683e7df]
# to [b7951643e667231ff2d092dd865e23dde9666222]
#
# patch "packages/gtk+/gtk+_2.12.3.bb"
# from [7160ff887391b65883e37a5a1fbb1007a4356f49]
# to [0d9c399ba649e1291ca7948faac117dd90dce289]
#
# patch "packages/images/initramfs-bootmenu-image.bb"
# from [4053cc6f61cb414749eb9f5ec9f956af0718fd07]
# to [f8400686cddb5a75ee1d9aa3f473e7514f446f1f]
#
# patch "packages/images/initramfs-image.bb"
# from [0d884f4dd165ce4f703bdf6ab9d55cfe5f3c3884]
# to [5cf6f99ba7c34affa0d7da7631722af0da160fbb]
#
# patch "packages/images/liveramdisk-image.bb"
# from [59cccb6f1f56e0a299ad91bc6e49592212af441d]
# to [cf54e8cb296c994ab8ddc47298cc1e8be49ff120]
#
# patch "packages/linux/linux-openmoko_2.6.24.bb"
# from [0f56c43fad11545eef657d0595fe6049fec5a575]
# to [519951860626242a7234a461de273b589811def8]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [0b77562c24e62555c0952e5c6a0ebce85aaa1a43]
# to [fb4bd660e032d23e78af98449667e6bd6fdae950]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [e5d4b34ba7ffcc19cf76941aa5f700a687147d15]
# to [c0608172fae13bd898686c009658f6f8179e9c46]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [7212c808e7087d92aab3ce2cda5c8d3ba3ee695b]
# to [4b7a7a8a5b44f7b603a679a33170012bd24d5c16]
#
# patch "packages/pango/pango_1.8.2.bb"
# from [a17979a78d6ca8ee7191f00fd631befaadc5dcac]
# to [c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf]
#
============================================================
--- packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch d73ea33ce170fe68af071185f13fa2c5b6c19775
+++ packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch d73ea33ce170fe68af071185f13fa2c5b6c19775
@@ -0,0 +1,13 @@
+Index: glib-2.16.1/glib/gutils.h
+===================================================================
+--- glib-2.16.1.orig/glib/gutils.h 2008-03-21 16:18:57.000000000 +0100
++++ glib-2.16.1/glib/gutils.h 2008-03-21 16:19:09.000000000 +0100
+@@ -97,7 +97,7 @@
+ # define G_INLINE_FUNC
+ # undef G_CAN_INLINE
+ #elif defined (__GNUC__)
+-# ifdef __GNUC_STDC_INLINE__
++# ifdef __GNUC_GNU_INLINE__
+ # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+ # else
+ # define G_INLINE_FUNC extern inline
============================================================
--- packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch 8ffef06194b29e2b22abed7edb6044a5ad4316d7
+++ packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch 8ffef06194b29e2b22abed7edb6044a5ad4316d7
@@ -0,0 +1,12 @@
+Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c 2005-09-01 22:43:46.000000000 +0100
++++ linux-2.6.13/drivers/ide/legacy/ide-cs.c 2005-09-01 22:45:46.000000000 +0100
+@@ -488,7 +488,6 @@
+ PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
+ PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
+ PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
+- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+ PCMCIA_DEVICE_NULL,
+ };
+ MODULE_DEVICE_TABLE(pcmcia, ide_ids);
============================================================
--- packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch 450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1
+++ packages/linux/linux-omap1-2.6.24-omap1/binutils-buildid-arm.patch 450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 5ff5406..538fcb5 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -94,6 +94,7 @@ SECTIONS
+ TEXT_TEXT
+ SCHED_TEXT
+ LOCK_TEXT
++ *(.note.*)
+ #ifdef CONFIG_MMU
+ *(.fixup)
+ #endif
============================================================
--- packages/linux/linux-omap1-2.6.24-omap1/defconfig 9f1536c5f2c793aa250eaf70e845ce53baae9521
+++ packages/linux/linux-omap1-2.6.24-omap1/defconfig 9f1536c5f2c793aa250eaf70e845ce53baae9521
@@ -0,0 +1,1092 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24-omap1
+# Fri Mar 21 08:40:14 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=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_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# 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_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+CONFIG_ARCH_OMAP=y
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_DEBUG_SRAM_PATCH=y
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+# CONFIG_OMAP_STI is not set
+CONFIG_OMAP_MCBSP=y
+# CONFIG_OMAP_MMU_FWK is not set
+# CONFIG_OMAP_MBOX_FWK is not set
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
+CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_SERIAL_WAKE=y
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+# CONFIG_ARCH_OMAP15XX is not set
+CONFIG_ARCH_OMAP16XX=y
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_OMAP_H2 is not set
+# CONFIG_MACH_OMAP_H3 is not set
+CONFIG_MACH_OMAP_OSK=y
+# CONFIG_OMAP_OSK_MISTRAL is not set
+# CONFIG_MACH_NOKIA770 is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_216MHZ is not set
+CONFIG_OMAP_ARM_192MHZ=y
+# CONFIG_OMAP_ARM_168MHZ is not set
+# CONFIG_OMAP_ARM_120MHZ is not set
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_OMAP_ARM_30MHZ is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_OMAP_CF=y
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=128
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+# CONFIG_APM_EMULATION is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+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=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# 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_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+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
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# 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=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r8f046513c054e5ae4400145d7f5e0288953f7fab -r90f7040fd7d6c4f3a3587d7fa7e1445858add5ae
#
#
#
# rename "packages/twisted/twisted-2.5.0"
# to "packages/python/python-twisted-2.5.0"
#
# rename "packages/twisted/twisted_2.5.0.bb"
# to "packages/python/python-twisted_2.5.0.bb"
#
# patch "packages/python/python-twisted_2.5.0.bb"
# from [57c038114b0b4ffa18a4791796f8d3ff6aa97b96]
# to [a918b7400f29ab63d4dab26793a19ad016e04ace]
#
# patch "packages/tasks/task-python-everything.bb"
# from [f571afc0d386839fce66445019667bf7edf84284]
# to [b5a47ec309aff31f780978156e341ad708eae74a]
#
============================================================
--- packages/twisted/twisted_2.5.0.bb 57c038114b0b4ffa18a4791796f8d3ff6aa97b96
+++ packages/python/python-twisted_2.5.0.bb a918b7400f29ab63d4dab26793a19ad016e04ace
@@ -5,12 +5,7 @@ LICENSE = "LGPL"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "LGPL"
-RDEPENDS = "python-core python-zopeinterface"
-RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
- python-twisted-lore python-twisted-mail python-twisted-names \
- python-twisted-news python-twisted-runner python-twisted-web \
- python-twisted-words"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
file://remove-zope-check.patch;patch=1"
@@ -20,40 +15,48 @@ PACKAGES += "python-twisted-zsh python-t
inherit distutils
PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
- python-twisted-runner-dbg \
+ python-twisted-runner-dbg \
python-twisted-bin python-twisted-conch python-twisted-lore \
python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
python-twisted-web python-twisted-words python-twisted python-twisted-core \
"
+RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
+ python-twisted-lore python-twisted-mail python-twisted-names \
+ python-twisted-news python-twisted-runner python-twisted-web \
+ python-twisted-words"
+
+
ALLOW_EMPTY = "1"
FILES_${PN} = ""
FILES_python-twisted = ""
FILES_python-twisted-test = " \
-${libdir}/python2.4/site-packages/twisted/python/web/test \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/web/test \
"
FILES_python-twisted-protocols = " \
-${libdir}/python2.4/site-packages/twisted/python/protocols/ \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/protocols/ \
"
FILES_python-twisted-zsh = " \
-${libdir}/python2.4/site-packages/twisted/python/zsh \
-${libdir}/python2.4/site-packages/twisted/python/zshcomp.* \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
"
FILES_python-twisted-bin = " \
-${libdir}/python2.4/site-packages/twisted/protocols/_c_urlarg.so \
-${libdir}/python2.4/site-packages/twisted/spread/cBanana.so"
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \
+"
FILES_python-twisted-conch = " \
-${bindir}/ckeygen \
-${bindir}/tkconch \
-${bindir}/conch \
-${bindir}/conchftp \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_conch.py \
-${libdir}/python2.4/site-packages/twisted/conch \
+ ${bindir}/ckeygen \
+ ${bindir}/tkconch \
+ ${bindir}/conch \
+ ${bindir}/conchftp \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \
"
FILES_python-twisted-core = " \
@@ -65,116 +68,116 @@ ${bindir}/trial \
${bindir}/tapconvert \
${bindir}/tkmktap \
${bindir}/trial \
-${libdir}/python2.4/site-packages/twisted/*.py \
-${libdir}/python2.4/site-packages/twisted/plugins/__init__.py \
-${libdir}/python2.4/site-packages/twisted/plugins/notestplugin.py \
-${libdir}/python2.4/site-packages/twisted/plugins/testplugin.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_ftp.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_inet.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_manhole.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_portforward.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_socks.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_telnet.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_trial.py \
-${libdir}/python2.4/site-packages/twisted/plugins/dropin.cache \
-${libdir}/python2.4/site-packages/twisted/application \
-${libdir}/python2.4/site-packages/twisted/cred \
-${libdir}/python2.4/site-packages/twisted/enterprise \
-${libdir}/python2.4/site-packages/twisted/internet \
-${libdir}/python2.4/site-packages/twisted/manhole \
-${libdir}/python2.4/site-packages/twisted/manhole \
-${libdir}/python2.4/site-packages/twisted/persisted \
-${libdir}/python2.4/site-packages/twisted/protocols\
-${libdir}/python2.4/site-packages/twisted/python\
-${libdir}/python2.4/site-packages/twisted/python/timeoutqueue.py \
-${libdir}/python2.4/site-packages/twisted/python/filepath.py \
-${libdir}/python2.4/site-packages/twisted/python/dxprofile.py \
-${libdir}/python2.4/site-packages/twisted/python/plugin.py \
-${libdir}/python2.4/site-packages/twisted/python/htmlizer.py \
-${libdir}/python2.4/site-packages/twisted/python/__init__.py \
-${libdir}/python2.4/site-packages/twisted/python/dispatch.py \
-${libdir}/python2.4/site-packages/twisted/python/hook.py \
-${libdir}/python2.4/site-packages/twisted/python/threadpool.py \
-${libdir}/python2.4/site-packages/twisted/python/otp.py \
-${libdir}/python2.4/site-packages/twisted/python/usage.py \
-${libdir}/python2.4/site-packages/twisted/python/roots.py \
-${libdir}/python2.4/site-packages/twisted/python/versions.py \
-${libdir}/python2.4/site-packages/twisted/python/urlpath.py \
-${libdir}/python2.4/site-packages/twisted/python/util.py \
-${libdir}/python2.4/site-packages/twisted/python/components.py \
-${libdir}/python2.4/site-packages/twisted/python/logfile.py \
-${libdir}/python2.4/site-packages/twisted/python/runtime.py \
-${libdir}/python2.4/site-packages/twisted/python/reflect.py \
-${libdir}/python2.4/site-packages/twisted/python/context.py \
-${libdir}/python2.4/site-packages/twisted/python/threadable.py \
-${libdir}/python2.4/site-packages/twisted/python/rebuild.py \
-${libdir}/python2.4/site-packages/twisted/python/failure.py \
-${libdir}/python2.4/site-packages/twisted/python/lockfile.py \
-${libdir}/python2.4/site-packages/twisted/python/formmethod.py \
-${libdir}/python2.4/site-packages/twisted/python/finalize.py \
-${libdir}/python2.4/site-packages/twisted/python/win32.py \
-${libdir}/python2.4/site-packages/twisted/python/dist.py \
-${libdir}/python2.4/site-packages/twisted/python/shortcut.py \
-${libdir}/python2.4/site-packages/twisted/python/zipstream.py \
-${libdir}/python2.4/site-packages/twisted/python/release.py \
-${libdir}/python2.4/site-packages/twisted/python/syslog.py \
-${libdir}/python2.4/site-packages/twisted/python/log.py \
-${libdir}/python2.4/site-packages/twisted/python/compat.py \
-${libdir}/python2.4/site-packages/twisted/python/zshcomp.py \
-${libdir}/python2.4/site-packages/twisted/python/procutils.py \
-${libdir}/python2.4/site-packages/twisted/python/text.py \
-${libdir}/python2.4/site-packages/twisted/python/_twisted_zsh_stub \
-${libdir}/python2.4/site-packages/twisted/scripts/ \
-${libdir}/python2.4/site-packages/twisted/spread/ \
-${libdir}/python2.4/site-packages/twisted/tap/ \
-${libdir}/python2.4/site-packages/twisted/trial/ \
-${libdir}/python2.4/site-packages/twisted/__init__.py \
-${libdir}/python2.4/site-packages/twisted/_version.py \
-${libdir}/python2.4/site-packages/twisted/copyright.py \
-${libdir}/python2.4/site-packages/twisted/im.py \
-${libdir}/python2.4/site-packages/twisted/plugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugin.py \
"
FILES_python-twisted-lore = " \
${bindir}/bookify \
${bindir}/lore \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_lore.py \
-${libdir}/python2.4/site-packages/twisted/lore \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/lore \
"
FILES_python-twisted-mail = " \
${bindir}/mailmail \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_mail.py \
-${libdir}/python2.4/site-packages/twisted/mail \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
"
FILES_python-twisted-names = " \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_names.py \
-${libdir}/python2.4/site-packages/twisted/names \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
"
FILES_python-twisted-news = " \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_news.py \
-${libdir}/python2.4/site-packages/twisted/news \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
"
FILES_python-twisted-runner = " \
-${libdir}python2.4/site-packages/twisted/runner/portmap.so \
-${libdir}/python2.4/site-packages/twisted/runner\
+${libdir}/site-packages/twisted/runner/portmap.so \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
"
FILES_python-twisted-web = " \
${bindir}/websetroot \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_web.py \
-${libdir}/python2.4/site-packages/twisted/web\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
"
FILES_python-twisted-words = " \
${bindir}/im \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_words.py \
-${libdir}/python2.4/site-packages/twisted/words\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
"
FILES_python-twisted-runner-dbg += " \
-${libdir}/python2.4/site-packages/twisted/runner/.debug"
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner/.debug"
============================================================
--- packages/tasks/task-python-everything.bb f571afc0d386839fce66445019667bf7edf84284
+++ packages/tasks/task-python-everything.bb b5a47ec309aff31f780978156e341ad708eae74a
@@ -87,7 +87,7 @@ RDEPENDS = "\
python-webpy \
moin \
plone \
- twisted \
+ python-twisted \
zope"
BROKEN_PACKAGES = "\
More information about the Openembedded-commits
mailing list