[oe-commits] org.oe.dev merge of '93275fa73551aabe0b186dde99fd16be158043ab'
oe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:30:50 UTC 2008
merge of '93275fa73551aabe0b186dde99fd16be158043ab'
and 'eed8dc866370e81bc5849ef5b2ddfeb8e87d4f1c'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: dacdcbbebc441d46f6c9ac7c0d1d152e5edcb13c
ViewMTN: http://monotone.openembedded.org/revision/info/dacdcbbebc441d46f6c9ac7c0d1d152e5edcb13c
Files:
1
packages/linux/linux-2.6.26
packages/linux/linux-2.6.26/mpc8313e-rdb
packages/gnome/files/acinclude.m4
packages/gnome/hippo-canvas_0.3.0.bb
packages/gnome/libwnck_2.23.6.bb
packages/intltool/intltool-native_0.40.3.bb
packages/intltool/intltool_0.40.3.bb
packages/linux/linux-2.6.26/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.26/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch
packages/linux/linux-2.6.26/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.26/mpc8313e-rdb/mpc831x-nand.patch
packages/linux/linux_2.6.26.bb
packages/gnome/gnome-python-desktop_2.23.0.bb
packages/sugar/sugar-base_0.82.0.bb
packages/connman
packages/connman/files
packages/libgdbus
packages/connman/connman_git.bb
packages/connman/files/connman
packages/connman/files/connman-build-and-work.patch
packages/libgdbus/libgdbus_git.bb
conf/distro/include/sane-srcrevs.inc
mtn:execute
true
Diffs:
#
# mt diff -r93275fa73551aabe0b186dde99fd16be158043ab -rdacdcbbebc441d46f6c9ac7c0d1d152e5edcb13c
#
#
#
# add_dir "packages/linux/linux-2.6.26"
#
# add_dir "packages/linux/linux-2.6.26/mpc8313e-rdb"
#
# add_file "packages/gnome/files/acinclude.m4"
# content [a88d00bee840b475039af1207dad53ea6337f513]
#
# add_file "packages/gnome/hippo-canvas_0.3.0.bb"
# content [d9c1478454b592cbdb8d48a82aab9db60c50bb16]
#
# add_file "packages/gnome/libwnck_2.23.6.bb"
# content [5a389262f2f82c0a1df0911dc237ff1497323bca]
#
# add_file "packages/intltool/intltool-native_0.40.3.bb"
# content [cebdd560e45a204a68a27a99d744f6f152398488]
#
# add_file "packages/intltool/intltool_0.40.3.bb"
# content [faf542f975f69d68d6552ff9fa4cb06f41123582]
#
# add_file "packages/linux/linux-2.6.26/mpc8313e-rdb/defconfig"
# content [bca3292e7f7d5563f597295e2f20a1a8c65053f5]
#
# add_file "packages/linux/linux-2.6.26/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch"
# content [bf271d9de4ce4c25b913e724dd0f6f56435f7f9a]
#
# add_file "packages/linux/linux-2.6.26/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# content [e7aa8122c5a206abdbcc3845bab51477cab0a704]
#
# add_file "packages/linux/linux-2.6.26/mpc8313e-rdb/mpc831x-nand.patch"
# content [c54850135d92c5b4e8a6112f6baf6464d25753a9]
#
# add_file "packages/linux/linux_2.6.26.bb"
# content [2ba26b4b2bdbc201c2746ef062498e5f8710b2d2]
#
# patch "packages/gnome/gnome-python-desktop_2.23.0.bb"
# from [3c8574f5d466ee731f7a9c62ed1eee4655ac918b]
# to [c0301fb6de029c4c92022a19436989461132f645]
#
# patch "packages/sugar/sugar-base_0.82.0.bb"
# from [cbfe5bb7096952d90c4998d19566e160f5d230b2]
# to [3b5a6f1d3b9cad0a2372567fd8a37cb3ff35a428]
#
============================================================
--- packages/gnome/files/acinclude.m4 a88d00bee840b475039af1207dad53ea6337f513
+++ packages/gnome/files/acinclude.m4 a88d00bee840b475039af1207dad53ea6337f513
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+ import $1
+except ImportError:
+ sys.exit(1)
+except:
+ sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+ eval "py_cv_mod_$py_mod_var=yes"
+ else
+ eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS. If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
+ ;;
+*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING([whether [$]CC understands $1])
+ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+ AC_MSG_RESULT($jh_has_option)
+ if test $jh_has_option = no; then
+ CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+esac])
============================================================
--- packages/gnome/hippo-canvas_0.3.0.bb d9c1478454b592cbdb8d48a82aab9db60c50bb16
+++ packages/gnome/hippo-canvas_0.3.0.bb d9c1478454b592cbdb8d48a82aab9db60c50bb16
@@ -0,0 +1,19 @@
+DESCRIPTION = "Hippocanvas"
+LICENSE = "LGPLv2"
+
+inherit gnome
+
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
+}
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/python*/site-packages"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/.debug"
+
+
============================================================
--- packages/gnome/libwnck_2.23.6.bb 5a389262f2f82c0a1df0911dc237ff1497323bca
+++ packages/gnome/libwnck_2.23.6.bb 5a389262f2f82c0a1df0911dc237ff1497323bca
@@ -0,0 +1,10 @@
+DESCRIPTION = "Window navigation construction toolkit"
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+DEPENDS = "gtk+ gdk-pixbuf-csource-native"
+
+inherit gnome
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/intltool/intltool-native_0.40.3.bb cebdd560e45a204a68a27a99d744f6f152398488
+++ packages/intltool/intltool-native_0.40.3.bb cebdd560e45a204a68a27a99d744f6f152398488
@@ -0,0 +1,15 @@
+require intltool_${PV}.bb
+
+PR = "r1"
+
+inherit native
+DEPENDS = "libxml-parser-perl-native"
+
+export PERL = "/usr/bin/env perl"
+
+do_configure_prepend() {
+ cd ${S}
+ for i in intltool*.in ; do
+ sed -i -e s:-w::g $i
+ done
+}
============================================================
--- packages/intltool/intltool_0.40.3.bb faf542f975f69d68d6552ff9fa4cb06f41123582
+++ packages/intltool/intltool_0.40.3.bb faf542f975f69d68d6552ff9fa4cb06f41123582
@@ -0,0 +1,7 @@
+require intltool.inc
+
+PR = "r1"
+
+do_configure_append() {
+ sed -i -e s:head\ -1:head\ -n1:g intltool.m4
+}
============================================================
--- packages/linux/linux-2.6.26/mpc8313e-rdb/defconfig bca3292e7f7d5563f597295e2f20a1a8c65053f5
+++ packages/linux/linux-2.6.26/mpc8313e-rdb/defconfig bca3292e7f7d5563f597295e2f20a1a8c65053f5
@@ -0,0 +1,2021 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26
+# Wed Aug 27 19:53:28 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_FSL_EMB_PERFMON is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+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_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+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=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC83xx=y
+CONFIG_MPC831x_RDB=y
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC836x_MDS is not set
+# CONFIG_MPC837x_MDS is not set
+# CONFIG_MPC837x_RDB is not set
+# CONFIG_SBC834x is not set
+CONFIG_PPC_MPC831x=y
+CONFIG_IPIC=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+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_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA is not set
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# 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_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+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=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+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_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_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+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=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+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_NOTR%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -reed8dc866370e81bc5849ef5b2ddfeb8e87d4f1c -rdacdcbbebc441d46f6c9ac7c0d1d152e5edcb13c
#
#
#
# add_dir "packages/connman"
#
# add_dir "packages/connman/files"
#
# add_dir "packages/libgdbus"
#
# add_file "packages/connman/connman_git.bb"
# content [fe2b617d4df6b1e48a42ee79dee4e69bf3e64b64]
#
# add_file "packages/connman/files/connman"
# content [ce5b97e075f3ca3fd83d7714d09894c1cb513759]
#
# add_file "packages/connman/files/connman-build-and-work.patch"
# content [f12f1c6066c8489ab6a6f78ac2800091fc532443]
#
# add_file "packages/libgdbus/libgdbus_git.bb"
# content [837b467c8f871d1e1e1dabf32c734ce77a19fac9]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [ccb23715f9a538db34a391160621a8fbcdbd8574]
# to [c34c8224b196b903a1d16225d75c370673a6fbcc]
#
# set "packages/connman/files/connman"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/connman/connman_git.bb fe2b617d4df6b1e48a42ee79dee4e69bf3e64b64
+++ packages/connman/connman_git.bb fe2b617d4df6b1e48a42ee79dee4e69bf3e64b64
@@ -0,0 +1,49 @@
+HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
+SUMMARY = "Moblin Connection Manager"
+PV = "0.0+git${SRCREV}"
+PR = "r4"
+S = "${WORKDIR}/git"
+LICENSE = "GPL"
+
+DEPENDS = "libgdbus dbus glib-2.0 hal"
+RDEPENDS = "dhcp-client wpa-supplicant resolvconf"
+
+EXTRA_OECONF += " \
+ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
+ ac_cv_path_DHCLIENT=/sbin/dhclient "
+
+SRC_URI = "git://moblin.org/repos/projects/connman.git;proto=http \
+ file://connman-build-and-work.patch;patch=1 \
+ file://connman "
+
+INITSCRIPT_NAME = "connman"
+INITSCRIPT_PARAMS = "defaults 22"
+
+inherit autotools pkgconfig update-rc.d
+
+do_install_append() {
+ install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
+}
+
+PACKAGES_DYNAMIC = "${PN}-plugin-*"
+PACKAGES += "${PN}-script-dhclient"
+FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
+ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
+ ${datadir}/pixmaps ${datadir}/applications \
+ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+ ${libdir}/bonobo/servers \
+ ${datadir}/dbus-1/system-services/*"
+FILES_${PN}-script-dhclient += "${libdir}/connman/scripts/dhclient*"
+FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
+ ${libdir}/connman/scripts/.debug"
+
+python populate_packages_prepend() {
+ plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
+ plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+ do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/connman/files/connman ce5b97e075f3ca3fd83d7714d09894c1cb513759
+++ packages/connman/files/connman ce5b97e075f3ca3fd83d7714d09894c1cb513759
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON=/usr/sbin/connmand
+PIDFILE=/var/run/connmand.pid
+DESC="Connection Manager"
+
+if [ -f /etc/default/connman ] ; then
+ . /etc/default/connman
+fi
+
+set -e
+
+do_start() {
+ connmand
+}
+
+do_stop() {
+ start-stop-daemon --stop --name connmand --quiet
+}
+
+case "$1" in
+ start)
+ echo "Starting $DESC"
+ do_start
+ ;;
+ stop)
+ echo "Stopping $DESC"
+ do_stop
+ ;;
+ restart|force-reload)
+ echo "Restarting $DESC"
+ do_stop
+ sleep 1
+ do_start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/connman/files/connman-build-and-work.patch f12f1c6066c8489ab6a6f78ac2800091fc532443
+++ packages/connman/files/connman-build-and-work.patch f12f1c6066c8489ab6a6f78ac2800091fc532443
@@ -0,0 +1,286 @@
+diff --git a/include/iface.h b/include/iface.h
+index 3530f23..24f0a9a 100644
+--- a/include/iface.h
++++ b/include/iface.h
+@@ -161,7 +161,7 @@ extern void connman_iface_indicate_carrier_off(struct connman_iface *iface);
+ extern void connman_iface_indicate_configured(struct connman_iface *iface);
+
+ extern void connman_iface_indicate_station(struct connman_iface *iface,
+- const char *name, int strength, int security);
++ const char *bssid, const char *name, int strength, int security);
+
+ extern int connman_iface_get_ipv4(struct connman_iface *iface,
+ struct connman_ipv4 *ipv4);
+diff --git a/plugins/supplicant.c b/plugins/supplicant.c
+index cba93cd..a8a46ed 100644
+--- a/plugins/supplicant.c
++++ b/plugins/supplicant.c
+@@ -66,7 +66,9 @@ static GSList *tasks = NULL;
+
+ struct supplicant_ap {
+ gchar *identifier;
++ gchar *bssid;
+ GByteArray *ssid;
++ guint quality;
+ guint capabilities;
+ gboolean has_wep;
+ gboolean has_wpa;
+@@ -618,6 +620,24 @@ static void extract_ssid(struct supplicant_ap *ap, DBusMessageIter *value)
+ ap->identifier = g_strdup((char *) ssid);
+ }
+
++static void extract_bssid(struct supplicant_ap *ap, DBusMessageIter *value)
++{
++ DBusMessageIter array;
++ unsigned char *bssid;
++ int bssid_len;
++ char buf[20];
++
++ dbus_message_iter_recurse(value, &array);
++ dbus_message_iter_get_fixed_array(&array, &bssid, &bssid_len);
++ if (bssid_len >= 6) {
++ g_snprintf((char *)buf, sizeof(buf),
++ "%02x:%02x:%02x:%02x:%02x:%02x",
++ (int)bssid[0], (int)bssid[1], (int)bssid[2],
++ (int)bssid[3], (int)bssid[4], (int)bssid[5]);
++ ap->bssid = g_strdup((char *) buf);
++ }
++}
++
+ static void extract_wpaie(struct supplicant_ap *ap, DBusMessageIter *value)
+ {
+ DBusMessageIter array;
+@@ -657,6 +677,16 @@ static void extract_capabilites(struct supplicant_ap *ap,
+ ap->has_wep = TRUE;
+ }
+
++static void extract_quality(struct supplicant_ap *ap,
++ DBusMessageIter *value)
++{
++ guint quality;
++
++ dbus_message_iter_get_basic(value, &quality);
++
++ ap->quality = quality;
++}
++
+ static int parse_network_properties(struct supplicant_task *task,
+ DBusMessage *message)
+ {
+@@ -688,12 +718,16 @@ static int parse_network_properties(struct supplicant_task *task,
+
+ if (g_str_equal(key, "ssid") == TRUE)
+ extract_ssid(ap, &value);
++ else if (g_str_equal(key, "bssid") == TRUE)
++ extract_bssid(ap, &value);
+ else if (g_str_equal(key, "wpaie") == TRUE)
+ extract_wpaie(ap, &value);
+ else if (g_str_equal(key, "rsnie") == TRUE)
+ extract_rsnie(ap, &value);
+ else if (g_str_equal(key, "capabilities") == TRUE)
+ extract_capabilites(ap, &value);
++ else if (g_str_equal(key, "quality") == TRUE)
++ extract_quality(ap, &value);
+
+ dbus_message_iter_next(&dict);
+ }
+@@ -706,7 +740,8 @@ static int parse_network_properties(struct supplicant_task *task,
+ security |= 0x04;
+
+ connman_iface_indicate_station(task->iface,
+- ap->identifier, 25, security);
++ ap->bssid, ap->identifier, ap->quality,
++ security);
+
+ g_free(ap);
+
+diff --git a/src/iface-inet.c b/src/iface-inet.c
+index 82a1e8c..f780452 100644
+--- a/src/iface-inet.c
++++ b/src/iface-inet.c
+@@ -275,6 +275,10 @@ int __connman_iface_connect(struct connman_iface *iface,
+
+ iface->flags |= CONNMAN_IFACE_FLAG_RUNNING;
+
++ /* This actually makes it do a dhcp request properly when connections
++ * are estabished - it doesnt seem to otherwise */
++ iface->state = CONNMAN_IFACE_STATE_ENABLED;
++
+ return 0;
+ }
+
+diff --git a/src/iface.c b/src/iface.c
+index b2fd6d1..c70b25c 100644
+--- a/src/iface.c
++++ b/src/iface.c
+@@ -332,11 +332,13 @@ void connman_iface_indicate_configured(struct connman_iface *iface)
+ }
+ }
+
+-static void append_station(DBusMessage *reply, const char *name,
++static void append_station(DBusMessage *reply, const char *bssid, const char *name,
+ int signal, int security)
+ {
+ DBusMessageIter array, dict;
++ const char *wep = "WEP";
+ const char *wpa = "WPA";
++ const char *rsn = "RSN";
+
+ dbus_message_iter_init_append(reply, &array);
+
+@@ -345,25 +347,36 @@ static void append_station(DBusMessage *reply, const char *name,
+ DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+- append_entry(&dict, "ESSID", DBUS_TYPE_STRING, &name);
++ if (bssid) append_entry(&dict, "BSSID", DBUS_TYPE_STRING, &bssid);
++ if (name) append_entry(&dict, "ESSID", DBUS_TYPE_STRING, &name);
+ append_entry(&dict, "Signal", DBUS_TYPE_UINT16, &signal);
+
+- if (security > 0)
+- append_entry(&dict, "Security", DBUS_TYPE_STRING, &wpa);
++ if (security > 0) {
++ const char *sec = NULL;
++
++ if (security & 0x4)
++ sec = rsn;
++ else if (security & 0x2)
++ sec = wpa;
++ else if (security & 0x1)
++ sec = wep;
++ if (sec)
++ append_entry(&dict, "Security", DBUS_TYPE_STRING, &sec);
++ }
+
+ dbus_message_iter_close_container(&array, &dict);
+ }
+
+ void connman_iface_indicate_station(struct connman_iface *iface,
+- const char *name, int strength, int security)
++ const char *bssid, const char *name, int strength, int security)
+ {
+ DBusMessage *signal;
+- char *ssid, *passphrase;
++ char *ssid = NULL, *passphrase;
+ int len;
+
+- DBG("iface %p security %d name %s", iface, security, name);
++ DBG("iface %p security %d name %s bssid %s", iface, security, name, bssid);
+
+- if (name == NULL || strlen(name) == 0)
++ if (bssid == NULL || strlen(bssid) == 0)
+ return;
+
+ signal = dbus_message_new_signal(iface->path,
+@@ -371,7 +384,7 @@ void connman_iface_indicate_station(struct connman_iface *iface,
+ if (signal == NULL)
+ return;
+
+- append_station(signal, name, strength, security);
++ append_station(signal, bssid, name, strength, security);
+
+ dbus_connection_send(connection, signal, NULL);
+ dbus_message_unref(signal);
+@@ -386,17 +399,21 @@ void connman_iface_indicate_station(struct connman_iface *iface,
+ default:
+ break;
+ }
+-
+- len = strlen(name);
+- ssid = strdup(name);
+- if (ssid == NULL)
++
++ passphrase = __connman_iface_find_passphrase(iface, bssid);
++
++ if (!passphrase && name) {
++ len = strlen(name);
++ ssid = strdup(name);
++ /* The D-Link access points return a 0x05 at the end of the SSID */
++ if (len > 0 && ssid[len - 1] == '\05')
++ ssid[len - 1] = '\0';
++ }
++
++ if (!passphrase && ssid == NULL)
+ return;
+-
+- /* The D-Link access points return a 0x05 at the end of the SSID */
+- if (ssid[len - 1] == '\05')
+- ssid[len - 1] = '\0';
+-
+- passphrase = __connman_iface_find_passphrase(iface, ssid);
++ if (!passphrase)
++ passphrase = __connman_iface_find_passphrase(iface, ssid);
+ if (passphrase != NULL) {
+ DBG("network %s passphrase %s", ssid, passphrase);
+
+@@ -1154,7 +1171,7 @@ static GDBusMethodTable iface_methods[] = {
+ { "GetNetwork", "", "a{sv}", get_network },
+ { "SetNetwork", "a{sv}", "", set_network },
+ { "ListNetworks", "", "ao", list_networks },
+- { "CreateNetwork", "a{av}", "o", create_network },
++ { "CreateNetwork", "a{sv}", "o", create_network },
+ { "RemoveNetwork", "o", "", remove_network },
+ { "SelectNetwork", "o", "", select_network },
+ { "GetIPv4", "", "a{sv}", get_ipv4 },
+@@ -1301,7 +1318,7 @@ static int probe_device(LibHalContext *ctx,
+
+ conn = libhal_ctx_get_dbus_connection(ctx);
+
+- g_dbus_register_object(conn, iface->path, iface, device_free);
++ g_dbus_register_object(conn, iface->path);
+
+ interfaces = g_slist_append(interfaces, iface);
+
+@@ -1313,7 +1330,7 @@ static int probe_device(LibHalContext *ctx,
+
+ g_dbus_register_interface(conn, iface->path,
+ CONNMAN_IFACE_INTERFACE,
+- iface_methods, iface_signals, NULL);
++ iface_methods, iface_signals, NULL, iface, device_free);
+
+ DBG("iface %p identifier %s", iface, iface->identifier);
+
+diff --git a/src/manager.c b/src/manager.c
+index 9d14cd7..78b017f 100644
+--- a/src/manager.c
++++ b/src/manager.c
+@@ -218,18 +218,18 @@ int __connman_manager_init(DBusConnection *conn, gboolean compat)
+ if (connection == NULL)
+ return -1;
+
+- g_dbus_register_object(connection, CONNMAN_MANAGER_PATH, NULL, NULL);
++ g_dbus_register_object(connection, CONNMAN_MANAGER_PATH);
+
+ g_dbus_register_interface(connection, CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE,
+ manager_methods,
+- manager_signals, NULL);
++ manager_signals, NULL, NULL, NULL);
+
+ if (compat == TRUE) {
+- g_dbus_register_object(connection, NM_PATH, NULL, NULL);
++ g_dbus_register_object(connection, NM_PATH);
+
+ g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
+- nm_methods, NULL, NULL);
++ nm_methods, NULL, NULL, NULL, NULL);
+
+ nm_compat = TRUE;
+ }
+diff --git a/src/network.c b/src/network.c
+index 9da8fea..a5ec2b9 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -157,10 +157,10 @@ const char *__connman_iface_add_network(struct connman_iface *iface,
+
+ networks = g_slist_append(networks, network);
+
+- g_dbus_register_object(connection, path, network, network_free);
++ g_dbus_register_object(connection, path);
+
+ g_dbus_register_interface(connection, path, CONNMAN_NETWORK_INTERFACE,
+- network_methods, NULL, NULL);
++ network_methods, NULL, NULL, network, network_free);
+
+ return path;
+ }
============================================================
--- packages/libgdbus/libgdbus_git.bb 837b467c8f871d1e1e1dabf32c734ce77a19fac9
+++ packages/libgdbus/libgdbus_git.bb 837b467c8f871d1e1e1dabf32c734ce77a19fac9
@@ -0,0 +1,14 @@
+HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
+SUMMARY = "Moblin Glib D-Bus integration"
+LICENSE = "GPL LGPL"
+DEPENDS = "glib-2.0 dbus"
+PV = "0.0+git${SRCREV}"
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://moblin.org/repos/projects/libgdbus.git;proto=http"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc ccb23715f9a538db34a391160621a8fbcdbd8574
+++ conf/distro/include/sane-srcrevs.inc c34c8224b196b903a1d16225d75c370673a6fbcc
@@ -17,6 +17,7 @@ SRCREV_pn-uclibc-initial ?= "23129"
SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-uclibc ?= "23129"
SRCREV_pn-uclibc-initial ?= "23129"
+SRCREV_pn-connman ?= "f9f84ccfa0cd338e2de22878f277352436570b83"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-dasher-gpe ?= "1251"
SRCREV_pn-dbus-c++-native ?= "13131"
@@ -56,6 +57,7 @@ SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-libexalt ?= "78"
SRCREV_pn-libexalt-dbus ?= "76"
SRCREV_pn-libfakekey ?= "1455"
+SRCREV_pn-libgdbus ?= "6605699e3a1ff8275dcc359da7aa73e9d36996f2"
SRCREV_pn-libgsmd ?= "4335"
SRCREV_pn-libiac ?= "1590"
SRCREV_pn-libjana ?= "704"
More information about the Openembedded-commits
mailing list