[oe-commits] org.oe.dev merge of '1db1a8c9924e0337a387abb95f676f3476f67dcb'

xora commit openembedded-commits at lists.openembedded.org
Fri Jul 13 10:53:42 UTC 2007


merge of '1db1a8c9924e0337a387abb95f676f3476f67dcb'
     and '47c87f682cd85a075bc09f626973782b11025ad7'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: f1821469be3c8f5081df2188813bc21f7d26b8a8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f1821469be3c8f5081df2188813bc21f7d26b8a8
Files:
1
packages/file/file-native_4.20.bb
packages/file/file_4.20.bb
packages/file/file-native_4.21.bb
packages/file/file_4.21.bb
packages/gpephone/machined_svn.bb
packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
packages/linux/linux-gta01_2.6.21.5.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/eteng500/defconfig
packages/linux/linux-handhelds-2.6/h1910/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6/rx1950/defconfig
packages/linux/linux-handhelds-2.6/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/libsigc++-2.0/libsigc++-2.0-2.0.17
packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch
packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb
Diffs:

#
# mt diff -r1db1a8c9924e0337a387abb95f676f3476f67dcb -rf1821469be3c8f5081df2188813bc21f7d26b8a8
#
# 
# 
# delete "packages/file/file-native_4.20.bb"
# 
# delete "packages/file/file_4.20.bb"
# 
# add_file "packages/file/file-native_4.21.bb"
#  content [7f56042d15332b2149b6e86a6180dd1e4707ae80]
# 
# add_file "packages/file/file_4.21.bb"
#  content [3754c0dea941ef3f376efa559fe6e981cedfa9bf]
# 
# add_file "packages/gpephone/machined_svn.bb"
#  content [c192d49beecd4b546ada28a1e7cd67964213339b]
# 
# add_file "packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01"
#  content [b13800e54f61edf724b8c70fbf5b508ea11f79e9]
# 
# add_file "packages/linux/linux-gta01_2.6.21.5.bb"
#  content [b1936abf638c2ef95ea6ca878f69b3ccc447851d]
# 
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
#  from [4eaaedce5e3bb2058cddbe9b64cd12f1149ec3f1]
#    to [e0f4897cf03774795773888e2931554df0824118]
# 
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
#  from [2f4b948c60bf6f34259951b866ad2c3ae4c3c28e]
#    to [ea1d40745d9fe6c81ff23a05247b1fc791189eac]
# 
# patch "packages/linux/linux-handhelds-2.6/aximx50/defconfig"
#  from [b6b6f34f49d022dfb2406575f0d0c235cd9089cb]
#    to [c58dac487789da938bd3704a2fbeb209bb7ffeb4]
# 
# patch "packages/linux/linux-handhelds-2.6/eteng500/defconfig"
#  from [905b27fed33071a00962254249c0295376963388]
#    to [c629a726af9231ba0e0c4ae626f7822b344721a8]
# 
# patch "packages/linux/linux-handhelds-2.6/h1910/defconfig"
#  from [93ed15c6d83a96ed4aedb73fa55bb2118f89edc6]
#    to [70d6f166f046f47b5002f563894f486741dc13d3]
# 
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
#  from [feef892cbfa0be5bab21370a34ccfb42c44145fa]
#    to [99708dbf25bd3441c9082b1630f4af3135a40557]
# 
# patch "packages/linux/linux-handhelds-2.6/h3600/defconfig"
#  from [651535240b2413debc4fcc3aaa0ff3505b93f8e8]
#    to [684feca04103818ccaa7bd51b5b40a733dac10a6]
# 
# patch "packages/linux/linux-handhelds-2.6/h3800/defconfig"
#  from [f25477f15940089e48eb23bdddc5d098a075bada]
#    to [80357c930951185c0fc7a827fe95c9eba41b0a34]
# 
# patch "packages/linux/linux-handhelds-2.6/h3900/defconfig"
#  from [981d9f31bbdc72de018b643b47d120ea53fa1379]
#    to [b65157983e413087ae6092b33005e8ba48ad99ea]
# 
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
#  from [4932372e78dce91d533ea1da62dc49734fd4764d]
#    to [af0d759545fd4769dbb73dbfc63b63b5127fb5e3]
# 
# patch "packages/linux/linux-handhelds-2.6/h5000/defconfig"
#  from [126b6dc66ff3e7a82a9d6f98662d41efab760713]
#    to [d13b145698e299ed856d81e5507de08384cf1a09]
# 
# patch "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
#  from [7addd9dd4ac5d4edc0a0214f42a704e645017508]
#    to [d58b51562b431ecee6e123bf977cfc217fc480ff]
# 
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
#  from [9689f9d709f46c6177db50e5cc8f05826d2f13c5]
#    to [e988adccc6557607a32ed6ac0c24eb135e0e72d2]
# 
# patch "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
#  from [8859f0978e3ec80e423cf6fa402235335902f60a]
#    to [34ab2a830eefdf668846ada757c25e897025192d]
# 
# patch "packages/linux/linux-handhelds-2.6/htcuniversal/defconfig"
#  from [e1d61ebd7e5edc1cf0efe0bb29d3d34289ccd99a]
#    to [0a7f9696bfd6840a8a9b37f30a5352183e8b5c6d]
# 
# patch "packages/linux/linux-handhelds-2.6/htcwallaby/defconfig"
#  from [4ad37385c6a0ed248f68a9058d36f0bdc7bf1fcd]
#    to [4855e0e90c415dc02c4302643a0c8ba32514a821]
# 
# patch "packages/linux/linux-handhelds-2.6/hx4700/defconfig"
#  from [5ef9bcade447b0e79d72a2b52b4c6a5a1e5c418d]
#    to [f0e17953b3fa00afb91f4d11b0333f47e963a61f]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [dedaba452a20412e75b91aae293feecef3f64858]
#    to [bb8f612e815c3b2691b68fc3fa42bba4ac6d44ca]
# 
# patch "packages/linux/linux-handhelds-2.6/rx1950/defconfig"
#  from [1c03c2c1d8555228ed64cc68dbff92b6e0a3f723]
#    to [8a6da32bf73cb551abd6781e25d3b0230f9e4c36]
# 
# patch "packages/linux/linux-handhelds-2.6/rx3000/defconfig"
#  from [a5dd63a56ddd84864d436851f0d4a23ac9947193]
#    to [5ebac2417c26e9ed4598768348962b0246c9b45d]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
#  from [252b9c26ddd2fda4271f4352999ce0facbfece99]
#    to [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
# 
============================================================
--- packages/file/file-native_4.21.bb	7f56042d15332b2149b6e86a6180dd1e4707ae80
+++ packages/file/file-native_4.21.bb	7f56042d15332b2149b6e86a6180dd1e4707ae80
@@ -0,0 +1,6 @@
+require file_${PV}.bb
+inherit native
+DEPENDS = ""
+PR = "r0"
+
+SRC_URI += "file://native-fix.diff;patch=1"
============================================================
--- packages/file/file_4.21.bb	3754c0dea941ef3f376efa559fe6e981cedfa9bf
+++ packages/file/file_4.21.bb	3754c0dea941ef3f376efa559fe6e981cedfa9bf
@@ -0,0 +1,18 @@
+DESCRIPTION = "File attempts to classify files depending \
+on their contents and prints a description if a match is found."
+SECTION = "console/utils"
+LICENSE = "BSD-ADV"
+DEPENDS = "file-native"
+
+SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz"
+S = "${WORKDIR}/file-${PV}"
+
+inherit autotools
+
+do_configure_prepend() {
+	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
+}
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/machined_svn.bb	c192d49beecd4b546ada28a1e7cd67964213339b
+++ packages/gpephone/machined_svn.bb	c192d49beecd4b546ada28a1e7cd67964213339b
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device abstraction and support daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+
============================================================
--- packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01	b13800e54f61edf724b8c70fbf5b508ea11f79e9
+++ packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01	b13800e54f61edf724b8c70fbf5b508ea11f79e9
@@ -0,0 +1,1857 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.3
+# Mon Jun 11 18:32:32 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_NO_IOPORT=y
+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_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-moko10"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# 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_ALL is not set
+# 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_EPOLL=y
+CONFIG_SHMEM=y
+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
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+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
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# 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_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 is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+CONFIG_ARCH_S3C2410=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_PLAT_S3C24XX=y
+CONFIG_CPU_S3C244X=y
+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
+CONFIG_S3C2410_BOOT_ERROR_RESET=y
+CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
+CONFIG_S3C2410_DMA=y
+# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_MACH_SMDK=y
+
+#
+# S3C2400 Machines
+#
+CONFIG_CPU_S3C2410=y
+CONFIG_CPU_S3C2410_DMA=y
+CONFIG_S3C2410_PM=y
+CONFIG_S3C2410_GPIO=y
+CONFIG_S3C2410_CLOCK=y
+
+#
+# S3C2410 Machines
+#
+# CONFIG_ARCH_SMDK2410 is not set
+# CONFIG_ARCH_H1940 is not set
+# CONFIG_MACH_N30 is not set
+# CONFIG_ARCH_BAST is not set
+# CONFIG_MACH_OTOM is not set
+# CONFIG_MACH_AML_M5900 is not set
+# CONFIG_MACH_VR1000 is not set
+CONFIG_MACH_QT2410=y
+CONFIG_MACH_NEO1973_GTA01=y
+
+#
+# S3C2412 Machines
+#
+# CONFIG_MACH_SMDK2413 is not set
+# CONFIG_MACH_VSTMS is not set
+CONFIG_CPU_S3C2440=y
+CONFIG_S3C2440_DMA=y
+
+#
+# S3C2440 Machines
+#
+# CONFIG_MACH_ANUBIS is not set
+# CONFIG_MACH_OSIRIS is not set
+# CONFIG_MACH_RX3715 is not set
+CONFIG_ARCH_S3C2440=y
+# CONFIG_MACH_NEXCODER_2440 is not set
+CONFIG_SMDK2440_CPU2440=y
+CONFIG_MACH_HXD8=y
+# CONFIG_MACH_NEO1973_GTA02 is not set
+
+#
+# S3C2442 Machines
+#
+# CONFIG_SMDK2440_CPU2442 is not set
+
+#
+# S3C2443 Machines
+#
+# CONFIG_MACH_SMDK2443 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=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=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=200
+# 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_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySAC0,115200n8  ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off   debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
+
+#
+# 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=y
+CONFIG_PM_DEBUG=y
+CONFIG_DISABLE_CONSOLE_SUSPEND=y
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+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_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+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=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+
+#
+# IP: Netfilter Conf%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r47c87f682cd85a075bc09f626973782b11025ad7 -rf1821469be3c8f5081df2188813bc21f7d26b8a8
#
# 
# 
# add_dir "packages/libsigc++-2.0/libsigc++-2.0-2.0.17"
# 
# add_file "packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch"
#  content [db5f96d73cd196054bec8489dc3bd6ad1c731c19]
# 
# add_file "packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb"
#  content [98e500f0096ee080083cac017c0910fe2a207c46]
# 
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch	db5f96d73cd196054bec8489dc3bd6ad1c731c19
+++ packages/libsigc++-2.0/libsigc++-2.0-2.0.17/define_sigc_api.patch	db5f96d73cd196054bec8489dc3bd6ad1c731c19
@@ -0,0 +1,15 @@
+Index: libsigc++-2.0.17/configure.ac
+===================================================================
+--- libsigc++-2.0.17.orig/configure.ac	2005-12-20 08:41:21.000000000 +0000
++++ libsigc++-2.0.17/configure.ac	2007-07-11 11:33:55.000000000 +0100
+@@ -105,6 +105,10 @@
+ SIGC_CXX_HAS_NAMESPACE_STD()
+ SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+ 
++dnl FIXME Define this here since it does not seem to be defined elsewhere
++AC_DEFINE(SIGC_API, [], [Empty specifier])
++AC_DEFINE(SIGC_USING_STD(Symbol), [], [Empty specifier])
++
+ if test "X$config_error" = "Xyes" ; then
+   AC_ERROR(
+ [One or more of the required compiler features is missing.
============================================================
--- packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb	98e500f0096ee080083cac017c0910fe2a207c46
+++ packages/libsigc++-2.0/libsigc++-2.0_2.0.17.bb	98e500f0096ee080083cac017c0910fe2a207c46
@@ -0,0 +1,45 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r1"
+LICENSE = "GPL LGPL"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-${PV}.tar.gz \
+           file://define_sigc_api.patch;patch=1 "
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
+
+# acpaths = ""
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}/sigc++-2.0/include
+	install -m 0644 sigc++config.h ${STAGING_LIBDIR}/sigc++-2.0/include/
+	oe_libinstall -so -C sigc++ libsigc-2.0 ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++
+	for f in sigc++/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/
+	done
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+	for f in sigc++/functors/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/functors
+	done
+
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+	for f in sigc++/adaptors/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors
+	done
+	install -d ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+	for f in sigc++/adaptors/lambda/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-2.0/sigc++/adaptors/lambda
+	done
+
+
+}
+






More information about the Openembedded-commits mailing list