* [CONSOLIDATED PULL 00/51] 14-June-2011
@ 2011-06-14 8:01 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 01/51] ghostscript: update SRC_URI Saul Wold
` (50 more replies)
0 siblings, 51 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Richard,
This has number fixes for various issues along with recipe updates.
While the autobuidler does not look so great, these have built on local
machines in a cleaner environment.
I removed the large patchset for GCC, it can be reviewed at the browse
URL below
Thanks
Sau!
The following changes since commit 6a3e57fcd3a172c9b2707510d65741734c98a143:
Revert "gcc: rebase the patch to avoid patch rejection" (2011-06-10 12:56:29 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Anders Darander (2):
perl-native: fix download url
runqemu: take TMPDIR from bitbake
Bruce Ashfield (1):
linux-yocto: rename recipes to explicitly indicate version
Dexuan Cui (14):
git: restore the dependency on perl-native
tcmode-default: fix PREFERRED_VERSION_gcc-cross-canadian
recipes: update Upstream-Status for multiple recipes' patches
gnome-doc-utils: upgrade from 0.20.5 to the latest version 0.20.6
startup-notification: upgrade from 0.10 to the latest version 0.12
util-macros: upgrade from 1.13.0 to the latest version 0.14.0
resourceproto: upgrade from 1.1.1 to the latest version 1.2.0
dri2proto: upgrade from 2.3 to the latest version 2.4
glproto: upgrade from 1.4.12 to the latest version 1.4.13
inputproto: upgrade from 2.0.1 to the latest version 2.0.2
pixman: upgrade from 0.20.2 to the latest stable 0.22.0
libxext: upgrade from 1.2.0 to the latest version 1.3.0
libxi: upgrade from 1.4.2 to the latest version 1.4.3
distro_tracking_fields.inc: update the info for the following recipes
Kang Kai (2):
ghostscript: update SRC_URI
eglibc: migrate configurability from oe
Khem Raj (6):
util-macros_1.13.0.bb: Depend on virtual/gettext instead of gettext
uclibc.inc: libsegfault is only RPROVIDED by uclibc
gettext_0.18.1.1.bb: Fix build on uclibc
uclibc: Cleanup the machine dependent config files
eglibc 2.12/2.13: Upgrade SRCREV
gcc-4.6.0: Bring in patches from FSF 4.6 branch
Koen Kooi (2):
qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them
connman-gnome 0.5: build from git
Phil Blundell (5):
busybox: backport distro-features handling from oe master
uclibc: fix compile error on i586
import recipe_sanity.bbclass from oe master
uclibc: remove redundant python code
uclibc: remove PACKAGE_ARCH
Richard Purdie (11):
pointercal: Inhibit toolchain dependencies as its just config files
formfactor: Inhibit toolchain dependencies as its just config files
keymaps: Inhibit toolchain dependencies as its just configuration
files
usbinit: Inherit allarch as its a generic script
base-files: Inherit toolchain dependencies as a compiler isn't used
poky-feed-opkg: Disable default toolchain dependencies as these are
just configuration files
initscripts: makedevs is no longer used anywhere so drop dependency.
Also inhibit compiler/libc dependencies as they're unused
sysvinit-inittab: Inhibit compiler/libc dependencies as this is just
a configuration file
initrdscripts: Inhibit compiler/libc dependencies as this is just a
configuration file
task-sdk-host: Add nativesdk to the task name so its clearer what the
contents of the task represent
nativesdk.bbclass: Correct ordering of manipulations
Saul Wold (8):
json-glib: Fix up SRC_URI Checksums
clutter-box2d_git: Switch SRC_URI to git.gnome.org
update-alternatives-dpkg: Fix SRC_URI Checksum
jsib-glib: Fix SRC_URI Checksum
rxvt-unicode: Fix SRC_URI & LIC_FILES Checksum
alsa-tools: fix Checksums
libx11-diet: Fixed checksum and rebase patch
autoconf/automake: Bump PR to resolve perl-native issue
meta/classes/nativesdk.bbclass | 53 +-
meta/classes/populate_sdk.bbclass | 2 +-
meta/classes/recipe_sanity.bbclass | 179 +
meta/conf/distro/include/default-distrovars.inc | 9 +-
.../conf/distro/include/distro_tracking_fields.inc | 113 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/conf/machine/include/qemu.inc | 2 +-
meta/recipes-bsp/formfactor/formfactor_0.0.bb | 1 +
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 2 +
meta/recipes-bsp/pointercal/pointercal_0.0.bb | 1 +
meta/recipes-bsp/usbinit/usbinit.bb | 4 +-
.../connman-gnome/applet_menu_popup_fix.patch | 19 -
.../connman/connman-gnome/connman-gnome.patch | 4162 --------------
.../remove-connman-property-desktop-file.patch | 42 -
.../connman-gnome/service_name_update.patch | 36 -
.../connman/connman-gnome_0.5.bb | 13 +-
meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +
meta/recipes-core/busybox/busybox.inc | 80 +-
meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
meta/recipes-core/eglibc/eglibc-options.inc | 62 +
meta/recipes-core/eglibc/eglibc.inc | 6 +
meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +-
meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +-
.../feed-config/poky-feed-config-opkg_1.0.bb | 1 +
.../gnulib-uclibc-sched_param-def.patch | 21 +
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 7 +-
.../initrdscripts/initramfs-live-install_1.0.bb | 1 +
meta/recipes-core/initscripts/initscripts_1.0.bb | 6 +-
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +
...task-sdk-host.bb => task-sdk-host-nativesdk.bb} | 0
.../uclibc/uclibc-git/armv5te/uClibc.machine | 4 +-
.../{nslu2be => armv5teb}/uClibc.machine | 0
.../uclibc/uclibc-git/efika/uClibc.machine | 45 -
.../uclibc/uclibc-git/epoll-asm-fix.patch | 25 +
.../uclibc-git/{qemumips => mips}/uClibc.machine | 0
.../uclibc/uclibc-git/qemuarm/uClibc.machine | 77 -
.../uclibc/uclibc-git/qemux86/uClibc.machine | 59 -
meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 14 +-
meta/recipes-core/uclibc/uclibc.inc | 19 +-
meta/recipes-core/uclibc/uclibc_git.bb | 6 +-
meta/recipes-devtools/autoconf/autoconf_2.68.bb | 2 +-
meta/recipes-devtools/automake/automake.inc | 2 +-
.../0002-Backport-from-mainline.patch | 3 +-
.../0003-Backport-from-mainline.patch | 3 +-
.../0004-Backport-from-mainline.patch | 3 +-
.../0005-Backport-from-mainline.patch | 3 +-
.../0006-Backport-from-mainline.patch | 3 +-
.../0007-Backport-from-mainline.patch | 3 +-
...26-Paolo-Carlini-paolo.carlini-oracle.com.patch | 3 +-
.../0009-Backport-from-mainline.patch | 3 +-
...-27-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 3 +-
...-03-28-Richard-Guenther-rguenther-suse.de.patch | 3 +-
.../gcc-4_6-branch-backports/0015-gcc.patch | 3 +-
.../0016-Backport-from-mainline.patch | 3 +-
.../0017-libgfortran.patch | 3 +-
...Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch | 3 +-
...-rx-rx.h-LABEL_ALIGN_AFTER_BARRIER-Define.patch | 3 +-
.../0021-c.opt-Add-std-c-03.patch | 3 +-
.../gcc-4_6-branch-backports/0022-PR-c-47570.patch | 3 +-
.../gcc-4_6-branch-backports/0023-PR-c-47504.patch | 3 +-
...ild_noexcept_spec-Call-cxx_constant_value.patch | 3 +-
.../gcc-4_6-branch-backports/0025-c-family.patch | 3 +-
...026-decl2.c-cp_check_const_attributes-New.patch | 3 +-
.../gcc-4_6-branch-backports/0027-Core-1148.patch | 3 +-
.../gcc-4_6-branch-backports/0028-PR-c-48313.patch | 3 +-
.../gcc-4_6-branch-backports/0029-PR-c-47999.patch | 3 +-
...non_dependent_expr-Keep-dereferences-outs.patch | 3 +-
...rence_binding-Allow-direct-binding-to-an-.patch | 3 +-
.../gcc-4_6-branch-backports/0032-Core-1232.patch | 3 +-
...-is_valid_constexpr_fn-Specify-input-loca.patch | 3 +-
.../gcc-4_6-branch-backports/0034-PR-c-48296.patch | 3 +-
.../gcc-4_6-branch-backports/0035-PR-c-48166.patch | 3 +-
...a-alpha.c-alpha_sr_alias_set-Don-t-define.patch | 3 +-
.../gcc-4_6-branch-backports/0038-PR-c-48319.patch | 3 +-
.../0039-PR-preprocessor-48248.patch | 3 +-
.../0040-PR-debug-48253.patch | 3 +-
.../gcc-4_6-branch-backports/0042-PR-c-48265.patch | 3 +-
.../0043-Fix-a-typo-in-FLOAT_SSE_REGS.patch | 3 +-
.../gcc-4_6-branch-backports/0044-PR-c-48281.patch | 3 +-
.../gcc-4_6-branch-backports/0045-PR-c-48369.patch | 3 +-
.../gcc-4_6-branch-backports/0046-PR-c-48212.patch | 3 +-
...-03-31-Richard-Guenther-rguenther-suse.de.patch | 3 +-
.../0049-PR-target-48142.patch | 3 +-
.../0050-PR-target-16292.patch | 3 +-
.../gcc-4_6-branch-backports/0051-PR-c-48280.patch | 3 +-
...07-from-trunk-to-the-4.6-release-branch-t.patch | 3 +-
.../0054-Backport-from-mainline.patch | 3 +-
...fig-spu-t-spu-elf-dp-bit.c-Use-instead-of.patch | 3 +-
...11-04-02-Jonathan-Wakely-redi-gcc.gnu.org.patch | 3 +-
...-de.po-el.po-es.po-fi.po-fr.po-id.po-ja.p.patch | 3 +-
...-da.po-de.po-el.po-es.po-fi.po-fr.po-id.p.patch | 3 +-
...n.dg-bessel_6.f90-Use-dg-add-options-ieee.patch | 3 +-
...4-2011-04-04-Janus-Weil-janus-gcc.gnu.org.patch | 3 +-
.../0065-es.po-Update.patch | 3 +-
...ers-for-functions-from-the-frexp-family-w.patch | 3 +-
...-04-05-Richard-Guenther-rguenther-suse.de.patch | 3 +-
....c-self_referential_size-Fix-2010-07-13-c.patch | 3 +-
.../0070-de.po-Update.patch | 3 +-
...ov-io.c-Use-GCC-Runtime-Library-Exception.patch | 3 +-
.../0073-Backported-from-mainline.patch | 3 +-
.../0074-PR-debug-48466.patch | 3 +-
...73-from-trunk-to-the-4.6-release-branch-t.patch | 3 +-
.../0077-Backport-from-mainline.patch | 3 +-
.../0078-de.po-Update.patch | 3 +-
.../0079-PR-debug-48343.patch | 3 +-
.../0080-PR-fortran-48117.patch | 3 +-
...-config-i386-sse.md-Update-copyright-year.patch | 3 +-
...ure-stackalign-non-local-goto-5.c-Fix-for.patch | 3 +-
.../0084-PR-tree-optimization-48377.patch | 3 +-
.../0085-de.po-Update.patch | 3 +-
.../gcc-4_6-branch-backports/0086-PR-c-48450.patch | 3 +-
....c-finish_decltype_type-Add-complain-parm.patch | 3 +-
.../gcc-4_6-branch-backports/0088-PR-c-48452.patch | 3 +-
.../gcc-4_6-branch-backports/0089-PR-c-48468.patch | 3 +-
.../gcc-4_6-branch-backports/0090-PR-c-48500.patch | 3 +-
...1-04-08-Steven-G.-Kargl-kargl-gcc.gnu.org.patch | 3 +-
.../0092-PR-testsuite-48506.patch | 3 +-
...ther-than-crashing-in-array_type_nelts-if.patch | 3 +-
.../gcc-4_6-branch-backports/0095-PR-c-48528.patch | 3 +-
...-10-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 3 +-
...-10-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 3 +-
...-10-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 3 +-
.../0101-Backport-from-mainline.patch | 3 +-
...2-common.opt-Tbss-Tdata-Ttext-New-options.patch | 3 +-
.../gcc-4_6-branch-backports/0104-PR-c-48523.patch | 3 +-
.../gcc-4_6-branch-backports/0105-PR-c-48534.patch | 3 +-
.../gcc-4_6-branch-backports/0106-PR-c-48517.patch | 3 +-
...011-04-12-Allan-McRae-allan-archlinux.org.patch | 3 +-
...-v850.c-expand_prologue-Do-not-use-the-CA.patch | 3 +-
.../0109-PR-rtl-optimization-48549.patch | 3 +-
...-2011-04-12-Martin-Jambor-mjambor-suse.cz.patch | 3 +-
.../0112-Fix-PR-target-48090.patch | 3 +-
.../0113-Fix-PR-c-48574.patch | 3 +-
.../gcc-4_6-branch-backports/0114-PR-c-48570.patch | 3 +-
.../0115-PR-middle-end-48591.patch | 3 +-
...-2011-04-13-Paul-Thomas-pault-gcc.gnu.org.patch | 3 +-
.../gcc-4_6-branch-backports/0117-PR-c-48594.patch | 3 +-
.../0118-sv.po-Update.patch | 3 +-
.../0119-Backport-from-mainline.patch | 3 +-
.../0122-PR-target-48605.patch | 3 +-
.../0123-PR-target-48614.patch | 3 +-
...Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch | 3 +-
...04-15-Takaya-Saito-gintensubaru-gmail.com.patch | 3 +-
...15-Paolo-Carlini-paolo.carlini-oracle.com.patch | 3 +-
...ibjava.jni-jni.exp-gcj_jni_get_cxxflags_i.patch | 3 +-
...Daniel-Krugler-daniel.kruegler-googlemail.patch | 3 +-
...Daniel-Krugler-daniel.kruegler-googlemail.patch | 3 +-
.../0132-PR-lto-48538.patch | 3 +-
...c-freebsd.h-CPP_CPU64_DEFAULT_SPEC-Replac.patch | 3 +-
...Daniel-Krugler-daniel.kruegler-googlemail.patch | 3 +-
.../0135-doc-passes.texi-Fill-crossref-nodes.patch | 3 +-
...ce-Make-lang.in-gnatbind-Replace-ALL_CFLA.patch | 3 +-
.../0138-PR-tree-optimization-48616.patch | 3 +-
...-04-18-Richard-Guenther-rguenther-suse.de.patch | 3 +-
...x-weakref-trickery-breakage-on-alpha-dec-.patch | 3 +-
...-is_redundant_typedef-Add-inline-to-proto.patch | 3 +-
.../gcc-4_6-branch-backports/0142-PR-c-48632.patch | 3 +-
.../0143-PR-middle-end-48661.patch | 3 +-
.../gcc-4_6-branch-backports/0144-PR-c-48537.patch | 3 +-
.../0146-PR-testsuite-48675.patch | 3 +-
...-04-18-Richard-Guenther-rguenther-suse.de.patch | 3 +-
.../0149-PR-target-48678.patch | 3 +-
.../gcc-4_6-branch-backports/0151-PR-c-46304.patch | 3 +-
...tstrap-lto.mk-Remove-obsolete-requirement.patch | 3 +-
...-04-20-Richard-Guenther-rguenther-suse.de.patch | 3 +-
.../0154-Backport-from-mainline.patch | 3 +-
.../0155-PR-tree-optimization-48611.patch | 3 +-
.../gcc-4_6-branch-backports/0156-PR-c-48657.patch | 3 +-
.../0157-PR-target-48288.patch | 3 +-
.../gcc-4_6-branch-backports/0159-PR-c-48594.patch | 3 +-
...-finish_compound_literal-Don-t-put-an-arr.patch | 3 +-
...lk_gimple_op-GIMPLE_CALL-Fix-couple-of-ov.patch | 3 +-
...-04-21-Richard-Guenther-rguenther-suse.de.patch | 3 +-
.../0163-de.po-Update.patch | 3 +-
.../0164-PR-target-48708.patch | 3 +-
.../gcc-4_6-branch-backports/0166-PR-c-48716.patch | 3 +-
.../0167-PR-target-48723.patch | 3 +-
.../0168-PR-tree-optimization-48717.patch | 3 +-
.../gcc-4_6-branch-backports/0170-Revert.patch | 3 +-
.../gcc-4_6-branch-backports/0171-PR-c-48685.patch | 3 +-
...616.c-dg-options-Add-fno-common-to-option.patch | 3 +-
...-23-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 3 +-
.../0174-PR-preprocessor-48740.patch | 3 +-
...24-Paolo-Carlini-paolo.carlini-oracle.com.patch | 3 +-
.../gcc-4_6-branch-backports/0178-PR-c-48707.patch | 3 +-
...-2011-04-26-Tobias-Burnus-burnus-net-b.de.patch | 3 +-
...-04-26-Richard-Guenther-rguenther-suse.de.patch | 3 +-
.../0182-PR-tree-optimization-48734.patch | 3 +-
.../0183-PR-debug-48768.patch | 3 +-
.../0184-de.po-Update.patch | 3 +-
.../gcc-4_6-branch-backports/0185-PR-c-48726.patch | 3 +-
.../gcc-4_6-branch-backports/0187-PR-c-42687.patch | 3 +-
.../gcc-4_6-branch-backports/0188-PR-c-48742.patch | 3 +-
...gcc.dg-20020312-2.c-Add-definition-for-RX.patch | 3 +-
.../gcc-4_6-branch-backports/0190-PR-c-48046.patch | 3 +-
.../0192-PR-middle-end-48597.patch | 3 +-
...-2011-04-28-Tobias-Burnus-burnus-net-b.de.patch | 3 +-
...-2011-04-28-Tobias-Burnus-burnus-net-b.de.patch | 3 +-
.../0195-Fix-PR-c-48656.patch | 3 +-
.../0196-Backport-4.7-patchtes-to-4.6.patch | 3 +-
...-2011-04-29-Tobias-Burnus-burnus-net-b.de.patch | 3 +-
...29-Paolo-Carlini-paolo.carlini-oracle.com.patch | 3 +-
.../0201-PR-tree-optimization-48809.patch | 199 +
...-2011-04-30-Paul-Thomas-pault-gcc.gnu.org.patch | 198 +
...04-30-Jerry-DeLisle-jvdelisle-gcc.gnu.org.patch | 108 +
...-2011-04-30-Doug-Kwan-dougkwan-google.com.patch | 38 +
.../0207-Backport-from-mainline.patch | 132 +
.../0209-PR-target-48723.patch | 26 +
...-05-03-Richard-Guenther-rguenther-suse.de.patch | 45 +
.../0211-PR-target-48774.patch | 78 +
...03-Paolo-Carlini-paolo.carlini-oracle.com.patch | 462 ++
...-sso_string_base.h-__sso_string_base-_M_c.patch | 178 +
...-i386.md-movdi_internal_rex64-TYPE_SSEMOV.patch | 244 +
...1-05-04-Steven-G.-Kargl-kargl-gcc.gnu.org.patch | 189 +
.../gcc-4_6-branch-backports/0218-PR-c-48749.patch | 59 +
.../0219-Backport-from-mainline.patch | 145 +
.../gcc-4_6-branch-backports/0220-gcc.patch | 55 +
.../0221-PR-ada-48844.patch | 182 +
.../gcc-4_6-branch-backports/0222-PR-c-40975.patch | 55 +
...0223-Add-missing-break-for-OPT_mfpu_-case.patch | 21 +
...-06-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 5993 ++++++++++++++++++++
.../0226-Fix-PR-c-48838.patch | 112 +
.../0227-PR-fortran-48894.patch | 136 +
...Ramana-Radhakrishnan-ramana.radhakrishnan.patch | 28 +
...Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch | 58 +
.../0230-PR-target-48900.patch | 44 +
...86-i386.md-movdf_internal_nointeger-Apply.patch | 23 +
.../gcc-4_6-branch-backports/0232-PR-c-48089.patch | 77 +
.../gcc-4_6-branch-backports/0233-PR-c-48446.patch | 183 +
.../gcc-4_6-branch-backports/0234-PR-c-48911.patch | 96 +
.../gcc-4_6-branch-backports/0235-PR-c-48909.patch | 73 +
...acking.c-find_mem_expr_in_1pdv-Fix-thinko.patch | 49 +
.../0240-Fix-PR-c-48574.patch | 63 +
...Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch | 26 +
...09-Paolo-Carlini-paolo.carlini-oracle.com.patch | 44 +
.../0244-PR-tree-optimization-48611.patch | 77 +
.../0245-Backported-from-mainline.patch | 73 +
...x.h-JUMP_ALIGN-LABEL_ALIGN-LOOP_ALIGN-Def.patch | 76 +
...x.c-rx_memory_move_cost-Reduce-the-cost-f.patch | 23 +
.../0249-Fix-PRs-48857-48495.patch | 216 +
.../0251-gcc-cp-ChangeLog.patch | 55 +
.../0252-PR-debug-48159.patch | 198 +
...-2011-05-11-Tobias-Burnus-burnus-net-b.de.patch | 159 +
...non_dependent_expr-Don-t-check-null_ptr_c.patch | 24 +
...onfig-rx-rx.h-HAVE_PRE_DECREMENT-Fix-typo.patch | 59 +
.../0257-zh_CN.po-Update.patch | 37 +
.../0258-PR-debug-48967.patch | 134 +
...-05-12-Richard-Guenther-rguenther-suse.de.patch | 100 +
.../0260-PR-tree-optimization-48975.patch | 61 +
.../0263-zh_CN.po-Update.patch | 5328 +++++++++++++++++
...-i386.md-movxf_internal-Disable-CONST_DOU.patch | 127 +
.../0267-PR-preprocessor-48677.patch | 31 +
.../0269-PR-target-48986.patch | 40 +
...x.md-Add-peephole-to-remove-redundant-ext.patch | 126 +
...x.c-rx_memory_move_cost-Include-cost-of-r.patch | 28 +
.../0273-PR-tree-optimization-49000.patch | 39 +
.../0274-PR-tree-optimization-49000.patch | 52 +
...-05-18-Richard-Guenther-rguenther-suse.de.patch | 138 +
...-05-18-Richard-Guenther-rguenther-suse.de.patch | 111 +
...-05-18-Richard-Guenther-rguenther-suse.de.patch | 81 +
.../0278-PR-tree-optimization-49039.patch | 217 +
.../0279-Properly-handle-256bit-load-cast.patch | 95 +
.../gcc-4_6-branch-backports/0281-PR-c-48869.patch | 460 ++
...2-gcc.c-torture-execute-960321-1.x-Remove.patch | 30 +
.../0283-zh_CN.po-Update.patch | 1529 +++++
.../gcc-4_6-branch-backports/0284-PR-c-49043.patch | 50 +
...-2011-05-19-Uros-Bizjak-ubizjak-gmail.com.patch | 67 +
.../0287-PR-tree-optimization-49073.patch | 121 +
...-05-20-Richard-Guenther-rguenther-suse.de.patch | 117 +
.../0289-PR-bootstrap-49086.patch | 35 +
.../gcc-4_6-branch-backports/0290-PR-c-48873.patch | 45 +
.../gcc-4_6-branch-backports/0291-PR-c-48736.patch | 40 +
.../gcc-4_6-branch-backports/0292-PR-c-48745.patch | 59 +
...-register_constexpr_fundef-Add-to-hash-ta.patch | 81 +
...-validate_constexpr_fundecl-Check-DECL_TE.patch | 42 +
.../gcc-4_6-branch-backports/0295-PR-c-48948.patch | 188 +
.../gcc-4_6-branch-backports/0296-DR-1073.patch | 156 +
.../0298-In-gcc-objc.patch | 31 +
.../gcc-4_6-branch-backports/0299-PR-c-49066.patch | 34 +
...c-sparc.c-eligible_for_return_delay-Do-no.patch | 65 +
...c-sparc.md-setjmp-Handle-PIC-mode-and-use.patch | 56 +
.../gcc-4_6-branch-backports/0303-PR-c-48780.patch | 49 +
.../gcc-4_6-branch-backports/0304-PR-c-48945.patch | 45 +
.../0305-PR-middle-end-49029.patch | 52 +
.../0306-PR-target-49104.patch | 63 +
...07-config.gcc-sparc-elf-Add-sparc-t-crtin.patch | 150 +
.../gcc-4_6-branch-backports/0308-PR-c-48647.patch | 97 +
...-22-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 185 +
.../0311-PR-middle-end-48973.patch | 101 +
.../gcc-4_6-branch-backports/0312-PR-c-49120.patch | 50 +
.../0313-PR-debug-49032.patch | 90 +
.../0314-PR-lto-49123.patch | 49 +
.../0316-Always-add-mno-XXX-for-march-native.patch | 98 +
.../0317-PR-target-49133.patch | 93 +
...c-sparc.c-sparc_option_override-If-not-se.patch | 27 +
.../gcc-4_6-branch-backports/0320-PR-c-48617.patch | 37 +
.../gcc-4_6-branch-backports/0321-PR-c-47544.patch | 57 +
.../gcc-4_6-branch-backports/0322-PR-c-47336.patch | 53 +
.../gcc-4_6-branch-backports/0323-PR-c-47263.patch | 45 +
.../gcc-4_6-branch-backports/0324-PR-c-49105.patch | 75 +
.../gcc-4_6-branch-backports/0325-PR-c-48884.patch | 86 +
.../gcc-4_6-branch-backports/0326-PR-c-49042.patch | 63 +
.../gcc-4_6-branch-backports/0327-PR-c-49136.patch | 142 +
.../gcc-4_6-branch-backports/0328-In-libobjc.patch | 81 +
...24-Paolo-Carlini-paolo.carlini-oracle.com.patch | 62 +
.../0330-PR-tree-optimization-44897.patch | 24 +
.../0331-PR-target-49128.patch | 23 +
.../gcc-4_6-branch-backports/0332-PR-c-48292.patch | 71 +
.../gcc-4_6-branch-backports/0333-PR-c-45080.patch | 59 +
.../gcc-4_6-branch-backports/0334-PR-c-45418.patch | 50 +
.../gcc-4_6-branch-backports/0335-PR-c-48935.patch | 76 +
...arm-fp16-compile-none-1.c-Update-expected.patch | 74 +
.../gcc-4_6-branch-backports/0337-PR-c-47184.patch | 64 +
.../gcc-4_6-branch-backports/0338-PR-c-46696.patch | 48 +
.../gcc-4_6-branch-backports/0339-PR-c-46245.patch | 88 +
.../gcc-4_6-branch-backports/0340-PR-c-46145.patch | 37 +
.../gcc-4_6-branch-backports/0341-PR-c-45698.patch | 44 +
.../gcc-4_6-branch-backports/0342-PR-c-44311.patch | 125 +
.../0343-gcc-cp-ChangeLog.patch | 207 +
...25-Paolo-Carlini-paolo.carlini-oracle.com.patch | 76 +
...25-Paolo-Carlini-paolo.carlini-oracle.com.patch | 78 +
.../gcc-4_6-branch-backports/0347-PR-c-45401.patch | 51 +
.../gcc-4_6-branch-backports/0348-PR-c-49156.patch | 62 +
.../0349-PR-tree-optimization-49161.patch | 200 +
.../gcc-4_6-branch-backports/0350-PR-c-49165.patch | 89 +
.../0351-PR-target-44643.patch | 44 +
.../gcc-4_6-branch-backports/0352-PR-c-48424.patch | 105 +
...00-rs6000.c-rs6000_register_move_cost-Mak.patch | 28 +
...-2011-05-26-Paul-Thomas-pault-gcc.gnu.org.patch | 168 +
.../gcc-4_6-branch-backports/0357-PR-c-48657.patch | 149 +
.../gcc-4_6-branch-backports/0358-PR-c-49165.patch | 89 +
.../gcc-4_6-branch-backports/0359-PR-c-48284.patch | 40 +
.../gcc-4_6-branch-backports/0360-PR-c-47277.patch | 38 +
.../gcc-4_6-branch-backports/0362-PR-c-47049.patch | 62 +
...-05-29-Richard-Guenther-rguenther-suse.de.patch | 68 +
.../gcc-4_6-branch-backports/0365-gcc.patch | 125 +
.../gcc-4_6-branch-backports/0366-gcc.patch | 52 +
...d-PR-target-43700-to-last-changelog-entry.patch | 7 +
.../0369-PR-target-45263.patch | 71 +
...-05-30-Richard-Guenther-rguenther-suse.de.patch | 69 +
.../gcc-4_6-branch-backports/0371-PR-c-49223.patch | 99 +
...-05-31-Richard-Guenther-rguenther-suse.de.patch | 72 +
...-05-31-Richard-Guenther-rguenther-suse.de.patch | 64 +
..._fmsubadd-and-fma4_fmaddsub-mode-suffixes.patch | 36 +
...1-05-31-Thomas-Koenig-tkoenig-gcc.gnu.org.patch | 237 +
.../0379-PR-tree-optimization-49093.patch | 61 +
...1-06-02-Steven-G.-Kargl-kargl-gcc.gnu.org.patch | 139 +
.../gcc-4_6-branch-backports/0382-PR-c-49276.patch | 62 +
.../0384-PR-tree-optimization-49038.patch | 367 ++
.../0385-PR-debug-47590.patch | 490 ++
...-04-Jonathan-Wakely-jwakely.gcc-gmail.com.patch | 29 +
.../0388-PR-target-49186.patch | 48 +
...c-sparc.c-output_return-Fix-thinko-in-the.patch | 45 +
.../gcc-4_6-branch-backports/0391-PR-c-49134.patch | 24 +
...-06-06-Richard-Guenther-rguenther-suse.de.patch | 267 +
...11-06-06-Mikael-Pettersson-mikpe-it.uu.se.patch | 59 +
...Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch | 27 +
.../gcc-4_6-branch-backports/0395-PR-c-49264.patch | 134 +
.../0396-PR-fortran-49268.patch | 88 +
...00-rs6000.h-REG_CLASS_CONTENTS-Remove-vr0.patch | 23 +
.../gcc-4_6-branch-backports/0398-PR-c-49298.patch | 37 +
.../0400-PR-gcov-profile-49299.patch | 158 +
.../gcc-4_6-branch-backports/0401-PR-c-48780.patch | 63 +
.../0403-PR-target-49238.patch | 53 +
...404-Support-unknown-Intel-family-0x6-CPUs.patch | 48 +
...c-sparc.md-return_internal-Adjust-length-.patch | 24 +
...-potential_constant_expression_1-Handle-d.patch | 35 +
...-finish_compound_literal-Set-TREE_HAS_CON.patch | 22 +
.../0410-lib-target-supports.exp.patch | 34 +
...te-gcc.target-arm-20090811-1.c-Skip-for-i.patch | 79 +
...-sse.md-vec_dupv4sf-Correct-mode-of-force.patch | 50 +
.../gcc/gcc-4_6-branch-backports.inc | 170 +-
meta/recipes-devtools/git/git.inc | 6 +-
meta/recipes-devtools/git/git_1.7.5.1.bb | 2 +-
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 2 +-
.../update-alternatives-dpkg_1.16.0.3.bb | 4 +-
.../ghostscript/ghostscript_9.02.bb | 19 +-
.../gnome/gnome-doc-utils/xsltproc_nonet.patch | 2 +-
...c-utils_0.20.5.bb => gnome-doc-utils_0.20.6.bb} | 6 +-
meta/recipes-gnome/json-glib/json-glib_0.12.4.bb | 4 +-
meta/recipes-graphics/clutter/clutter-box2d_git.bb | 2 +-
...cation_0.10.bb => startup-notification_0.12.bb} | 4 +-
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 14 +-
.../xorg-lib/libx11/X18NCMSstubs.diff | 62 +-
.../{libxext_1.2.0.bb => libxext_1.3.0.bb} | 6 +-
.../xorg-lib/{libxi_1.4.2.bb => libxi_1.4.3.bb} | 6 +-
.../{pixman_0.20.2.bb => pixman_0.22.0.bb} | 8 +-
.../{dri2proto_2.3.bb => dri2proto_2.4.bb} | 4 +-
.../{glproto_1.4.12.bb => glproto_1.4.13.bb} | 4 +-
.../{inputproto_2.0.1.bb => inputproto_2.0.2.bb} | 4 +-
...sourceproto_1.1.1.bb => resourceproto_1.2.0.bb} | 6 +-
...util-macros_1.13.0.bb => util-macros_1.14.0.bb} | 8 +-
...x-yocto-stable_git.bb => linux-yocto_2.6.34.bb} | 0
.../{linux-yocto_git.bb => linux-yocto_2.6.37.bb} | 0
.../lttng/lttng-ust/uclibc-sched_getcpu.patch | 2 +-
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 7 +-
meta/recipes-qt/meta/meta-toolchain-qte.bb | 2 +-
...ost.bb => task-qte-toolchain-host-nativesdk.bb} | 2 +-
.../recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb | 8 +-
scripts/runqemu | 22 +-
400 files changed, 28781 insertions(+), 4987 deletions(-)
create mode 100644 meta/classes/recipe_sanity.bbclass
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc
create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
rename meta/recipes-core/tasks/{task-sdk-host.bb => task-sdk-host-nativesdk.bb} (100%)
rename meta/recipes-core/uclibc/uclibc-git/{nslu2be => armv5teb}/uClibc.machine (100%)
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine
create mode 100644 meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch
rename meta/recipes-core/uclibc/uclibc-git/{qemumips => mips}/uClibc.machine (100%)
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uClibc.config
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0201-PR-tree-optimization-48809.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0202-2011-04-30-Paul-Thomas-pault-gcc.gnu.org.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0203-2011-04-30-Jerry-DeLisle-jvdelisle-gcc.gnu.org.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0205-2011-04-30-Doug-Kwan-dougkwan-google.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0207-Backport-from-mainline.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0209-PR-target-48723.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0210-2011-05-03-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0211-PR-target-48774.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0212-2011-05-03-Paolo-Carlini-paolo.carlini-oracle.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0214-include-ext-sso_string_base.h-__sso_string_base-_M_c.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0215-config-i386-i386.md-movdi_internal_rex64-TYPE_SSEMOV.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0216-2011-05-04-Steven-G.-Kargl-kargl-gcc.gnu.org.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0218-PR-c-48749.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0219-Backport-from-mainline.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0220-gcc.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0221-PR-ada-48844.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0222-PR-c-40975.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0223-Add-missing-break-for-OPT_mfpu_-case.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0224-2011-05-06-Jonathan-Wakely-jwakely.gcc-gmail.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0226-Fix-PR-c-48838.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0227-PR-fortran-48894.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0228-2011-05-06-Ramana-Radhakrishnan-ramana.radhakrishnan.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0229-2011-05-06-Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0230-PR-target-48900.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0231-config-i386-i386.md-movdf_internal_nointeger-Apply.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0232-PR-c-48089.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0233-PR-c-48446.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0234-PR-c-48911.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0235-PR-c-48909.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0239-var-tracking.c-find_mem_expr_in_1pdv-Fix-thinko.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0240-Fix-PR-c-48574.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0241-2011-05-09-Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0242-2011-05-09-Paolo-Carlini-paolo.carlini-oracle.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0244-PR-tree-optimization-48611.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0245-Backported-from-mainline.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0246-config-rx-rx.h-JUMP_ALIGN-LABEL_ALIGN-LOOP_ALIGN-Def.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0248-config-rx-rx.c-rx_memory_move_cost-Reduce-the-cost-f.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0249-Fix-PRs-48857-48495.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0251-gcc-cp-ChangeLog.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0252-PR-debug-48159.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0253-2011-05-11-Tobias-Burnus-burnus-net-b.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0255-pt.c-build_non_dependent_expr-Don-t-check-null_ptr_c.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0256-config-rx-rx.h-HAVE_PRE_DECREMENT-Fix-typo.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0257-zh_CN.po-Update.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0258-PR-debug-48967.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0259-2011-05-12-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0260-PR-tree-optimization-48975.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0263-zh_CN.po-Update.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0266-config-i386-i386.md-movxf_internal-Disable-CONST_DOU.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0267-PR-preprocessor-48677.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0269-PR-target-48986.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0270-config-rx-rx.md-Add-peephole-to-remove-redundant-ext.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0271-config-rx-rx.c-rx_memory_move_cost-Include-cost-of-r.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0273-PR-tree-optimization-49000.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0274-PR-tree-optimization-49000.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0275-2011-05-18-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0276-2011-05-18-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0277-2011-05-18-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0278-PR-tree-optimization-49039.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0279-Properly-handle-256bit-load-cast.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0281-PR-c-48869.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0282-gcc.c-torture-execute-960321-1.x-Remove.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0283-zh_CN.po-Update.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0284-PR-c-49043.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0285-2011-05-19-Uros-Bizjak-ubizjak-gmail.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0287-PR-tree-optimization-49073.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0288-2011-05-20-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0289-PR-bootstrap-49086.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0290-PR-c-48873.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0291-PR-c-48736.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0292-PR-c-48745.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0293-semantics.c-register_constexpr_fundef-Add-to-hash-ta.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0294-semantics.c-validate_constexpr_fundecl-Check-DECL_TE.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0295-PR-c-48948.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0296-DR-1073.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0298-In-gcc-objc.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0299-PR-c-49066.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0300-config-sparc-sparc.c-eligible_for_return_delay-Do-no.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0301-config-sparc-sparc.md-setjmp-Handle-PIC-mode-and-use.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0303-PR-c-48780.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0304-PR-c-48945.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0305-PR-middle-end-49029.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0306-PR-target-49104.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0307-config.gcc-sparc-elf-Add-sparc-t-crtin.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0308-PR-c-48647.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0309-2011-05-22-Jonathan-Wakely-jwakely.gcc-gmail.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0311-PR-middle-end-48973.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0312-PR-c-49120.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0313-PR-debug-49032.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0314-PR-lto-49123.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0316-Always-add-mno-XXX-for-march-native.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0317-PR-target-49133.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0318-config-sparc-sparc.c-sparc_option_override-If-not-se.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0320-PR-c-48617.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0321-PR-c-47544.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0322-PR-c-47336.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0323-PR-c-47263.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0324-PR-c-49105.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0325-PR-c-48884.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0326-PR-c-49042.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0327-PR-c-49136.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0328-In-libobjc.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0329-2011-05-24-Paolo-Carlini-paolo.carlini-oracle.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0330-PR-tree-optimization-44897.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0331-PR-target-49128.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0332-PR-c-48292.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0333-PR-c-45080.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0334-PR-c-45418.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0335-PR-c-48935.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0336-gcc.target-arm-fp16-compile-none-1.c-Update-expected.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0337-PR-c-47184.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0338-PR-c-46696.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0339-PR-c-46245.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0340-PR-c-46145.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0341-PR-c-45698.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0342-PR-c-44311.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0343-gcc-cp-ChangeLog.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0344-2011-05-25-Paolo-Carlini-paolo.carlini-oracle.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0345-2011-05-25-Paolo-Carlini-paolo.carlini-oracle.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0347-PR-c-45401.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0348-PR-c-49156.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0349-PR-tree-optimization-49161.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0350-PR-c-49165.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0351-PR-target-44643.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0352-PR-c-48424.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0354-config-rs6000-rs6000.c-rs6000_register_move_cost-Mak.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0355-2011-05-26-Paul-Thomas-pault-gcc.gnu.org.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0357-PR-c-48657.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0358-PR-c-49165.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0359-PR-c-48284.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0360-PR-c-47277.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0362-PR-c-47049.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0364-2011-05-29-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0365-gcc.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0366-gcc.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0367-Add-PR-target-43700-to-last-changelog-entry.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0369-PR-target-45263.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0370-2011-05-30-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0371-PR-c-49223.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0373-2011-05-31-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0374-2011-05-31-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0375-Fix-fma4_fmsubadd-and-fma4_fmaddsub-mode-suffixes.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0376-2011-05-31-Thomas-Koenig-tkoenig-gcc.gnu.org.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0379-PR-tree-optimization-49093.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0380-2011-06-02-Steven-G.-Kargl-kargl-gcc.gnu.org.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0382-PR-c-49276.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0384-PR-tree-optimization-49038.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0385-PR-debug-47590.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0386-2011-06-04-Jonathan-Wakely-jwakely.gcc-gmail.com.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0388-PR-target-49186.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0389-config-sparc-sparc.c-output_return-Fix-thinko-in-the.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0391-PR-c-49134.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0392-2011-06-06-Richard-Guenther-rguenther-suse.de.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0393-2011-06-06-Mikael-Pettersson-mikpe-it.uu.se.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0394-2011-06-06-Andreas-Krebbel-Andreas.Krebbel-de.ibm.co.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0395-PR-c-49264.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0396-PR-fortran-49268.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0397-config-rs6000-rs6000.h-REG_CLASS_CONTENTS-Remove-vr0.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0398-PR-c-49298.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0400-PR-gcov-profile-49299.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0401-PR-c-48780.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0403-PR-target-49238.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0404-Support-unknown-Intel-family-0x6-CPUs.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0406-config-sparc-sparc.md-return_internal-Adjust-length-.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0408-semantics.c-potential_constant_expression_1-Handle-d.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0409-semantics.c-finish_compound_literal-Set-TREE_HAS_CON.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0410-lib-target-supports.exp.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0411-gcc-testsuite-gcc.target-arm-20090811-1.c-Skip-for-i.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0413-config-i386-sse.md-vec_dupv4sf-Correct-mode-of-force.patch
rename meta/recipes-gnome/gnome/{gnome-doc-utils_0.20.5.bb => gnome-doc-utils_0.20.6.bb} (56%)
rename meta/recipes-graphics/startup-notification/{startup-notification_0.10.bb => startup-notification_0.12.bb} (87%)
rename meta/recipes-graphics/xorg-lib/{libxext_1.2.0.bb => libxext_1.3.0.bb} (76%)
rename meta/recipes-graphics/xorg-lib/{libxi_1.4.2.bb => libxi_1.4.3.bb} (80%)
rename meta/recipes-graphics/xorg-lib/{pixman_0.20.2.bb => pixman_0.22.0.bb} (66%)
rename meta/recipes-graphics/xorg-proto/{dri2proto_2.3.bb => dri2proto_2.4.bb} (76%)
rename meta/recipes-graphics/xorg-proto/{glproto_1.4.12.bb => glproto_1.4.13.bb} (77%)
rename meta/recipes-graphics/xorg-proto/{inputproto_2.0.1.bb => inputproto_2.0.2.bb} (78%)
rename meta/recipes-graphics/xorg-proto/{resourceproto_1.1.1.bb => resourceproto_1.2.0.bb} (61%)
rename meta/recipes-graphics/xorg-util/{util-macros_1.13.0.bb => util-macros_1.14.0.bb} (66%)
rename meta/recipes-kernel/linux/{linux-yocto-stable_git.bb => linux-yocto_2.6.34.bb} (100%)
rename meta/recipes-kernel/linux/{linux-yocto_git.bb => linux-yocto_2.6.37.bb} (100%)
rename meta/recipes-qt/tasks/{task-qte-toolchain-host.bb => task-qte-toolchain-host-nativesdk.bb} (70%)
--
1.7.3.4
^ permalink raw reply [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 01/51] ghostscript: update SRC_URI
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 02/51] busybox: backport distro-features handling from oe master Saul Wold
` (49 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Build ghostscript-native fails on a i686 machine because it can't get
the source objarch.h and soobjarch.h, and .h files are not needed for
native package, so update the SRC_URI to fix it.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Removed the do_configure_prepend and folded into the target do_configure
since the native was picking it up for the do_configure_virtclass/native()
and then failing on i686.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../ghostscript/ghostscript_9.02.bb | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index e3d32dd..3cb5485 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -15,17 +15,20 @@ SECTION = "console/utils"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
-PR = "r1"
+PR = "r2"
DEPENDS = "${PN}-native tiff jpeg fontconfig cups"
DEPENDS_virtclass-native = ""
-SRC_URI = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2 \
+SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
+
+SRC_URI = "${SRC_URI_BASE} \
file://ghostscript-9.02-prevent_recompiling.patch \
file://ghostscript-9.02-genarch.patch \
file://objarch.h \
file://soobjarch.h \
"
+SRC_URI_virtclass-native = "${SRC_URI_BASE}"
SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
@@ -34,14 +37,12 @@ EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-j
inherit autotools
-do_configure_prepend () {
- mkdir -p obj
- mkdir -p soobj
- cp ${WORKDIR}/objarch.h obj/arch.h
- cp ${WORKDIR}/soobjarch.h soobj/arch.h
-}
-
do_configure () {
+ mkdir -p obj
+ mkdir -p soobj
+ cp ${WORKDIR}/objarch.h obj/arch.h
+ cp ${WORKDIR}/soobjarch.h soobj/arch.h
+
oe_runconf
# copy tools from the native ghostscript build
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 02/51] busybox: backport distro-features handling from oe master
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 01/51] ghostscript: update SRC_URI Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 03/51] git: restore the dependency on perl-native Saul Wold
` (48 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Phil Blundell
From: Phil Blundell <pb@pbcl.net>
This is a backport from oe master of the code which adjusts the busybox
config according to DISTRO_FEATURES etc.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/recipes-core/busybox/busybox.inc | 80 ++++++++++++++++++++++++++-
meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
2 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 86fbdae..b697e88 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -35,8 +35,85 @@ RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
inherit cml1 update-rc.d
+# internal helper
+def busybox_cfg(feature, features, tokens, cnf, rem):
+ if type(tokens) == type(""):
+ tokens = [tokens]
+ rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens])
+ if type(features) == type([]) and feature in features:
+ cnf.extend([token + '=y' for token in tokens])
+ else:
+ cnf.extend(['# ' + token + ' is not set' for token in tokens])
+
+# Map distro and machine features to config settings
+def features_to_busybox_settings(d):
+ cnf, rem = ([], [])
+ distro_features = bb.data.getVar('DISTRO_FEATURES', d).split()
+ machine_features = bb.data.getVar('MACHINE_FEATURES', d).split()
+ busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem)
+ busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem)
+ busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
+ busybox_cfg('nls', distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem)
+ busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
+ busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
+ busybox_cfg('kernel24', machine_features, 'CONFIG_FEATURE_2_4_MODULES', cnf, rem)
+ return "\n".join(cnf), "\n".join(rem)
+
+# X, Y = ${@features_to_uclibc_settings(d)}
+# unfortunately doesn't seem to work with bitbake, workaround:
+def features_to_busybox_conf(d):
+ cnf, rem = features_to_busybox_settings(d)
+ return cnf
+def features_to_busybox_del(d):
+ cnf, rem = features_to_busybox_settings(d)
+ return rem
+
+configmangle = '/CROSS_COMPILER_PREFIX/d; \
+ /CONFIG_EXTRA_CFLAGS/d; \
+ '
+OE_FEATURES := "${@features_to_busybox_conf(d)}"
+OE_DEL := "${@features_to_busybox_del(d)}"
+DO_IPv4 := ${@base_contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}
+DO_IPv6 := ${@base_contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}
+
+python () {
+ if "${OE_DEL}":
+ bb.data.setVar('configmangle_append', "${OE_DEL}" + "\n", d)
+ if "${OE_FEATURES}":
+ bb.data.setVar('configmangle_append',
+ "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
+ ("\\n".join((bb.data.expand("${OE_FEATURES}", d).split("\n")))),
+ d)
+ bb.data.setVar('configmangle_append',
+ "/^### CROSS$/a\\\n%s\n" %
+ ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
+ "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\""
+ ])
+ ),
+ d)
+}
+
+do_prepare_config () {
+ sed -e 's#@DATADIR@#${datadir}#g' \
+ < ${WORKDIR}/defconfig > ${S}/.config
+ sed -i -e '/CONFIG_STATIC/d' .config
+ echo "# CONFIG_STATIC is not set" >> .config
+ for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \
+ ${S}/.config
+ sed -i -e '${configmangle}' ${S}/.config
+ if test ${DO_IPv4} -eq 0 && test ${DO_IPv6} -eq 0; then
+ # disable networking applets
+ mv ${S}/.config ${S}/.config.oe-tmp
+ awk 'BEGIN{net=0}
+ /^# Networking Utilities/{net=1}
+ /^#$/{if(net){net=net+1}}
+ {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
+ ${S}/.config.oe-tmp > ${S}/.config
+ fi
+}
+
do_configure () {
- install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ do_prepare_config
cml1_do_configure
}
@@ -184,4 +261,3 @@ pkg_prerm_${PN}-syslog () {
update-alternatives --remove syslog-init syslog.${PN}
update-alternatives --remove syslog-conf syslog.conf.${PN}
}
-
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index a5080d5..a999490 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 03/51] git: restore the dependency on perl-native
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 01/51] ghostscript: update SRC_URI Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 02/51] busybox: backport distro-features handling from oe master Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 04/51] uclibc: fix compile error on i586 Saul Wold
` (47 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
[YOCTO #1155]
I thought git-native could depend on perl-native-runtime and tests on
Ubuntu 9.04/10.10 and Fedora 13 show it could buid fine (looks these distros
install perl-ExtUtils-MakeMaker by default).
However Joshua reported on Fedora 15 i686 host, git-native can't build unless
he manually installed perl-ExtUtils-MakeMaker to the host.
This makes me think we may as well make git-native depend on perl-native.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/recipes-devtools/git/git.inc | 6 +++---
meta/recipes-devtools/git/git_1.7.5.1.bb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index c884f9c..5d77880 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -1,16 +1,16 @@
DESCRIPTION = "The git revision control system used by the Linux kernel developers"
SECTION = "console/utils"
LICENSE = "GPLv2"
-DEPENDS = "perl-native openssl curl zlib expat"
+DEPENDS = "openssl curl zlib expat"
SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
S = "${WORKDIR}/git-${PV}"
LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
-EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk"
+EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --without-tcltk"
-inherit autotools
+inherit autotools perlnative
do_install () {
oe_runmake install DESTDIR="${D}" bindir=${bindir} \
diff --git a/meta/recipes-devtools/git/git_1.7.5.1.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb
index bfdbf62..04d1d56 100644
--- a/meta/recipes-devtools/git/git_1.7.5.1.bb
+++ b/meta/recipes-devtools/git/git_1.7.5.1.bb
@@ -1,6 +1,6 @@
require git.inc
-PR = "r0"
+PR = "r2"
EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 04/51] uclibc: fix compile error on i586
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (2 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 03/51] git: restore the dependency on perl-native Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 05/51] import recipe_sanity.bbclass from oe master Saul Wold
` (46 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Phil Blundell
From: Phil Blundell <pb@pbcl.net>
Without this you get:
| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait':
| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable
| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable
| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1
Signed-off-by: Phil Blundell <philb@gnu.org>
---
.../uclibc/uclibc-git/epoll-asm-fix.patch | 25 ++++++++++++++++++++
meta/recipes-core/uclibc/uclibc_git.bb | 1 +
2 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch b/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch
new file mode 100644
index 0000000..bcd834d
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/epoll-asm-fix.patch
@@ -0,0 +1,25 @@
+Fix a compile error due to last argument to syscall() not being memory addressable.
+
+Upstream-Status: Pending
+Signed-off-by: Phil Blundell <philb@gnu.org>
+
+diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
+index 85b0cfd..c034b2c 100644
+--- a/libc/sysdeps/linux/common/epoll.c
++++ b/libc/sysdeps/linux/common/epoll.c
+@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
+ int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
+ int timeout, const sigset_t *set)
+ {
++ int nsig = _NSIG / 8;
+ if (SINGLE_THREAD_P)
+- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ else {
+ int oldtype = LIBC_CANCEL_ASYNC ();
+- int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++ int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ LIBC_CANCEL_RESET (oldtype);
+ return result;
+ }
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index eded2fb..54babca 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -29,5 +29,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
file://remove_attribute_optimize_Os.patch \
file://append_UCLIBC_EXTRA_CFLAGS.patch \
file://compile-arm-fork-with-O2.patch \
+ file://epoll-asm-fix.patch \
"
S = "${WORKDIR}/git"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 05/51] import recipe_sanity.bbclass from oe master
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (3 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 04/51] uclibc: fix compile error on i586 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 06/51] json-glib: Fix up SRC_URI Checksums Saul Wold
` (45 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Phil Blundell
From: Phil Blundell <pb@pbcl.net>
This is a verbatim copy of the corresponding class from oe master.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/classes/recipe_sanity.bbclass | 179 ++++++++++++++++++++++++++++++++++++
1 files changed, 179 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/recipe_sanity.bbclass
diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass
new file mode 100644
index 0000000..bb60ffa
--- /dev/null
+++ b/meta/classes/recipe_sanity.bbclass
@@ -0,0 +1,179 @@
+def __note(msg, d):
+ bb.note("%s: recipe_sanity: %s" % (d.getVar("P", 1), msg))
+
+__recipe_sanity_badruntimevars = "RDEPENDS RPROVIDES RRECOMMENDS RCONFLICTS"
+def bad_runtime_vars(cfgdata, d):
+ if bb.data.inherits_class("native", d) or \
+ bb.data.inherits_class("cross", d):
+ return
+
+ for var in d.getVar("__recipe_sanity_badruntimevars", 1).split():
+ val = d.getVar(var, 0)
+ if val and val != cfgdata.get(var):
+ __note("%s should be %s_${PN}" % (var, var), d)
+
+__recipe_sanity_reqvars = "DESCRIPTION"
+__recipe_sanity_reqdiffvars = "LICENSE"
+def req_vars(cfgdata, d):
+ for var in d.getVar("__recipe_sanity_reqvars", 1).split():
+ if not d.getVar(var, 0):
+ __note("%s should be set" % var, d)
+
+ for var in d.getVar("__recipe_sanity_reqdiffvars", 1).split():
+ val = d.getVar(var, 0)
+ cfgval = cfgdata.get(var)
+
+ # Hardcoding is bad, but I'm lazy. We don't care about license being
+ # unset if the recipe has no sources!
+ if var == "LICENSE" and d.getVar("SRC_URI", 1) == cfgdata.get("SRC_URI"):
+ continue
+
+ if not val:
+ __note("%s should be set" % var, d)
+ elif val == cfgval:
+ __note("%s should be defined to something other than default (%s)" % (var, cfgval), d)
+
+def var_renames_overwrite(cfgdata, d):
+ renames = d.getVar("__recipe_sanity_renames", 0)
+ if renames:
+ for (key, newkey, oldvalue, newvalue) in renames:
+ if oldvalue != newvalue and oldvalue != cfgdata.get(newkey):
+ __note("rename of variable '%s' to '%s' overwrote existing value '%s' with '%s'." % (key, newkey, oldvalue, newvalue), d)
+
+def incorrect_nonempty_PACKAGES(cfgdata, d):
+ if bb.data.inherits_class("native", d) or \
+ bb.data.inherits_class("cross", d):
+ if d.getVar("PACKAGES", 1):
+ return True
+
+def can_use_autotools_base(cfgdata, d):
+ cfg = d.getVar("do_configure", 1)
+ if not bb.data.inherits_class("autotools", d):
+ return False
+
+ for i in ["autoreconf"] + ["%s_do_configure" % cls for cls in ["gnomebase", "gnome", "e", "autotools", "efl", "gpephone", "openmoko", "openmoko2", "xfce", "xlibs"]]:
+ if cfg.find(i) != -1:
+ return False
+
+ import os
+ for clsfile in d.getVar("__inherit_cache", 0):
+ (base, _) = os.path.splitext(os.path.basename(clsfile))
+ if cfg.find("%s_do_configure" % base) != -1:
+ __note("autotools_base usage needs verification, spotted %s_do_configure" % base, d)
+
+ return True
+
+def can_remove_FILESPATH(cfgdata, d):
+ expected = cfgdata.get("FILESPATH")
+ #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}"
+ expectedpaths = bb.data.expand(expected, d)
+ unexpanded = d.getVar("FILESPATH", 0)
+ filespath = d.getVar("FILESPATH", 1).split(":")
+ filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)]
+ for fp in filespath:
+ if not fp in expectedpaths:
+ # __note("Path %s in FILESPATH not in the expected paths %s" %
+ # (fp, expectedpaths), d)
+ return False
+ return expected != unexpanded
+
+def can_remove_FILESDIR(cfgdata, d):
+ expected = cfgdata.get("FILESDIR")
+ #expected = "${@bb.which(d.getVar('FILESPATH', 1), '.')}"
+ unexpanded = d.getVar("FILESDIR", 0)
+ if unexpanded is None:
+ return False
+
+ expanded = os.path.normpath(d.getVar("FILESDIR", 1))
+ filespath = d.getVar("FILESPATH", 1).split(":")
+ filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)]
+
+ return unexpanded != expected and \
+ os.path.exists(expanded) and \
+ (expanded in filespath or
+ expanded == bb.data.expand(expected, d))
+
+def can_remove_others(p, cfgdata, d):
+ for k in ["S", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS",
+ "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]:
+ #for k in cfgdata:
+ unexpanded = d.getVar(k, 0)
+ cfgunexpanded = cfgdata.get(k)
+ if not cfgunexpanded:
+ continue
+
+ try:
+ expanded = d.getVar(k, 1)
+ cfgexpanded = bb.data.expand(cfgunexpanded, d)
+ except bb.fetch.ParameterError:
+ continue
+
+ if unexpanded != cfgunexpanded and \
+ cfgexpanded == expanded:
+ __note("candidate for removal of %s" % k, d)
+ bb.debug(1, "%s: recipe_sanity: cfg's '%s' and d's '%s' both expand to %s" %
+ (p, cfgunexpanded, unexpanded, expanded))
+
+python do_recipe_sanity () {
+ p = d.getVar("P", 1)
+ p = "%s %s %s" % (d.getVar("PN", 1), d.getVar("PV", 1), d.getVar("PR", 1))
+
+ sanitychecks = [
+ (can_remove_FILESDIR, "candidate for removal of FILESDIR"),
+ (can_remove_FILESPATH, "candidate for removal of FILESPATH"),
+ #(can_use_autotools_base, "candidate for use of autotools_base"),
+ (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"),
+ ]
+ cfgdata = d.getVar("__recipe_sanity_cfgdata", 0)
+
+ for (func, msg) in sanitychecks:
+ if func(cfgdata, d):
+ __note(msg, d)
+
+ can_remove_others(p, cfgdata, d)
+ var_renames_overwrite(cfgdata, d)
+ req_vars(cfgdata, d)
+ bad_runtime_vars(cfgdata, d)
+}
+do_recipe_sanity[nostamp] = "1"
+#do_recipe_sanity[recrdeptask] = "do_recipe_sanity"
+addtask recipe_sanity
+
+do_recipe_sanity_all[nostamp] = "1"
+do_recipe_sanity_all[recrdeptask] = "do_recipe_sanity"
+do_recipe_sanity_all () {
+ :
+}
+addtask recipe_sanity_all after do_recipe_sanity
+
+python recipe_sanity_eh () {
+ from bb.event import getName
+
+ if getName(e) != "ConfigParsed":
+ return
+
+ d = e.data
+
+ cfgdata = {}
+ for k in d.keys():
+ #for k in ["S", "PR", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS",
+ # "SECTION"]:
+ cfgdata[k] = d.getVar(k, 0)
+
+ d.setVar("__recipe_sanity_cfgdata", cfgdata)
+ #d.setVar("__recipe_sanity_cfgdata", d)
+
+ # Sick, very sick..
+ from bb.data_smart import DataSmart
+ old = DataSmart.renameVar
+ def myrename(self, key, newkey):
+ oldvalue = self.getVar(newkey, 0)
+ old(self, key, newkey)
+ newvalue = self.getVar(newkey, 0)
+ if oldvalue:
+ renames = self.getVar("__recipe_sanity_renames", 0) or set()
+ renames.add((key, newkey, oldvalue, newvalue))
+ self.setVar("__recipe_sanity_renames", renames)
+ DataSmart.renameVar = myrename
+}
+addhandler recipe_sanity_eh
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 06/51] json-glib: Fix up SRC_URI Checksums
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (4 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 05/51] import recipe_sanity.bbclass from oe master Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 07/51] linux-yocto: rename recipes to explicitly indicate version Saul Wold
` (44 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-gnome/json-glib/json-glib_0.12.4.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb b/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
index 58dcde9..2b8bdf6 100644
--- a/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "71f911329c9f742543b378c3494490da"
-SRC_URI[archive.sha256sum] = "89fa9b870dfe2d8b7b00210be76cdbb2d46a8d2cc77ca7cbe5d081bdf8cad780"
+SRC_URI[archive.md5sum] = "347e1714e4a2ce54298969d5ffec7dca"
+SRC_URI[archive.sha256sum] = "462cd611016ae189d5e3f258dc7741e6a2e8267404b4e3806aaf346d50f1df7e"
PR = "r0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 07/51] linux-yocto: rename recipes to explicitly indicate version
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (5 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 06/51] json-glib: Fix up SRC_URI Checksums Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 08/51] perl-native: fix download url Saul Wold
` (43 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The existing recipe names for the linux-yocto kernel builds
worked well when there was a single, or two versions of the
kernel available. But with the impending kernel updates and
retirement of older kernels, the re-use of the same recipes
for different kernel versions violates the principle of least
surprise.
To address this, the recipes are being renamed as follows:
linux-yocto_git.bb -> linux-yocto_2.6.37.bb
linux-yocto-stable_git.bb -> linux-yocto_2.6.34.bb
There continue to be versionless recipe names that feed into
versioned recipes at the appropriate points. They are:
linux-yocto-dev.bb (tracking the latest yocto dev kernel)
linux-yocto-korg_head.bb (tracking korg kernels)
There are no existing users of linux-yocto-stable in the master
branches to convert to the new naming, so these changes work
in isolation.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
...x-yocto-stable_git.bb => linux-yocto_2.6.34.bb} | 0
.../{linux-yocto_git.bb => linux-yocto_2.6.37.bb} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-kernel/linux/{linux-yocto-stable_git.bb => linux-yocto_2.6.34.bb} (100%)
rename meta/recipes-kernel/linux/{linux-yocto_git.bb => linux-yocto_2.6.37.bb} (100%)
diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.34.bb
similarity index 100%
rename from meta/recipes-kernel/linux/linux-yocto-stable_git.bb
rename to meta/recipes-kernel/linux/linux-yocto_2.6.34.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
similarity index 100%
rename from meta/recipes-kernel/linux/linux-yocto_git.bb
rename to meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
--
1.7.3.4
^ permalink raw reply [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 08/51] perl-native: fix download url
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (6 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 07/51] linux-yocto: rename recipes to explicitly indicate version Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 09/51] clutter-box2d_git: Switch SRC_URI to git.gnome.org Saul Wold
` (42 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index cbb4e78..50fa1c9 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -9,7 +9,7 @@ PR = "r2"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
+SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://Configure-multilib.patch \
file://perl-configpm-switch.patch \
file://parallel_build_fix_1.patch \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 09/51] clutter-box2d_git: Switch SRC_URI to git.gnome.org
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (7 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 08/51] perl-native: fix download url Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 10/51] util-macros_1.13.0.bb: Depend on virtual/gettext instead of gettext Saul Wold
` (41 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-graphics/clutter/clutter-box2d_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index 4c1c003..bfd46b2 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -6,7 +6,7 @@ SRCREV = "4799ac10ae8cb7da936a2b999aba58fe62eb1ee3"
PV = "0.10.1+git${SRCPV}"
PR = "r0"
-SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
+SRC_URI = "git://git.gnome.org/clutter-box2d.git"
S = "${WORKDIR}/git"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 10/51] util-macros_1.13.0.bb: Depend on virtual/gettext instead of gettext
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (8 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 09/51] clutter-box2d_git: Switch SRC_URI to git.gnome.org Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 11/51] uclibc.inc: libsegfault is only RPROVIDED by uclibc Saul Wold
` (40 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
So multiple provider problem can be reolved amicably
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../xorg-util/util-macros_1.13.0.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
index a6f5402..4bac614 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
@@ -12,8 +12,8 @@ PR = "r0"
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
DEPENDS = "libgpg-error"
-DEPENDS_virtclass-native = "gettext"
-DEPENDS_virtclass-nativesdk = "gettext"
+DEPENDS_virtclass-native = "virtual/gettext"
+DEPENDS_virtclass-nativesdk = "virtual/gettext"
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 11/51] uclibc.inc: libsegfault is only RPROVIDED by uclibc
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (9 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 10/51] util-macros_1.13.0.bb: Depend on virtual/gettext instead of gettext Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 12/51] gettext_0.18.1.1.bb: Fix build on uclibc Saul Wold
` (39 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Using ${PN} also means that uclibc-initial gets to provide it
which we do not want
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/uclibc/uclibc.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index c1bc422..0f8c6c2 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -99,7 +99,7 @@ RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"
# uclibc does not really have libsegfault but then using the one from glibc is also not
# going to work. So we pretend that we have it to make bitbake not pull other recipes
# to satisfy this dependency for the images/tasks
-RPROVIDES_${PN} += "libsegfault"
+RPROVIDES_uclibc += "libsegfault"
SRC_URI = "\
http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 12/51] gettext_0.18.1.1.bb: Fix build on uclibc
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (10 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 11/51] uclibc.inc: libsegfault is only RPROVIDED by uclibc Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 13/51] uclibc: Cleanup the machine dependent config files Saul Wold
` (38 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Use libc-uclibc override to seprate out uclibc bits
instead of using TARGET_OS
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gnulib-uclibc-sched_param-def.patch | 21 ++++++++++++++++++++
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 7 +++--
2 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
new file mode 100644
index 0000000..d8d10db
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch
@@ -0,0 +1,21 @@
+uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
+and is not needed too per standard. gnulib attempts to use it but we have to account
+for it because in this case uclibc does not behave like glibc.
+
+-Khem
+
+Upstream-Status: Pending
+
+Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
+===================================================================
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/spawn.in.h
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/spawn.in.h
+@@ -31,7 +31,7 @@
+
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+ But avoid namespace pollution on glibc systems. */
+-#ifndef __GLIBC__
++#if !defined __GLIBC__ || defined __UCLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 5f5f164..f54c111 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -12,11 +12,12 @@ PROVIDES = "virtual/libintl virtual/gettext"
PROVIDES_virtclass-native = ""
CONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
- file://wchar-uclibc.patch \
"
-SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
+ file://gettext-error_print_progname.patch \
+ file://gnulib-uclibc-sched_param-def.patch \
+ "
SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 13/51] uclibc: Cleanup the machine dependent config files
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (11 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 12/51] gettext_0.18.1.1.bb: Fix build on uclibc Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 14/51] uclibc: remove redundant python code Saul Wold
` (37 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
We only have arch specific machine fragments now.
Introduce use of KCONFIG_ALLCONFIG and use allnoconfig
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../uclibc/uclibc-git/armv5te/uClibc.machine | 4 +-
.../{nslu2be => armv5teb}/uClibc.machine | 0
.../uclibc/uclibc-git/efika/uClibc.machine | 45 ------------
.../uclibc-git/{qemumips => mips}/uClibc.machine | 0
.../uclibc/uclibc-git/qemuarm/uClibc.machine | 77 --------------------
.../uclibc/uclibc-git/qemux86/uClibc.machine | 59 ---------------
meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 14 ++++-
meta/recipes-core/uclibc/uclibc.inc | 5 +-
meta/recipes-core/uclibc/uclibc_git.bb | 1 -
9 files changed, 17 insertions(+), 188 deletions(-)
rename meta/recipes-core/uclibc/uclibc-git/{nslu2be => armv5teb}/uClibc.machine (100%)
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine
rename meta/recipes-core/uclibc/uclibc-git/{qemumips => mips}/uClibc.machine (100%)
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uClibc.config
diff --git a/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine
index b012a38..2242dc9 100644
--- a/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine
+++ b/meta/recipes-core/uclibc/uclibc-git/armv5te/uClibc.machine
@@ -38,14 +38,14 @@ FORCE_OPTIONS_FOR_ARCH=y
CONFIG_ARM_EABI=y
# COMPILE_IN_THUMB_MODE is not set
USE_BX=y
-CONFIG_GENERIC_ARM=y
+# CONFIG_GENERIC_ARM is not set
# CONFIG_ARM610 is not set
# CONFIG_ARM710 is not set
# CONFIG_ARM7TDMI is not set
# CONFIG_ARM720T is not set
# CONFIG_ARM920T is not set
# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
+CONFIG_ARM926T=y
# CONFIG_ARM10T is not set
# CONFIG_ARM1136JF_S is not set
# CONFIG_ARM1176JZ_S is not set
diff --git a/meta/recipes-core/uclibc/uclibc-git/nslu2be/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/armv5teb/uClibc.machine
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/nslu2be/uClibc.machine
rename to meta/recipes-core/uclibc/uclibc-git/armv5teb/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine
deleted file mode 100644
index 5ed7b51..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/efika/uClibc.machine
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Wed Dec 20 11:05:48 2006
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-TARGET_powerpc=y
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="powerpc"
-FORCE_OPTIONS_FOR_ARCH=y
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-KERNEL_HEADERS="<path/to/kernel/headers>"
-HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/qemumips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/qemumips/uClibc.machine
rename to meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine
deleted file mode 100644
index 2242dc9..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/qemuarm/uClibc.machine
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.32-git
-# Mon Jul 19 01:34:29 2010
-#
-# TARGET_alpha is not set
-TARGET_arm=y
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="arm"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_ARM_OABI is not set
-CONFIG_ARM_EABI=y
-# COMPILE_IN_THUMB_MODE is not set
-USE_BX=y
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-CONFIG_ARM926T=y
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_CORTEX_M3 is not set
-# CONFIG_ARM_CORTEX_M1 is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_ANY_ENDIAN=y
-ARCH_LITTLE_ENDIAN=y
-# ARCH_WANTS_BIG_ENDIAN is not set
-ARCH_WANTS_LITTLE_ENDIAN=y
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-# DO_XSI_MATH is not set
-# UCLIBC_HAS_FENV is not set
-KERNEL_HEADERS="/usr/include"
-HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine
deleted file mode 100644
index 3909ccc..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/qemux86/uClibc.machine
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-TARGET_i386=y
-# TARGET_i960 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_x86_64 is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="i386"
-# ARCH_SUPPORTS_BIG_ENDIAN is not set
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-CONFIG_PENTIUM4=y
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
-ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
-ARCH_HAS_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_HEADERS="<path/to/kernel/headers>"
-HAVE_DOT_CONFIG=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.config b/meta/recipes-core/uclibc/uclibc-git/uClibc.config
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index a1b7813..45b131d 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
@@ -157,4 +157,16 @@ WARNINGS="-Wall"
DO_C99_MATH=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
UCLIBC_HAS_FENV=y
-
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_BSD_ERR=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_HAS_PTY=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_EPOLL=y
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 0f8c6c2..2bf3017 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -202,12 +202,11 @@ do_configure() {
echo "### FPU" >>${S}/merged.config
echo "### ABI" >>${S}/merged.config
echo "### DISTRO FEATURES" >>${S}/merged.config
- cp ${S}/merged.config ${S}/.config
# Mangle the resulting .config depending on OE variables
- sed -i -e '${configmangle}' ${S}/.config
+ sed -i -e '${configmangle}' ${S}/merged.config
- oe_runmake oldconfig
+ oe_runmake KCONFIG_ALLCONFIG=${S}/merged.config allnoconfig
}
do_install() {
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index 54babca..f5c861b 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -10,7 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
- file://uClibc.config \
file://uClibc.machine \
file://uClibc.distro \
file://uclibc-arm-ftruncate64.patch \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 14/51] uclibc: remove redundant python code
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (12 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 13/51] uclibc: Cleanup the machine dependent config files Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 15/51] uclibc: remove PACKAGE_ARCH Saul Wold
` (36 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Phil Blundell
From: Phil Blundell <pb@pbcl.net>
This chunk of python code has been around for a while (witness the
comment about gcc 3.4.0) and predates the availability of
COMPATIBLE_HOST. Rewrite it using a more modern idiom.
Signed-off-by: Phil Blundell <philb@gnu.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/uclibc/uclibc.inc | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 2bf3017..06c0f5d 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -36,21 +36,11 @@ cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \
sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \
"
-#
# For now, we will skip building of a gcc package if it is a uclibc one
# and our build is not a uclibc one, and we skip a glibc one if our build
# is a uclibc build.
-#
-# See the note in gcc/gcc_3.4.0.oe
-#
+COMPATIBLE_HOST = ".*-uclibc.*"
-python __anonymous () {
- import bb, re
- uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None)
- if not uc_os:
- raise bb.parse.SkipPackage("incompatible with target %s" %
- bb.data.getVar('TARGET_OS', d, 1))
-}
PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
DEPENDS = "virtual/${TARGET_PREFIX}binutils \
virtual/${TARGET_PREFIX}gcc-intermediate \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 15/51] uclibc: remove PACKAGE_ARCH
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (13 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 14/51] uclibc: remove redundant python code Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 16/51] qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them Saul Wold
` (35 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Phil Blundell
From: Phil Blundell <pb@pbcl.net>
There is no good reason for uclibc to be machine specific. Remove local
assignment to PACKAGE_ARCH so that it gets the default target
architecture and bump PR for that change.
See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/003064.html
Signed-off-by: Phil Blundell <philb@gnu.org>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/uclibc/uclibc_git.bb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index f5c861b..b8f58f0 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -2,11 +2,9 @@ SRCREV="71d63ed75648da9b0b71afabb9c60aaad792c55c"
require uclibc.inc
PV = "0.9.31+0.9.32rc3"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
-#recent versions uclibc require real kernel headers
-PACKAGE_ARCH = "${MACHINE_ARCH}"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 16/51] qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (14 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 15/51] uclibc: remove PACKAGE_ARCH Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 17/51] connman-gnome 0.5: build from git Saul Wold
` (34 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
From: Koen Kooi <koen@dominion.thruhere.net>
The ext3 format is pretty much mandatory for qemu usage, so always create it.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/conf/machine/include/qemu.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 9ef242f..e908f69 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
-IMAGE_FSTYPES ?= "tar.bz2 ext3"
+IMAGE_FSTYPES += "tar.bz2 ext3"
ROOT_FLASH_SIZE = "280"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 17/51] connman-gnome 0.5: build from git
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (15 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 16/51] qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 18/51] update-alternatives-dpkg: Fix SRC_URI Checksum Saul Wold
` (33 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
From: Koen Kooi <koen@dominion.thruhere.net>
All the local patches were applied upstream, so let's build straight from git to make that clear
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
| 19 -
.../connman/connman-gnome/connman-gnome.patch | 4162 --------------------
.../remove-connman-property-desktop-file.patch | 42 -
.../connman-gnome/service_name_update.patch | 36 -
.../connman/connman-gnome_0.5.bb | 13 +-
5 files changed, 4 insertions(+), 4268 deletions(-)
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
diff --git a/meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch b/meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
deleted file mode 100644
index d34257b..0000000
--- a/meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Even if all services are not available, we still need to let user have
-the ability to configure network, for example, online/offline, etc.
-Therefore enable the callback menu even when status is unavailable.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-diff --git a/applet/status.c b/applet/status.c
-index 13ec752..d817f22 100644
---- a/applet/status.c
-+++ b/applet/status.c
-@@ -231,8 +231,6 @@ void status_unavailable(void)
- {
- icon_animation_stop(animation);
-
-- available = FALSE;
--
- gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_notifier);
- gtk_status_icon_set_tooltip(statusicon,
- "Connection Manager daemon is not running");
diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch b/meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
deleted file mode 100644
index 2fe8bb8..0000000
--- a/meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
+++ /dev/null
@@ -1,4162 +0,0 @@
-connman-gnome: Change the code to fit recent connman
-
-The recent connman changes from "device" based to "service" based.
-Therefore most of the interaction protocol between connman and
-connman-gnome has changed. This commit uses the new dbus interface
-to interact with connman. With this change, connman-gnome could
-do wired and wireless interface configurations with latest connman.
-
-Besides, some UI is re-designed to be more neat and friendly to
-end user.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-diff --git a/applet/main.c b/applet/main.c
-index 2a9b36e..08d394c 100644
---- a/applet/main.c
-+++ b/applet/main.c
-@@ -98,279 +98,21 @@ static void settings_callback(GtkWidget *item, gpointer user_data)
- g_printerr("Couldn't execute command: %s\n", command);
- }
-
--static void toggled_callback(GtkWidget *button, gpointer user_data)
--{
-- GtkWidget *entry = user_data;
-- gboolean mode;
--
-- mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
--
-- gtk_entry_set_visibility(GTK_ENTRY(entry), mode);
--}
--
--static void passphrase_dialog(const char *path, const char *name)
--{
-- GtkWidget *dialog;
-- GtkWidget *button;
-- GtkWidget *image;
-- GtkWidget *label;
-- GtkWidget *entry;
-- GtkWidget *table;
-- GtkWidget *vbox;
--
-- dialog = gtk_dialog_new();
-- gtk_window_set_title(GTK_WINDOW(dialog), _("Enter passphrase"));
-- gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-- gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
-- gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
-- gtk_window_set_urgency_hint(GTK_WINDOW(dialog), TRUE);
-- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
--
-- button = gtk_dialog_add_button(GTK_DIALOG(dialog),
-- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-- button = gtk_dialog_add_button(GTK_DIALOG(dialog),
-- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
-- gtk_widget_grab_default(button);
--
-- table = gtk_table_new(5, 2, FALSE);
-- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-- gtk_table_set_col_spacings(GTK_TABLE(table), 20);
-- gtk_container_set_border_width(GTK_CONTAINER(table), 12);
-- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), table);
-- image = gtk_image_new_from_icon_name(GTK_STOCK_DIALOG_AUTHENTICATION,
-- GTK_ICON_SIZE_DIALOG);
-- gtk_misc_set_alignment(GTK_MISC(image), 0.0, 0.0);
-- gtk_table_attach(GTK_TABLE(table), image, 0, 1, 0, 5,
-- GTK_SHRINK, GTK_FILL, 0, 0);
-- vbox = gtk_vbox_new(FALSE, 6);
--
-- label = gtk_label_new(_("Network requires input of a passphrase:"));
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
-- gtk_container_add(GTK_CONTAINER(vbox), label);
-- gtk_table_attach(GTK_TABLE(table), vbox, 1, 2, 0, 1,
-- GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
--
-- entry = gtk_entry_new();
-- gtk_entry_set_max_length(GTK_ENTRY(entry), 120);
-- gtk_entry_set_width_chars(GTK_ENTRY(entry), 20);
-- gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
-- gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
-- gtk_container_add(GTK_CONTAINER(vbox), entry);
--
-- button = gtk_check_button_new_with_label(_("Show input"));
-- gtk_container_add(GTK_CONTAINER(vbox), button);
--
-- g_signal_connect(G_OBJECT(button), "toggled",
-- G_CALLBACK(toggled_callback), entry);
--
-- button = gtk_check_button_new_with_label(_("Remember network"));
-- gtk_container_add(GTK_CONTAINER(vbox), button);
--
-- gtk_widget_show_all(dialog);
--
-- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-- const gchar *passphrase;
-- gboolean remember;
--
-- passphrase = gtk_entry_get_text(GTK_ENTRY(entry));
-- remember = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
--
-- connman_client_set_passphrase(client, path, passphrase);
-- connman_client_set_remember(client, path, remember);
--
-- status_prepare();
-- connman_client_connect(client, path);
-- }
--
-- gtk_widget_destroy(dialog);
--}
--
--static void activate_callback(GtkWidget *item, gpointer user_data)
--{
-- const gchar *path = user_data;
-- guint security;
-- gchar *passphrase;
--
-- security = connman_client_get_security(client, path);
-- if (security == CONNMAN_SECURITY_UNKNOWN)
-- return;
--
-- if (security == CONNMAN_SECURITY_NONE) {
-- status_prepare();
-- connman_client_connect(client, path);
-- return;
-- }
--
-- passphrase = connman_client_get_passphrase(client, path);
-- if (passphrase != NULL) {
-- g_free(passphrase);
--
-- status_prepare();
-- connman_client_connect(client, path);
-- return;
-- }
--
-- passphrase_dialog(path, NULL);
--}
--
--static void disconnect_callback(GtkWidget *item, gpointer user_data)
--{
-- connman_client_disconnect(client, NULL);
--}
--
--static GtkWidget *create_popupmenu(void)
--{
-- GtkWidget *menu;
-- GtkWidget *item;
--
-- menu = gtk_menu_new();
--
-- item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
-- g_signal_connect(item, "activate", G_CALLBACK(settings_callback), NULL);
-- gtk_widget_show(item);
-- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
--
-- item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL);
-- g_signal_connect(item, "activate", G_CALLBACK(about_callback), NULL);
-- gtk_widget_show(item);
-- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
--
-- return menu;
--}
--
--static GtkWidget *append_menuitem(GtkMenu *menu, const char *ssid,
-- guint security, guint strength)
--{
-- GtkWidget *item;
-- GtkWidget *hbox;
-- GtkWidget *label;
-- GtkWidget *image;
-- GtkWidget *progress;
--
-- item = gtk_check_menu_item_new();
-- gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item), TRUE);
--
-- hbox = gtk_hbox_new(FALSE, 6);
-- gtk_container_add(GTK_CONTAINER(item), hbox);
-- gtk_widget_show(hbox);
--
-- label = gtk_label_new(NULL);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-- gtk_label_set_text(GTK_LABEL(label), ssid);
-- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-- gtk_widget_show(label);
--
-- image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION,
-- GTK_ICON_SIZE_MENU);
-- gtk_misc_set_alignment(GTK_MISC(image), 1.0, 0.5);
-- if (security != CONNMAN_SECURITY_NONE) {
-- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-- gtk_widget_show(image);
-- }
--
-- progress = gtk_progress_bar_new();
-- gtk_widget_set_size_request(progress, 100, -1);
-- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress),
-- (double) strength / 100);
-- gtk_box_pack_end(GTK_BOX(hbox), progress, FALSE, TRUE, 0);
-- gtk_widget_show(progress);
--
-- gtk_widget_show(item);
-- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
--
-- return item;
--}
--
--static void enumerate_networks(GtkMenu *menu,
-- GtkTreeModel *model, GtkTreeIter *parent)
--{
-- GtkTreeIter iter;
-- gboolean cont;
--
-- cont = gtk_tree_model_iter_children(model, &iter, parent);
--
-- while (cont == TRUE) {
-- GtkWidget *item;
-- DBusGProxy *proxy;
-- guint strength, security;
-- gchar *name, *path;
-- gboolean inrange, connected;
--
-- gtk_tree_model_get(model, &iter,
-- CONNMAN_COLUMN_PROXY, &proxy,
-- CONNMAN_COLUMN_NAME, &name,
-- CONNMAN_COLUMN_INRANGE, &inrange,
-- CONNMAN_COLUMN_ENABLED, &connected,
-- CONNMAN_COLUMN_STRENGTH, &strength,
-- CONNMAN_COLUMN_SECURITY, &security, -1);
--
-- if (connected == TRUE || inrange == TRUE) {
-- item = append_menuitem(menu, name, security, strength);
-- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
-- connected);
--
-- path = g_strdup(dbus_g_proxy_get_path(proxy));
-- g_signal_connect(item, "activate",
-- G_CALLBACK(activate_callback), path);
-- }
--
-- g_free(name);
--
-- cont = gtk_tree_model_iter_next(model, &iter);
-- }
--}
--
- static gboolean menu_callback(GtkMenu *menu)
- {
-- GtkTreeModel *model;
-- GtkTreeIter parent;
- GtkWidget *item;
-- gboolean cont;
--
-- connman_client_propose_scan(client, NULL);
--
-- model = connman_client_get_device_network_model(client);
--
-- cont = gtk_tree_model_get_iter_first(model, &parent);
--
-- while (cont == TRUE) {
-- guint type;
-- gchar *name;
--
-- gtk_tree_model_get(model, &parent,
-- CONNMAN_COLUMN_TYPE, &type,
-- CONNMAN_COLUMN_NAME, &name, -1);
--
-- switch (type) {
-- case CONNMAN_TYPE_WIFI:
-- case CONNMAN_TYPE_WIMAX:
-- enumerate_networks(menu, model, &parent);
-- break;
-- default:
-- break;
-- }
--
-- g_free(name);
--
-- cont = gtk_tree_model_iter_next(model, &parent);
-- }
--
-- g_object_unref(model);
-
- item = gtk_separator_menu_item_new();
- gtk_widget_show(item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-
-- item = gtk_menu_item_new_with_label(_("Disconnect Network"));
-- g_signal_connect(item, "activate",
-- G_CALLBACK(disconnect_callback), NULL);
-+ item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
-+ g_signal_connect(item, "activate", G_CALLBACK(settings_callback), NULL);
- gtk_widget_show(item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-
-- item = gtk_menu_item_new_with_label(_("Join Other Network..."));
-- gtk_widget_set_sensitive(item, FALSE);
-- //g_signal_connect(item, "activate",
-- // G_CALLBACK(join_callback), NULL);
-+ item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL);
-+ g_signal_connect(item, "activate", G_CALLBACK(about_callback), NULL);
- gtk_widget_show(item);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-
-@@ -387,16 +129,17 @@ static void update_status(GtkTreeModel *model)
- cont = gtk_tree_model_get_iter_first(model, &iter);
-
- while (cont == TRUE) {
-- gboolean enabled;
-+ gchar *state;
-
- gtk_tree_model_get(model, &iter,
- CONNMAN_COLUMN_TYPE, &type,
- CONNMAN_COLUMN_STRENGTH, &strength,
-- CONNMAN_COLUMN_ENABLED, &enabled, -1);
-+ CONNMAN_COLUMN_STATE, &state, -1);
-
- online = TRUE;
-
-- if (enabled == TRUE)
-+ if ((type == CONNMAN_TYPE_ETHERNET && (g_str_equal(state, "idle") || g_str_equal(state, "online"))) ||
-+ (type == CONNMAN_TYPE_WIFI && (g_str_equal(state, "ready") || g_str_equal(state, "online"))))
- break;
-
- cont = gtk_tree_model_iter_next(model, &iter);
-@@ -453,7 +196,7 @@ int main(int argc, char *argv[])
-
- g_set_application_name(_("Connection Manager"));
-
-- status_init(menu_callback, create_popupmenu());
-+ status_init(menu_callback);
-
- client = connman_client_new();
- model = connman_client_get_connection_model(client);
-diff --git a/applet/status.c b/applet/status.c
-index ef11bcc..13ec752 100644
---- a/applet/status.c
-+++ b/applet/status.c
-@@ -170,19 +170,6 @@ static void activate_callback(GObject *object, gpointer user_data)
- GTK_STATUS_ICON(object), 1, activate_time);
- }
-
--static void popup_callback(GObject *object, guint button,
-- guint activate_time, gpointer user_data)
--{
-- GtkMenu *menu = user_data;
--
-- if (menu == NULL)
-- return;
--
-- gtk_menu_popup(menu, NULL, NULL,
-- gtk_status_icon_position_menu,
-- GTK_STATUS_ICON(object), button, activate_time);
--}
--
- static GtkIconTheme *icontheme;
- static IconAnimation *animation;
- static GdkPixbuf *pixbuf_notifier;
-@@ -190,7 +177,7 @@ static GdkPixbuf *pixbuf_none;
- static GdkPixbuf *pixbuf_wired;
- static GdkPixbuf *pixbuf_signal[5];
-
--int status_init(StatusCallback activate, GtkWidget *popup)
-+int status_init(StatusCallback activate)
- {
- GdkScreen *screen;
-
-@@ -219,9 +206,6 @@ int status_init(StatusCallback activate, GtkWidget *popup)
- g_signal_connect(statusicon, "activate",
- G_CALLBACK(activate_callback), activate);
-
-- g_signal_connect(statusicon, "popup-menu",
-- G_CALLBACK(popup_callback), popup);
--
- return 0;
- }
-
-@@ -292,8 +276,6 @@ void status_config(void)
-
- static void set_ready(gint signal)
- {
-- int index;
--
- available = TRUE;
-
- if (signal < 0) {
-@@ -302,12 +284,7 @@ static void set_ready(gint signal)
- return;
- }
-
-- if (signal == 0)
-- index = 0;
-- else
-- index = 3;
--
-- gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_signal[index]);
-+ gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_signal[4]);
- gtk_status_icon_set_tooltip(statusicon, NULL);
- }
-
-diff --git a/applet/status.h b/applet/status.h
-index 772a7b2..8a3c83c 100644
---- a/applet/status.h
-+++ b/applet/status.h
-@@ -21,7 +21,7 @@
-
- typedef gboolean (* StatusCallback) (GtkMenu *menu);
-
--int status_init(StatusCallback activate, GtkWidget *popup);
-+int status_init(StatusCallback activate);
- void status_cleanup(void);
-
- void status_unavailable(void);
-diff --git a/common/Makefile.am b/common/Makefile.am
-index ff3a996..8d74a46 100644
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -5,13 +5,6 @@ libcommon_a_SOURCES = connman-dbus.c connman-dbus.h \
- connman-client.h connman-client.c \
- instance.h instance.c
-
--noinst_PROGRAMS = connman-demo test-client
--
--connman_demo_SOURCES = demo.c
--connman_demo_LDADD = libcommon.a @GTK_LIBS@ @DBUS_LIBS@
--
--test_client_LDADD = libcommon.a @GTK_LIBS@ @DBUS_LIBS@
--
- BUILT_SOURCES = marshal.h marshal.c \
- connman-dbus-glue.h \
- instance-glue.h
-diff --git a/common/connman-client.c b/common/connman-client.c
-index aad0a22..4f9cf64 100644
---- a/common/connman-client.c
-+++ b/common/connman-client.c
-@@ -98,13 +98,13 @@ static void connman_client_init(ConnmanClient *client)
-
- priv->store = gtk_tree_store_new(_CONNMAN_NUM_COLUMNS, G_TYPE_OBJECT,
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT,
-- G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
-- G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
-- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT,
-- G_TYPE_STRING);
-+ G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING,
-+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-+ G_TYPE_STRING, G_TYPE_STRING,
-+ G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-
- g_object_set_data(G_OBJECT(priv->store),
-- "State", g_strdup("unavailable"));
-+ "State", g_strdup("unavailable"));
-
- priv->dbus = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-@@ -191,13 +191,23 @@ static gboolean device_filter(GtkTreeModel *model,
- {
- DBusGProxy *proxy;
- gboolean active;
-+ guint type;
-
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_PROXY, &proxy, -1);
-+ gtk_tree_model_get(model, iter, CONNMAN_COLUMN_PROXY, &proxy,
-+ CONNMAN_COLUMN_TYPE, &type,
-+ -1);
-+
-+ switch (type) {
-+ case CONNMAN_TYPE_LABEL_ETHERNET:
-+ case CONNMAN_TYPE_LABEL_WIFI:
-+ case CONNMAN_TYPE_SYSCONFIG:
-+ return TRUE;
-+ }
-
- if (proxy == NULL)
- return FALSE;
-
-- active = g_str_equal(CONNMAN_DEVICE_INTERFACE,
-+ active = g_str_equal(CONNMAN_SERVICE_INTERFACE,
- dbus_g_proxy_get_interface(proxy));
-
- g_object_unref(proxy);
-@@ -231,10 +241,10 @@ static gboolean device_network_filter(GtkTreeModel *model,
- if (proxy == NULL)
- return FALSE;
-
-- active = g_str_equal(CONNMAN_DEVICE_INTERFACE,
-+ active = g_str_equal(CONNMAN_SERVICE_INTERFACE,
- dbus_g_proxy_get_interface(proxy));
- if (active == FALSE)
-- active = g_str_equal(CONNMAN_NETWORK_INTERFACE,
-+ active = g_str_equal(CONNMAN_SERVICE_INTERFACE,
- dbus_g_proxy_get_interface(proxy));
-
- g_object_unref(proxy);
-@@ -277,7 +287,7 @@ GtkTreeModel *connman_client_get_network_model(ConnmanClient *client,
- gtk_tree_model_get(GTK_TREE_MODEL(priv->store), &iter,
- CONNMAN_COLUMN_PROXY, &proxy, -1);
-
-- if (g_str_equal(CONNMAN_DEVICE_INTERFACE,
-+ if (g_str_equal(CONNMAN_SERVICE_INTERFACE,
- dbus_g_proxy_get_interface(proxy)) == TRUE)
- found = g_str_has_prefix(dbus_g_proxy_get_path(proxy),
- device);
-@@ -314,7 +324,7 @@ static gboolean connection_filter(GtkTreeModel *model,
- if (proxy == NULL)
- return FALSE;
-
-- active = g_str_equal(CONNMAN_CONNECTION_INTERFACE,
-+ active = g_str_equal(CONNMAN_SERVICE_INTERFACE,
- dbus_g_proxy_get_interface(proxy));
-
- g_object_unref(proxy);
-@@ -337,28 +347,37 @@ GtkTreeModel *connman_client_get_connection_model(ConnmanClient *client)
- return model;
- }
-
--void connman_client_set_policy(ConnmanClient *client, const gchar *device,
-- const gchar *policy)
-+gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device,
-+ struct ipv4_config *ipv4_config)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
- DBusGProxy *proxy;
- GValue value = { 0 };
-+ gboolean ret;
-+ GHashTable *ipv4 = g_hash_table_new(g_str_hash, g_str_equal);
-+
-+ g_hash_table_insert(ipv4, "Method", (gpointer)ipv4_config->method);
-+ g_hash_table_insert(ipv4, "Address", (gpointer)ipv4_config->address);
-+ g_hash_table_insert(ipv4, "Netmask", (gpointer)ipv4_config->netmask);
-+ g_hash_table_insert(ipv4, "Gateway", (gpointer)ipv4_config->gateway);
-
- DBG("client %p", client);
-
- if (device == NULL)
-- return;
-+ return FALSE;
-
- proxy = connman_dbus_get_proxy(priv->store, device);
- if (proxy == NULL)
-- return;
-+ return FALSE;
-
-- g_value_init(&value, G_TYPE_STRING);
-- g_value_set_string(&value, policy);
-+ g_value_init(&value, DBUS_TYPE_G_STRING_STRING_HASHTABLE);
-+ g_value_set_boxed(&value, ipv4);
-
-- connman_set_property(proxy, "Policy", &value, NULL);
-+ ret = connman_set_property(proxy, "IPv4.Configuration", &value, NULL);
-
- g_object_unref(proxy);
-+
-+ return ret;
- }
-
- void connman_client_set_powered(ConnmanClient *client, const gchar *device,
-@@ -385,98 +404,128 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device,
- g_object_unref(proxy);
- }
-
--static gboolean device_scan(GtkTreeModel *model, GtkTreePath *path,
-- GtkTreeIter *iter, gpointer user_data)
-+void connman_client_request_scan(ConnmanClient *client, char *scantype,
-+ connman_request_scan_reply callback, gpointer userdata)
- {
-- DBusGProxy *proxy;
-- gboolean enabled;
-+ ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_PROXY, &proxy,
-- CONNMAN_COLUMN_ENABLED, &enabled, -1);
-+ DBG("client %p", client);
-
-- if (proxy == NULL)
-- return FALSE;
-+ connman_request_scan_async(priv->manager, scantype, callback, userdata);
-+}
-
-- if (g_str_equal(dbus_g_proxy_get_interface(proxy),
-- CONNMAN_DEVICE_INTERFACE) == FALSE)
-- return FALSE;
-+gboolean connman_client_get_offline_status(ConnmanClient *client)
-+{
-+ GHashTable *hash;
-+ GValue *value;
-+ ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-+ gboolean ret;
-
-- if (enabled == FALSE)
-- return FALSE;
-+ DBG("client %p", client);
-
-- connman_propose_scan(proxy, NULL);
-+ ret = connman_get_properties(priv->manager, &hash, NULL);
-
-- g_object_unref(proxy);
-+ if (ret == FALSE)
-+ goto done;
-+
-+ value = g_hash_table_lookup(hash, "OfflineMode");
-+ ret = value ? g_value_get_boolean(value) : FALSE;
-+
-+done:
-+ return ret;
-
-- return FALSE;
- }
-
--void connman_client_propose_scan(ConnmanClient *client, const gchar *device)
-+void connman_client_set_offlinemode(ConnmanClient *client, gboolean status)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-- DBusGProxy *proxy;
-+ GValue value = { 0 };
-
- DBG("client %p", client);
-
-- if (device == NULL) {
-- gtk_tree_model_foreach(GTK_TREE_MODEL(priv->store),
-- device_scan, NULL);
-- return;
-- }
--
-- proxy = connman_dbus_get_proxy(priv->store, device);
-- if (proxy == NULL)
-- return;
--
-- connman_propose_scan(proxy, NULL);
-+ g_value_init(&value, G_TYPE_BOOLEAN);
-+ g_value_set_boolean(&value, status);
-
-- g_object_unref(proxy);
-+ connman_set_property(priv->manager, "OfflineMode", &value, NULL);
- }
-
- static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, gpointer user_data)
- {
- DBusGProxy *proxy;
-- gboolean enabled;
-+ char *name;
-+ guint type;
-
- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_PROXY, &proxy,
-- CONNMAN_COLUMN_ENABLED, &enabled, -1);
-+ CONNMAN_COLUMN_NAME, &name,
-+ CONNMAN_COLUMN_TYPE, &type,
-+ -1);
-
- if (proxy == NULL)
-- return FALSE;
-+ return TRUE;
-
- if (g_str_equal(dbus_g_proxy_get_interface(proxy),
-- CONNMAN_NETWORK_INTERFACE) == FALSE)
-- return FALSE;
-+ CONNMAN_SERVICE_INTERFACE) == FALSE)
-+ return TRUE;
-
-- if (enabled == TRUE)
-+ if (type == CONNMAN_TYPE_WIFI)
- connman_disconnect(proxy, NULL);
-
- g_object_unref(proxy);
-
-- return enabled;
-+ return FALSE;
- }
-
--void connman_client_connect(ConnmanClient *client, const gchar *network)
-+gboolean connman_client_connect(ConnmanClient *client, const gchar *network)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
- DBusGProxy *proxy;
-+ gboolean ret = FALSE;
-
- DBG("client %p", client);
-+ DBG("network %s", network);
-
- if (network == NULL)
-- return;
-+ goto done;
-
- gtk_tree_model_foreach(GTK_TREE_MODEL(priv->store),
- network_disconnect, NULL);
-
- proxy = connman_dbus_get_proxy(priv->store, network);
- if (proxy == NULL)
-- return;
-+ goto done;
-
-- connman_connect(proxy, NULL);
-+ ret = connman_connect(proxy, NULL);
-
- g_object_unref(proxy);
-+
-+done:
-+ return ret;
-+}
-+
-+void connman_client_connect_async(ConnmanClient *client, const gchar *network,
-+ connman_connect_reply callback, gpointer userdata)
-+{
-+ ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-+ DBusGProxy *proxy;
-+
-+ DBG("client %p", client);
-+ DBG("network %s", network);
-+
-+ if (network == NULL)
-+ goto done;
-+
-+ gtk_tree_model_foreach(GTK_TREE_MODEL(priv->store),
-+ network_disconnect, NULL);
-+
-+ proxy = connman_dbus_get_proxy(priv->store, network);
-+ if (proxy == NULL)
-+ goto done;
-+
-+ connman_connect_async(proxy, callback, userdata);
-+
-+done:
-+ return;
- }
-
- static void connman_client_disconnect_all(ConnmanClient *client)
-@@ -487,32 +536,37 @@ static void connman_client_disconnect_all(ConnmanClient *client)
- network_disconnect, NULL);
- }
-
--void connman_client_disconnect(ConnmanClient *client, const gchar *network)
-+gboolean connman_client_disconnect(ConnmanClient *client, const gchar *network)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
- DBusGProxy *proxy;
-+ gboolean ret = FALSE;
-
- DBG("client %p", client);
-
- if (network == NULL) {
-+ ret = TRUE;
- connman_client_disconnect_all(client);
-- return;
-+ goto done;
- }
-
- proxy = connman_dbus_get_proxy(priv->store, network);
- if (proxy == NULL)
-- return;
-+ goto done;
-
-- connman_disconnect(proxy, NULL);
-+ ret = connman_disconnect(proxy, NULL);
-
- g_object_unref(proxy);
-+
-+done:
-+ return ret;
- }
-
--guint connman_client_get_security(ConnmanClient *client, const gchar *network)
-+gchar *connman_client_get_security(ConnmanClient *client, const gchar *network)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
- GtkTreeIter iter;
-- guint security;
-+ gchar *security;
-
- DBG("client %p", client);
-
-@@ -548,41 +602,60 @@ gchar *connman_client_get_passphrase(ConnmanClient *client, const gchar *network
- return passphrase;
- }
-
--void connman_client_set_passphrase(ConnmanClient *client, const gchar *network,
-+gboolean connman_client_set_passphrase(ConnmanClient *client, const gchar *network,
- const gchar *passphrase)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
- DBusGProxy *proxy;
- GValue value = { 0 };
-+ gboolean ret = FALSE;
-
- DBG("client %p", client);
-+ DBG("network %p", network);
-
- if (network == NULL)
-- return;
-+ goto done;
-
- proxy = connman_dbus_get_proxy(priv->store, network);
- if (proxy == NULL)
-- return;
-+ goto done;
-
- g_value_init(&value, G_TYPE_STRING);
- g_value_set_string(&value, passphrase);
-
-- connman_set_property(proxy, "WiFi.Passphrase", &value, NULL);
-+ ret = connman_set_property(proxy, "Passphrase", &value, NULL);
-
- g_value_unset(&value);
-
- g_object_unref(proxy);
-+done:
-+ return ret;
- }
-
--void connman_client_set_remember(ConnmanClient *client, const gchar *network,
-- gboolean remember)
-+void connman_client_set_callback(ConnmanClient *client,
-+ ConnmanClientCallback callback, gpointer user_data)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-- DBusGProxy *proxy;
-- GValue value = { 0 };
-+ gchar *state;
-
- DBG("client %p", client);
-
-+ priv->callback = callback;
-+ priv->userdata = user_data;
-+
-+ g_object_set_data(G_OBJECT(priv->store), "callback", callback);
-+ g_object_set_data(G_OBJECT(priv->store), "userdata", user_data);
-+
-+ state = g_object_get_data(G_OBJECT(priv->store), "State");
-+ if (state != NULL && priv->callback != NULL)
-+ priv->callback(state, priv->userdata);
-+}
-+
-+void connman_client_remove(ConnmanClient *client, const gchar *network)
-+{
-+ ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-+ DBusGProxy *proxy;
-+
- if (network == NULL)
- return;
-
-@@ -590,31 +663,46 @@ void connman_client_set_remember(ConnmanClient *client, const gchar *network,
- if (proxy == NULL)
- return;
-
-- g_value_init(&value, G_TYPE_BOOLEAN);
-- g_value_set_boolean(&value, remember);
-+ connman_remove(proxy, NULL);
-+
-+ g_object_unref(proxy);
-+}
-+
-+void connman_client_enable_technology(ConnmanClient *client, const char *network,
-+ const gchar *technology)
-+{
-+ ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-+ DBusGProxy *proxy;
-+ int ret;
-
-- connman_set_property(proxy, "Remember", &value, NULL);
-+ if (network== NULL)
-+ return;
-
-- g_value_unset(&value);
-+ proxy = connman_dbus_get_proxy(priv->store, network);
-+ if (proxy == NULL)
-+ return;
-+
-+ ret = connman_enable_technology(proxy, technology, NULL);
-
- g_object_unref(proxy);
- }
-
--void connman_client_set_callback(ConnmanClient *client,
-- ConnmanClientCallback callback, gpointer user_data)
-+void connman_client_disable_technology(ConnmanClient *client, const char *network,
-+ const gchar *technology)
- {
- ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client);
-- gchar *state;
-+ DBusGProxy *proxy;
-+ int ret;
-
-- DBG("client %p", client);
-
-- priv->callback = callback;
-- priv->userdata = user_data;
-+ if (network == NULL)
-+ return;
-
-- g_object_set_data(G_OBJECT(priv->store), "callback", callback);
-- g_object_set_data(G_OBJECT(priv->store), "userdata", user_data);
-+ proxy = connman_dbus_get_proxy(priv->store, network);
-+ if (proxy == NULL)
-+ return;
-
-- state = g_object_get_data(G_OBJECT(priv->store), "State");
-- if (state != NULL && priv->callback != NULL)
-- priv->callback(state, priv->userdata);
-+ ret = connman_disable_technology(proxy, technology, NULL);
-+
-+ g_object_unref(proxy);
- }
-diff --git a/common/connman-client.h b/common/connman-client.h
-index f30dae4..00c328a 100644
---- a/common/connman-client.h
-+++ b/common/connman-client.h
-@@ -23,6 +23,7 @@
- #define __CONNMAN_CLIENT_H
-
- #include <gtk/gtk.h>
-+#include "connman-dbus-glue.h"
-
- G_BEGIN_DECLS
-
-@@ -49,6 +50,13 @@ struct _ConnmanClientClass {
- GObjectClass parent_class;
- };
-
-+struct ipv4_config {
-+ const gchar *method;
-+ const gchar *address;
-+ const gchar *netmask;
-+ const gchar *gateway;
-+};
-+
- GType connman_client_get_type(void);
-
- ConnmanClient *connman_client_new(void);
-@@ -60,18 +68,20 @@ GtkTreeModel *connman_client_get_network_model(ConnmanClient *client,
- const gchar *device);
- GtkTreeModel *connman_client_get_connection_model(ConnmanClient *client);
-
--void connman_client_set_policy(ConnmanClient *client, const gchar *device,
-- const gchar *policy);
- void connman_client_set_powered(ConnmanClient *client, const gchar *device,
- gboolean powered);
- void connman_client_propose_scan(ConnmanClient *client, const gchar *device);
-
--void connman_client_connect(ConnmanClient *client, const gchar *network);
--void connman_client_disconnect(ConnmanClient *client, const gchar *network);
-+gboolean connman_client_connect(ConnmanClient *client, const gchar *network);
-+
-+void connman_client_connect_async(ConnmanClient *client, const gchar *network,
-+ connman_connect_reply callback, gpointer userdata);
-
--guint connman_client_get_security(ConnmanClient *client, const gchar *network);
-+gboolean connman_client_disconnect(ConnmanClient *client, const gchar *network);
-+
-+gchar *connman_client_get_security(ConnmanClient *client, const gchar *network);
- gchar *connman_client_get_passphrase(ConnmanClient *client, const gchar *network);
--void connman_client_set_passphrase(ConnmanClient *client, const gchar *network,
-+gboolean connman_client_set_passphrase(ConnmanClient *client, const gchar *network,
- const gchar *passphrase);
- void connman_client_set_remember(ConnmanClient *client, const gchar *network,
- gboolean remember);
-@@ -81,37 +91,63 @@ typedef void (* ConnmanClientCallback) (const char *status, void *user_data);
- void connman_client_set_callback(ConnmanClient *client,
- ConnmanClientCallback callback, gpointer user_data);
-
-+gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device,
-+ struct ipv4_config *ipv4_config);
-+
-+gboolean connman_dbus_get_iter(GtkTreeStore *store, const gchar *path,
-+ GtkTreeIter *iter);
-+void connman_client_remove(ConnmanClient *client, const gchar *network);
-+
-+void connman_client_request_scan(ConnmanClient *client, char *scantype,
-+ connman_request_scan_reply callback, gpointer userdata);
-+gboolean connman_client_get_offline_status(ConnmanClient *client);
-+void connman_client_set_offlinemode(ConnmanClient *client, gboolean status);
-+
-+void connman_client_enable_technology(ConnmanClient *client, const char *network,
-+ const gchar *technology);
-+void connman_client_disable_technology(ConnmanClient *client, const char *network,
-+ const gchar *technology);
- enum {
- CONNMAN_COLUMN_PROXY, /* G_TYPE_OBJECT */
-+ CONNMAN_COLUMN_STATE, /* G_TYPE_STRING */
- CONNMAN_COLUMN_NAME, /* G_TYPE_STRING */
-- CONNMAN_COLUMN_ICON, /* G_TYPE_STRING */
- CONNMAN_COLUMN_TYPE, /* G_TYPE_UINT */
-- CONNMAN_COLUMN_ENABLED, /* G_TYPE_BOOLEAN */
-- CONNMAN_COLUMN_INRANGE, /* G_TYPE_BOOLEAN */
-- CONNMAN_COLUMN_REMEMBER, /* G_TYPE_BOOLEAN */
-+ CONNMAN_COLUMN_ICON, /* G_TYPE_STRING */
- CONNMAN_COLUMN_STRENGTH, /* G_TYPE_UINT */
-- CONNMAN_COLUMN_SECURITY, /* G_TYPE_UINT */
-+ CONNMAN_COLUMN_SECURITY, /* G_TYPE_STRING */
- CONNMAN_COLUMN_PASSPHRASE, /* G_TYPE_STRING */
-- CONNMAN_COLUMN_NETWORK,
-- CONNMAN_COLUMN_ADDRESS,
-- CONNMAN_COLUMN_POLICY,
-- CONNMAN_COLUMN_DEVICE,
-- _CONNMAN_NUM_COLUMNS
-+
-+ CONNMAN_COLUMN_METHOD, /* G_TYPE_STRING */
-+ CONNMAN_COLUMN_ADDRESS, /* G_TYPE_STRING */
-+ CONNMAN_COLUMN_NETMASK, /* G_TYPE_STRING */
-+ CONNMAN_COLUMN_GATEWAY, /* G_TYPE_STRING */
-+
-+ CONNMAN_COLUMN_ETHERNET_ENABLED, /* G_TYPE_BOOLEAN */
-+ CONNMAN_COLUMN_WIFI_ENABLED, /* G_TYPE_BOOLEAN */
-+
-+ CONNMAN_COLUMN_OFFLINEMODE, /* G_TYPE_BOOLEAN */
-+
-+ _CONNMAN_NUM_COLUMNS,
-+
- };
-
- enum {
- CONNMAN_TYPE_UNKNOWN,
-+
- CONNMAN_TYPE_ETHERNET,
- CONNMAN_TYPE_WIFI,
- CONNMAN_TYPE_WIMAX,
- CONNMAN_TYPE_BLUETOOTH,
-+
-+ CONNMAN_TYPE_LABEL_ETHERNET,
-+ CONNMAN_TYPE_LABEL_WIFI,
-+
-+ CONNMAN_TYPE_SYSCONFIG,
-+ _CONNMAN_NUM_TYPE,
- };
-
- enum {
-- CONNMAN_POLICY_UNKNOWN,
-- CONNMAN_POLICY_IGNORE,
-- CONNMAN_POLICY_OFF,
-- CONNMAN_POLICY_AUTO,
-+ CONNMAN_POLICY_DHCP,
- CONNMAN_POLICY_MANUAL,
- };
-
-diff --git a/common/connman-dbus.c b/common/connman-dbus.c
-index 9eba7ae..bf1778f 100644
---- a/common/connman-dbus.c
-+++ b/common/connman-dbus.c
-@@ -137,6 +137,27 @@ DBusGProxy *connman_dbus_get_proxy(GtkTreeStore *store, const gchar *path)
- return proxy;
- }
-
-+static gboolean compare_type(GtkTreeStore *store, GtkTreeIter *iter,
-+ gconstpointer user_data)
-+{
-+ guint type_target = GPOINTER_TO_UINT(user_data);
-+ guint type;
-+ gboolean found = FALSE;
-+
-+ gtk_tree_model_get(GTK_TREE_MODEL(store), iter,
-+ CONNMAN_COLUMN_TYPE, &type, -1);
-+
-+ if (type != CONNMAN_TYPE_UNKNOWN)
-+ found = (type == type_target);
-+
-+ return found;
-+}
-+
-+static gboolean get_iter_from_type(GtkTreeStore *store, GtkTreeIter *iter, guint type)
-+{
-+ return iter_search(store, iter, NULL, compare_type, GUINT_TO_POINTER(type));
-+}
-+
- gboolean connman_dbus_get_iter(GtkTreeStore *store, const gchar *path,
- GtkTreeIter *iter)
- {
-@@ -167,12 +188,7 @@ static void property_update(GtkTreeStore *store, const GValue *value,
-
- DBG("store %p key %s", store, key);
-
-- if (g_str_equal(key, "Connections") == TRUE)
-- iface = CONNMAN_CONNECTION_INTERFACE;
-- else if (g_str_equal(key, "Devices") == TRUE)
-- iface = CONNMAN_DEVICE_INTERFACE;
-- else
-- iface = CONNMAN_NETWORK_INTERFACE;
-+ iface = CONNMAN_SERVICE_INTERFACE;
-
- old_list = g_object_get_data(G_OBJECT(store), key);
-
-@@ -205,25 +221,12 @@ static void property_update(GtkTreeStore *store, const GValue *value,
- for (list = old_list; list; list = list->next) {
- gchar *path = list->data;
- GtkTreeIter iter;
-- gchar *device = NULL;
-
- DBG("old path %s", path);
-
-- if (get_iter_from_path(store, &iter, path) == TRUE) {
-- if (g_str_equal(key, "Connections") == TRUE)
-- gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-- CONNMAN_COLUMN_DEVICE, &device, -1);
--
-+ if (get_iter_from_path(store, &iter, path) == TRUE)
- gtk_tree_store_remove(store, &iter);
-- }
-
-- if (get_iter_from_path(store, &iter, device) == TRUE) {
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_INRANGE, FALSE,
-- CONNMAN_COLUMN_ADDRESS, NULL, -1);
-- }
--
-- g_free(device);
- g_free(path);
- }
-
-@@ -263,155 +266,115 @@ static const gchar *type2icon(guint type)
- return NULL;
- }
-
--static guint get_policy(const GValue *value)
--{
-- const char *policy = value ? g_value_get_string(value) : NULL;
--
-- if (policy == NULL)
-- return CONNMAN_POLICY_UNKNOWN;
-- else if (g_str_equal(policy, "ignore") == TRUE)
-- return CONNMAN_POLICY_IGNORE;
-- else if (g_str_equal(policy, "off") == TRUE)
-- return CONNMAN_POLICY_OFF;
-- else if (g_str_equal(policy, "auto") == TRUE)
-- return CONNMAN_POLICY_AUTO;
-- else if (g_str_equal(policy, "manual") == TRUE)
-- return CONNMAN_POLICY_MANUAL;
--
-- return CONNMAN_POLICY_UNKNOWN;
--}
--
--static guint get_security(const GValue *value)
--{
-- const char *security = value ? g_value_get_string(value) : NULL;
--
-- if (security == NULL)
-- return CONNMAN_SECURITY_UNKNOWN;
-- else if (g_str_equal(security, "none") == TRUE)
-- return CONNMAN_SECURITY_NONE;
-- else if (g_str_equal(security, "wep") == TRUE)
-- return CONNMAN_SECURITY_WEP;
-- else if (g_str_equal(security, "wpa") == TRUE)
-- return CONNMAN_SECURITY_WPA;
-- else if (g_str_equal(security, "wpa2") == TRUE)
-- return CONNMAN_SECURITY_WPA2;
--
-- return CONNMAN_SECURITY_UNKNOWN;
--}
--
--static void network_changed(DBusGProxy *proxy, const char *property,
-- GValue *value, gpointer user_data)
-+static void enabled_technologies_changed(GtkTreeStore *store, GValue *value)
- {
-- GtkTreeStore *store = user_data;
-- const char *path = dbus_g_proxy_get_path(proxy);
- GtkTreeIter iter;
-+ gboolean ethernet_enabled_prev, ethernet_enabled = FALSE;
-+ gboolean wifi_enabled_prev, wifi_enabled = FALSE;
-+ gchar **tech = g_value_get_boxed (value);
-+ gint i;
-+ gboolean ret;
-
-- DBG("store %p proxy %p property %s", store, proxy, property);
--
-- if (property == NULL || value == NULL)
-+ if (value == NULL)
- return;
-
-- if (get_iter_from_path(store, &iter, path) == FALSE)
-- return;
-+ for (i = 0; i < g_strv_length (tech); i++)
-+ {
-+ if (g_str_equal("ethernet", *(tech + i)))
-+ ethernet_enabled = TRUE;
-+ else if (g_str_equal ("wifi", *(tech + i)))
-+ wifi_enabled = TRUE;
-+ }
-
-- if (g_str_equal(property, "Connected") == TRUE) {
-- gboolean connected = g_value_get_boolean(value);
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_ENABLED, connected, -1);
-- } else if (g_str_equal(property, "Available") == TRUE) {
-- gboolean inrange = g_value_get_boolean(value);
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_INRANGE, inrange, -1);
-- } else if (g_str_equal(property, "Remember") == TRUE) {
-- gboolean remember = g_value_get_boolean(value);
-+ get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_ETHERNET);
-+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-+ CONNMAN_COLUMN_ETHERNET_ENABLED, ðernet_enabled_prev, -1);
-+ if (ethernet_enabled_prev != ethernet_enabled)
- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_REMEMBER, remember, -1);
-- } else if (g_str_equal(property, "Strength") == TRUE) {
-- guint strength = g_value_get_uchar(value);
-+ CONNMAN_COLUMN_ETHERNET_ENABLED, ethernet_enabled, -1);
-+
-+ ret = get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_WIFI);
-+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
-+ CONNMAN_COLUMN_WIFI_ENABLED, &wifi_enabled_prev, -1);
-+ if (wifi_enabled_prev != wifi_enabled)
- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_STRENGTH, strength, -1);
-- }
-+ CONNMAN_COLUMN_WIFI_ENABLED, wifi_enabled, -1);
- }
-
--static void network_properties(DBusGProxy *proxy, GHashTable *hash,
-- GError *error, gpointer user_data)
-+static void enabled_technologies_properties(GtkTreeStore *store, DBusGProxy *proxy, GValue *value)
- {
-- GtkTreeStore *store = user_data;
-- GValue *value;
-- const gchar *device, *name, *secret;
-- gboolean connected, inrange, remember;
-- guint strength, security;
-- GtkTreeIter iter, parent;
--
-- DBG("store %p proxy %p hash %p", store, proxy, hash);
--
-- if (error != NULL || hash == NULL)
-- goto done;
--
-- value = g_hash_table_lookup(hash, "Device");
-- device = value ? g_value_get_boxed(value) : NULL;
--
-- value = g_hash_table_lookup(hash, "Name");
-- name = value ? g_value_get_string(value) : NULL;
--
-- value = g_hash_table_lookup(hash, "Connected");
-- connected = value ? g_value_get_boolean(value) : FALSE;
--
-- value = g_hash_table_lookup(hash, "Available");
-- inrange = value ? g_value_get_boolean(value) : FALSE;
-+ GtkTreeIter iter;
-+ gboolean ethernet_enabled = FALSE;
-+ gboolean wifi_enabled = FALSE;
-+ gchar **tech = g_value_get_boxed (value);
-+ gint i;
-+
-+ for (i = 0; i < g_strv_length (tech); i++)
-+ {
-+ if (g_str_equal("ethernet", *(tech + i)))
-+ ethernet_enabled = TRUE;
-+ else if (g_str_equal ("wifi", *(tech + i)))
-+ wifi_enabled = TRUE;
-+ }
-
-- value = g_hash_table_lookup(hash, "Remember");
-- remember = value ? g_value_get_boolean(value) : FALSE;
-+ if (get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_ETHERNET) == FALSE)
-+ gtk_tree_store_append(store, &iter, NULL);
-
-- value = g_hash_table_lookup(hash, "Strength");
-- strength = value ? g_value_get_uchar(value) : 0;
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_PROXY, proxy,
-+ CONNMAN_COLUMN_ETHERNET_ENABLED, ethernet_enabled,
-+ CONNMAN_COLUMN_TYPE, CONNMAN_TYPE_LABEL_ETHERNET,
-+ -1);
-
-- value = g_hash_table_lookup(hash, "WiFi.Security");
-- security = get_security(value);
-+ if (get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_WIFI) == FALSE)
-+ gtk_tree_store_append(store, &iter, NULL);
-
-- value = g_hash_table_lookup(hash, "WiFi.Passphrase");
-- secret = value ? g_value_get_string(value) : NULL;
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_PROXY, proxy,
-+ CONNMAN_COLUMN_WIFI_ENABLED, wifi_enabled,
-+ CONNMAN_COLUMN_TYPE, CONNMAN_TYPE_LABEL_WIFI,
-+ -1);
-+}
-
-- DBG("name %s strength %d", name, strength);
-+static void offline_mode_changed(GtkTreeStore *store, GValue *value)
-+{
-+ GtkTreeIter iter;
-+ gboolean offline_mode = g_value_get_boolean(value);
-
-- if (get_iter_from_path(store, &parent, device) == FALSE)
-- return;
-+ get_iter_from_type(store, &iter, CONNMAN_TYPE_SYSCONFIG);
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_OFFLINEMODE, offline_mode,
-+ -1);
-+}
-
-- if (get_iter_from_proxy(store, &iter, proxy) == FALSE) {
-- gtk_tree_store_insert_with_values(store, &iter, &parent, -1,
-- CONNMAN_COLUMN_PROXY, proxy,
-- CONNMAN_COLUMN_NAME, name,
-- CONNMAN_COLUMN_ENABLED, connected,
-- CONNMAN_COLUMN_INRANGE, inrange,
-- CONNMAN_COLUMN_REMEMBER, remember,
-- CONNMAN_COLUMN_STRENGTH, strength,
-- CONNMAN_COLUMN_SECURITY, security,
-- CONNMAN_COLUMN_PASSPHRASE, secret, -1);
-+static void offline_mode_properties(GtkTreeStore *store, DBusGProxy *proxy, GValue *value)
-+{
-+ GtkTreeIter iter;
-+ gboolean offline_mode = g_value_get_boolean(value);
-
-- dbus_g_proxy_add_signal(proxy, "PropertyChanged",
-- G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-- dbus_g_proxy_connect_signal(proxy, "PropertyChanged",
-- G_CALLBACK(network_changed), store, NULL);
-- } else
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_NAME, name,
-- CONNMAN_COLUMN_ENABLED, connected,
-- CONNMAN_COLUMN_INRANGE, inrange,
-- CONNMAN_COLUMN_REMEMBER, remember,
-- CONNMAN_COLUMN_STRENGTH, strength,
-- CONNMAN_COLUMN_SECURITY, security,
-- CONNMAN_COLUMN_PASSPHRASE, secret, -1);
-+ if (get_iter_from_type(store, &iter, CONNMAN_TYPE_SYSCONFIG) == FALSE)
-+ gtk_tree_store_insert(store, &iter, NULL, 0);
-
--done:
-- g_object_unref(proxy);
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_PROXY, proxy,
-+ CONNMAN_COLUMN_TYPE, CONNMAN_TYPE_SYSCONFIG,
-+ CONNMAN_COLUMN_OFFLINEMODE, offline_mode,
-+ -1);
- }
-
--static void device_changed(DBusGProxy *proxy, const char *property,
-+static void service_changed(DBusGProxy *proxy, const char *property,
- GValue *value, gpointer user_data)
- {
- GtkTreeStore *store = user_data;
- const char *path = dbus_g_proxy_get_path(proxy);
- GtkTreeIter iter;
-+ GHashTable *ipv4;
-+ const char *method, *addr, *netmask, *gateway;
-+ GValue *ipv4_method, *ipv4_address, *ipv4_netmask, *ipv4_gateway;
-+
-+ const char *state, *icon, *name, *security, *passphrase;
-+ guint strength, type;
-+
-
- DBG("store %p proxy %p property %s", store, proxy, property);
-
-@@ -421,165 +384,167 @@ static void device_changed(DBusGProxy *proxy, const char *property,
- if (get_iter_from_path(store, &iter, path) == FALSE)
- return;
-
-- if (g_str_equal(property, "Policy") == TRUE) {
-- guint policy = get_policy(value);
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_POLICY, policy, -1);
-- } else if (g_str_equal(property, "Powered") == TRUE) {
-- gboolean powered = g_value_get_boolean(value);
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_ENABLED, powered, -1);
-- } else if (g_str_equal(property, "Networks") == TRUE)
-- property_update(store, value, path, network_properties);
--}
--
--static void device_properties(DBusGProxy *proxy, GHashTable *hash,
-- GError *error, gpointer user_data)
--{
-- GtkTreeStore *store = user_data;
-- const char *path = dbus_g_proxy_get_path(proxy);
-- GValue *value;
-- const gchar *name, *icon;
-- guint type, policy;
-- gboolean powered;
-- GtkTreeIter iter;
--
-- DBG("store %p proxy %p hash %p", store, proxy, hash);
-+ if (g_str_equal(property, "IPv4") == TRUE) {
-
-- if (error != NULL || hash == NULL)
-- goto done;
--
-- value = g_hash_table_lookup(hash, "Name");
-- name = value ? g_value_get_string(value) : NULL;
--
-- value = g_hash_table_lookup(hash, "Type");
-- type = get_type(value);
-- icon = type2icon(type);
-+ ipv4 = g_value_get_boxed (value);
-+ if (!ipv4)
-+ return;
-
-- value = g_hash_table_lookup(hash, "Policy");
-- policy = get_policy(value);
-+ ipv4_method = g_hash_table_lookup (ipv4, "Method");
-+ method = ipv4_method ? g_value_get_string(ipv4_method) : NULL;
-
-- value = g_hash_table_lookup(hash, "Powered");
-- powered = value ? g_value_get_boolean(value) : FALSE;
-+ ipv4_address = g_hash_table_lookup (ipv4, "Address");
-+ addr = ipv4_address ? g_value_get_string(ipv4_address) : NULL;
-
-- DBG("name %s type %d icon %s", name, type, icon);
-+ ipv4_netmask = g_hash_table_lookup (ipv4, "Netmask");
-+ netmask = ipv4_netmask ? g_value_get_string(ipv4_netmask) : NULL;
-
-- if (get_iter_from_proxy(store, &iter, proxy) == FALSE) {
-- gtk_tree_store_insert_with_values(store, &iter, NULL, -1,
-- CONNMAN_COLUMN_PROXY, proxy,
-- CONNMAN_COLUMN_NAME, name,
-- CONNMAN_COLUMN_ICON, icon,
-- CONNMAN_COLUMN_TYPE, type,
-- CONNMAN_COLUMN_ENABLED, powered,
-- CONNMAN_COLUMN_POLICY, policy, -1);
-+ ipv4_gateway = g_hash_table_lookup (ipv4, "Gateway");
-+ gateway = ipv4_gateway ? g_value_get_string(ipv4_gateway) : NULL;
-
-- dbus_g_proxy_add_signal(proxy, "PropertyChanged",
-- G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-- dbus_g_proxy_connect_signal(proxy, "PropertyChanged",
-- G_CALLBACK(device_changed), store, NULL);
-- } else
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_METHOD, method,
-+ CONNMAN_COLUMN_ADDRESS, addr,
-+ CONNMAN_COLUMN_NETMASK, netmask,
-+ CONNMAN_COLUMN_GATEWAY, gateway,
-+ -1);
-+
-+ } else if (g_str_equal(property, "State") == TRUE) {
-+ state = value ? g_value_get_string(value) : NULL;
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_STATE, state,
-+ -1);
-+ } else if (g_str_equal(property, "Name") == TRUE) {
-+ name = value ? g_value_get_string(value) : NULL;
- gtk_tree_store_set(store, &iter,
- CONNMAN_COLUMN_NAME, name,
-- CONNMAN_COLUMN_ICON, icon,
-+ -1);
-+ } else if (g_str_equal(property, "Type") == TRUE) {
-+ type = get_type(value);
-+ icon = type2icon(type);
-+ gtk_tree_store_set(store, &iter,
- CONNMAN_COLUMN_TYPE, type,
-- CONNMAN_COLUMN_ENABLED, powered,
-- CONNMAN_COLUMN_POLICY, policy, -1);
--
-- value = g_hash_table_lookup(hash, "Networks");
-- if (value != NULL)
-- property_update(store, value, path, network_properties);
--
--done:
-- g_object_unref(proxy);
--}
--
--static void connection_changed(DBusGProxy *proxy, const char *property,
-- GValue *value, gpointer user_data)
--{
-- GtkTreeStore *store = user_data;
-- const char *path = dbus_g_proxy_get_path(proxy);
-- GtkTreeIter iter;
--
-- DBG("store %p proxy %p property %s", store, proxy, property);
--
-- if (property == NULL || value == NULL)
-- return;
--
-- if (get_iter_from_path(store, &iter, path) == FALSE)
-- return;
--
-- if (g_str_equal(property, "Default") == TRUE) {
-- gboolean enabled = g_value_get_boolean(value);
-+ CONNMAN_COLUMN_ICON, icon,
-+ -1);
-+ } else if (g_str_equal(property, "Security") == TRUE) {
-+ security = value ? g_value_get_string(value) : NULL;
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_SECURITY, security,
-+ -1);
-+ } else if (g_str_equal(property, "PassPhrase") == TRUE) {
-+ passphrase = value ? g_value_get_string(value) : NULL;
- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_ENABLED, enabled, -1);
-+ CONNMAN_COLUMN_PASSPHRASE, passphrase,
-+ -1);
- } else if (g_str_equal(property, "Strength") == TRUE) {
-- guint strength = g_value_get_uchar(value);
-+ strength = value ? g_value_get_uchar(value) : 0;
- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_STRENGTH, strength, -1);
-+ CONNMAN_COLUMN_STRENGTH, strength,
-+ -1);
- }
- }
-
--static void connection_properties(DBusGProxy *proxy, GHashTable *hash,
-+static void service_properties(DBusGProxy *proxy, GHashTable *hash,
- GError *error, gpointer user_data)
- {
- GtkTreeStore *store = user_data;
-- GValue *value;
-- guint type, strength;
-- gboolean enabled;
-- const char *device, *address;
-+
-+ const char *state, *icon, *name, *security, *passphrase;
-+ guint strength, type;
-+
-+ GHashTable *ipv4;
-+ GValue *ipv4_method, *ipv4_address, *ipv4_netmask, *ipv4_gateway;
-+ const char *method, *addr, *netmask, *gateway;
-+
- GtkTreeIter iter;
-
-+ GValue *value;
-+
- DBG("store %p proxy %p hash %p", store, proxy, hash);
-
- if (error != NULL || hash == NULL)
- goto done;
-
-+ value = g_hash_table_lookup(hash, "State");
-+ state = value ? g_value_get_string(value) : NULL;
-+
-+ value = g_hash_table_lookup(hash, "Name");
-+ name = value ? g_value_get_string(value) : NULL;
-+
- value = g_hash_table_lookup(hash, "Type");
- type = get_type(value);
-+ icon = type2icon(type);
-+
-+ value = g_hash_table_lookup(hash, "Security");
-+ security = value ? g_value_get_string(value) : NULL;
-+
-+ value = g_hash_table_lookup(hash, "PassPhrase");
-+ passphrase = value ? g_value_get_string(value) : NULL;
-
- value = g_hash_table_lookup(hash, "Strength");
- strength = value ? g_value_get_uchar(value) : 0;
-
-- value = g_hash_table_lookup(hash, "Default");
-- enabled = value ? g_value_get_boolean(value) : FALSE;
-+ value = g_hash_table_lookup(hash, "IPv4.Configuration");
-+ ipv4 = g_value_get_boxed (value);
-
-- value = g_hash_table_lookup(hash, "IPv4.Address");
-- address = value ? g_value_get_string(value) : NULL;
-+ if (!ipv4)
-+ goto done;
-
-- DBG("type %d address %s", type, address);
-+ ipv4_method = g_hash_table_lookup (ipv4, "Method");
-+ method = ipv4_method ? g_value_get_string(ipv4_method) : NULL;
-
-- if (get_iter_from_proxy(store, &iter, proxy) == FALSE) {
-- gtk_tree_store_insert_with_values(store, &iter, NULL, -1,
-- CONNMAN_COLUMN_PROXY, proxy,
-- CONNMAN_COLUMN_TYPE, type,
-- CONNMAN_COLUMN_ENABLED, enabled,
-- CONNMAN_COLUMN_STRENGTH, strength,
-- CONNMAN_COLUMN_ADDRESS, address, -1);
-+ ipv4_address = g_hash_table_lookup (ipv4, "Address");
-+ addr = ipv4_address ? g_value_get_string(ipv4_address) : NULL;
-
-- dbus_g_proxy_add_signal(proxy, "PropertyChanged",
-- G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-- dbus_g_proxy_connect_signal(proxy, "PropertyChanged",
-- G_CALLBACK(connection_changed), store, NULL);
-- } else
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_TYPE, type,
-- CONNMAN_COLUMN_ENABLED, enabled,
-- CONNMAN_COLUMN_STRENGTH, strength, -1);
-+ ipv4_netmask = g_hash_table_lookup (ipv4, "Netmask");
-+ netmask = ipv4_netmask ? g_value_get_string(ipv4_netmask) : NULL;
-
-- value = g_hash_table_lookup(hash, "Device");
-- device = value ? g_value_get_boxed(value) : NULL;
-+ ipv4_gateway = g_hash_table_lookup (ipv4, "Gateway");
-+ gateway = ipv4_gateway ? g_value_get_string(ipv4_gateway) : NULL;
-
-- DBG("device %s", device);
-+ DBG("name %s type %d icon %s state %s", name, type, icon, state);
-
-- gtk_tree_store_set(store, &iter, CONNMAN_COLUMN_DEVICE, device, -1);
-+ if (get_iter_from_proxy(store, &iter, proxy) == FALSE) {
-+ GtkTreeIter label_iter;
-+ guint label_type;
-
-- if (get_iter_from_path(store, &iter, device) == TRUE) {
-- gtk_tree_store_set(store, &iter,
-- CONNMAN_COLUMN_DEVICE, device,
-- CONNMAN_COLUMN_INRANGE, TRUE,
-- CONNMAN_COLUMN_ADDRESS, address, -1);
-+ switch (type) {
-+ case CONNMAN_TYPE_ETHERNET:
-+ label_type = CONNMAN_TYPE_LABEL_ETHERNET;
-+ break;
-+ case CONNMAN_TYPE_WIFI:
-+ label_type = CONNMAN_TYPE_LABEL_WIFI;
-+ break;
-+ default:
-+ label_type = CONNMAN_TYPE_UNKNOWN;
-+ break;
-+ }
-+
-+ get_iter_from_type(store, &label_iter, label_type);
-+
-+ gtk_tree_store_insert_after(store, &iter, NULL, &label_iter);
-+
-+ dbus_g_proxy_add_signal(proxy, "PropertyChanged",
-+ G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-+ dbus_g_proxy_connect_signal(proxy, "PropertyChanged",
-+ G_CALLBACK(service_changed), store, NULL);
- }
-
-+ gtk_tree_store_set(store, &iter,
-+ CONNMAN_COLUMN_PROXY, proxy,
-+ CONNMAN_COLUMN_NAME, name,
-+ CONNMAN_COLUMN_ICON, icon,
-+ CONNMAN_COLUMN_TYPE, type,
-+ CONNMAN_COLUMN_STATE, state,
-+ CONNMAN_COLUMN_SECURITY, security,
-+ CONNMAN_COLUMN_PASSPHRASE, passphrase,
-+ CONNMAN_COLUMN_STRENGTH, strength,
-+ CONNMAN_COLUMN_METHOD, method,
-+ CONNMAN_COLUMN_ADDRESS, addr,
-+ CONNMAN_COLUMN_NETMASK, netmask,
-+ CONNMAN_COLUMN_GATEWAY, gateway,
-+ -1);
-+
- done:
- g_object_unref(proxy);
- }
-@@ -594,25 +559,12 @@ static void manager_changed(DBusGProxy *proxy, const char *property,
- if (property == NULL || value == NULL)
- return;
-
-- if (g_str_equal(property, "State") == TRUE) {
-- ConnmanClientCallback callback;
-- gpointer userdata;
-- gchar *state;
--
-- state = g_object_get_data(G_OBJECT(store), "State");
-- g_free(state);
--
-- state = g_value_dup_string(value);
-- g_object_set_data(G_OBJECT(store), "State", state);
--
-- callback = g_object_get_data(G_OBJECT(store), "callback");
-- userdata = g_object_get_data(G_OBJECT(store), "userdata");
-- if (callback)
-- callback(state, userdata);
-- } else if (g_str_equal(property, "Connections") == TRUE) {
-- property_update(store, value, property, connection_properties);
-- } else if (g_str_equal(property, "Devices") == TRUE) {
-- property_update(store, value, property, device_properties);
-+ if (g_str_equal(property, "Services") == TRUE) {
-+ property_update(store, value, property, service_properties);
-+ } else if (g_str_equal(property, "EnabledTechnologies") == TRUE) {
-+ enabled_technologies_changed(store, value);
-+ } else if (g_str_equal(property, "OfflineMode") == TRUE) {
-+ offline_mode_changed(store, value);
- }
- }
-
-@@ -620,31 +572,24 @@ static void manager_properties(DBusGProxy *proxy, GHashTable *hash,
- GError *error, gpointer user_data)
- {
- GtkTreeStore *store = user_data;
-- ConnmanClientCallback callback;
- GValue *value;
-- gchar *state;
-
- DBG("store %p proxy %p hash %p", store, proxy, hash);
-
- if (error != NULL || hash == NULL)
- return;
-
-- value = g_hash_table_lookup(hash, "State");
-- state = value ? g_value_dup_string(value) : NULL;
-- g_object_set_data(G_OBJECT(store), "State", state);
--
-- callback = g_object_get_data(G_OBJECT(store), "callback");
-- if (callback)
-- callback(state, NULL);
-+ value = g_hash_table_lookup(hash, "Services");
-+ if (value != NULL)
-+ property_update(store, value, "Services", service_properties);
-
-- value = g_hash_table_lookup(hash, "Devices");
-+ value = g_hash_table_lookup(hash, "EnabledTechnologies");
- if (value != NULL)
-- property_update(store, value, "Devices", device_properties);
-+ enabled_technologies_properties(store, proxy, value);
-
-- value = g_hash_table_lookup(hash, "Connections");
-+ value = g_hash_table_lookup(hash, "OfflineMode");
- if (value != NULL)
-- property_update(store, value,
-- "Connections", connection_properties);
-+ offline_mode_properties(store, proxy, value);
- }
-
- DBusGProxy *connman_dbus_create_manager(DBusGConnection *conn,
-diff --git a/common/connman-dbus.h b/common/connman-dbus.h
-index a9fa51c..dc07650 100644
---- a/common/connman-dbus.h
-+++ b/common/connman-dbus.h
-@@ -31,7 +31,7 @@
- #define CONNMAN_MANAGER_PATH "/"
-
- #define CONNMAN_PROFILE_INTERFACE CONNMAN_SERVICE ".Profile"
--#define CONNMAN_DEVICE_INTERFACE CONNMAN_SERVICE ".Device"
-+#define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
- #define CONNMAN_NETWORK_INTERFACE CONNMAN_SERVICE ".Network"
- #define CONNMAN_CONNECTION_INTERFACE CONNMAN_SERVICE ".Connection"
-
-diff --git a/common/connman-dbus.xml b/common/connman-dbus.xml
-index 9fefd55..e20cb3b 100644
---- a/common/connman-dbus.xml
-+++ b/common/connman-dbus.xml
-@@ -15,5 +15,16 @@
- </method>
- <method name="Disconnect">
- </method>
-+ <method name="Remove">
-+ </method>
-+ <method name="RequestScan">
-+ <arg type="s"/>
-+ </method>
-+ <method name="EnableTechnology">
-+ <arg type="s"/>
-+ </method>
-+ <method name="DisableTechnology">
-+ <arg type="s"/>
-+ </method>
- </interface>
- </node>
-diff --git a/common/demo.c b/common/demo.c
-deleted file mode 100644
-index 5e3924f..0000000
---- a/common/demo.c
-+++ /dev/null
-@@ -1,465 +0,0 @@
--/*
-- *
-- * Connection Manager
-- *
-- * Copyright (C) 2008 Intel Corporation. All rights reserved.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#include <dbus/dbus-glib.h>
--#include <gtk/gtk.h>
--
--#include "connman-client.h"
--
--static gboolean option_fullscreen = FALSE;
--static ConnmanClient *client;
--
--static GtkWidget *tree_networks = NULL;
--static GtkWidget *button_enabled = NULL;
--static GtkWidget *button_refresh = NULL;
--static GtkWidget *button_connect = NULL;
--static GtkWidget *label_status = NULL;
--static GtkTreeSelection *selection = NULL;
--
--static void status_callback(const char *status, void *user_data)
--{
-- gchar *markup;
--
-- if (label_status == NULL)
-- return;
--
-- markup = g_strdup_printf("System is %s", status);
-- gtk_label_set_markup(GTK_LABEL(label_status), markup);
-- g_free(markup);
--}
--
--static GtkWidget *create_label(const gchar *str)
--{
-- GtkWidget *label;
-- gchar *tmp;
--
-- label = gtk_label_new(NULL);
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
--
-- tmp = g_strdup_printf("<b>%s</b>", str);
-- gtk_label_set_markup(GTK_LABEL(label), tmp);
-- g_free(tmp);
--
-- return label;
--}
--
--static void changed_callback(GtkComboBox *combo, gpointer user_data)
--{
-- GtkTreeModel *model = gtk_combo_box_get_model(combo);
-- GtkTreeIter iter;
-- DBusGProxy *proxy;
-- gchar *path;
-- gboolean enabled;
--
-- if (gtk_combo_box_get_active_iter(combo, &iter) == FALSE)
-- return;
--
-- path = g_object_get_data(G_OBJECT(button_enabled), "device");
-- g_free(path);
--
-- gtk_tree_model_get(model, &iter, CONNMAN_COLUMN_PROXY, &proxy,
-- CONNMAN_COLUMN_ENABLED, &enabled, -1);
--
-- path = g_strdup(dbus_g_proxy_get_path(proxy));
-- g_object_set_data(G_OBJECT(button_enabled), "device", path);
--
-- g_object_unref(proxy);
--
-- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button_enabled),
-- enabled);
--
-- gtk_widget_set_sensitive(button_refresh, enabled);
--
-- model = connman_client_get_network_model(client, path);
-- gtk_tree_view_set_model(GTK_TREE_VIEW(tree_networks), model);
-- g_object_unref(model);
--}
--
--static void toggled_callback(GtkToggleButton *button, gpointer user_data)
--{
-- gchar *path;
-- gboolean active;
--
-- path = g_object_get_data(G_OBJECT(button), "device");
-- if (path == NULL)
-- return;
--
-- active = gtk_toggle_button_get_active(button);
--
-- connman_client_set_powered(client, path, active);
--
-- gtk_widget_set_sensitive(button_refresh, active);
--}
--
--static void refresh_callback(GtkButton *button, gpointer user_data)
--{
-- gchar *path;
--
-- path = g_object_get_data(G_OBJECT(button_enabled), "device");
-- if (path == NULL)
-- return;
--
-- connman_client_propose_scan(client, path);
--}
--
--static void connect_callback(GtkButton *button, gpointer user_data)
--{
-- GtkTreeModel *model;
-- GtkTreeIter iter;
-- DBusGProxy *proxy;
-- const gchar *path;
-- gboolean enabled;
--
-- if (gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
-- return;
--
-- gtk_tree_model_get(model, &iter, CONNMAN_COLUMN_PROXY, &proxy,
-- CONNMAN_COLUMN_ENABLED, &enabled, -1);
--
-- path = dbus_g_proxy_get_path(proxy);
--
-- if (enabled == FALSE)
-- connman_client_connect(client, path);
-- else
-- connman_client_disconnect(client, path);
--
-- g_object_unref(proxy);
--
-- if (enabled == FALSE)
-- g_object_set(button_connect,
-- "label", GTK_STOCK_DISCONNECT, NULL);
-- else
-- g_object_set(button_connect,
-- "label", GTK_STOCK_CONNECT, NULL);
--}
--
--static GtkWidget *create_left(void)
--{
-- GtkWidget *mainbox;
-- GtkWidget *vbox;
-- GtkWidget *hbox;
-- GtkWidget *label;
-- GtkWidget *combo;
-- GtkWidget *button;
-- GtkTreeModel *model;
-- GtkCellRenderer *renderer;
--
-- mainbox = gtk_vbox_new(FALSE, 24);
-- gtk_container_set_border_width(GTK_CONTAINER(mainbox), 8);
--
-- vbox = gtk_vbox_new(FALSE, 6);
-- gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
--
-- label = create_label("Device");
-- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
--
-- combo = gtk_combo_box_new();
-- gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 0);
-- g_signal_connect(G_OBJECT(combo), "changed",
-- G_CALLBACK(changed_callback), NULL);
--
-- gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
--
-- renderer = gtk_cell_renderer_text_new();
-- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE);
-- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer,
-- "text", CONNMAN_COLUMN_NAME, NULL);
--
-- button = gtk_check_button_new_with_label("Enabled");
-- gtk_box_pack_end(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-- g_signal_connect(G_OBJECT(button), "toggled",
-- G_CALLBACK(toggled_callback), NULL);
--
-- button_enabled = button;
--
-- vbox = gtk_vbox_new(FALSE, 6);
-- gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
--
-- label = create_label("Status");
-- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
--
-- label = gtk_label_new(NULL);
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
-- gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
--
-- label_status = label;
--
-- vbox = gtk_vbox_new(FALSE, 6);
-- gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
--
-- hbox = gtk_hbox_new(FALSE, 12);
-- gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
-- gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
--
-- button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
-- gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
-- gtk_widget_set_sensitive(button, FALSE);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(refresh_callback), NULL);
--
-- button_refresh = button;
--
-- button = gtk_button_new_from_stock(GTK_STOCK_DISCONNECT);
-- gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, TRUE, 0);
-- gtk_widget_set_sensitive(button, FALSE);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(connect_callback), NULL);
--
-- button_connect = button;
--
-- model = connman_client_get_device_model(client);
-- gtk_combo_box_set_model(GTK_COMBO_BOX(combo), model);
-- g_object_unref(model);
--
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
--
-- return mainbox;
--}
--
--static void select_callback(GtkTreeSelection *selection, gpointer user_data)
--{
-- GtkTreeModel *model;
-- GtkTreeIter iter;
-- gboolean selected, enabled;
--
-- selected = gtk_tree_selection_get_selected(selection, &model, &iter);
--
-- if (selected == TRUE) {
-- gtk_tree_model_get(model, &iter,
-- CONNMAN_COLUMN_ENABLED, &enabled, -1);
--
-- if (enabled == TRUE)
-- g_object_set(button_connect,
-- "label", GTK_STOCK_DISCONNECT, NULL);
-- else
-- g_object_set(button_connect,
-- "label", GTK_STOCK_CONNECT, NULL);
-- }
--
-- gtk_widget_set_sensitive(button_connect, selected);
--}
--
--static void status_to_icon(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- gboolean enabled;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_ENABLED, &enabled, -1);
--
-- if (enabled == TRUE)
-- g_object_set(cell, "icon-name", GTK_STOCK_ABOUT, NULL);
--
-- g_object_set(cell, "visible", enabled, NULL);
--}
--
--static void security_to_icon(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- guint security;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_SECURITY, &security, -1);
--
-- if (security == CONNMAN_SECURITY_NONE)
-- g_object_set(cell, "icon-name", NULL, NULL);
-- else
-- g_object_set(cell, "icon-name",
-- GTK_STOCK_DIALOG_AUTHENTICATION, NULL);
--}
--
--static GtkWidget *create_right(void)
--{
-- GtkWidget *mainbox;
-- GtkWidget *vbox;
-- GtkWidget *label;
-- GtkWidget *scrolled;
-- GtkWidget *tree;
-- GtkTreeViewColumn *column;
-- GtkCellRenderer *renderer;
--
-- mainbox = gtk_vbox_new(FALSE, 24);
-- gtk_container_set_border_width(GTK_CONTAINER(mainbox), 8);
--
-- vbox = gtk_vbox_new(FALSE, 6);
-- gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
--
-- label = create_label("Networks");
-- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
--
-- scrolled = gtk_scrolled_window_new(NULL, NULL);
-- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
-- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
-- GTK_SHADOW_OUT);
-- gtk_container_add(GTK_CONTAINER(vbox), scrolled);
--
-- tree = gtk_tree_view_new();
-- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
-- gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(tree), FALSE);
-- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree), TRUE);
-- gtk_container_add(GTK_CONTAINER(scrolled), tree);
--
-- gtk_tree_view_insert_column_with_data_func(GTK_TREE_VIEW(tree), 0,
-- NULL, gtk_cell_renderer_pixbuf_new(),
-- status_to_icon, NULL, NULL);
-- column = gtk_tree_view_get_column(GTK_TREE_VIEW(tree), 0);
-- gtk_tree_view_column_set_min_width(column, 24);
--
-- column = gtk_tree_view_column_new();
-- gtk_tree_view_column_set_expand(GTK_TREE_VIEW_COLUMN(column), TRUE);
-- gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
--
-- renderer = gtk_cell_renderer_text_new();
-- gtk_tree_view_column_pack_start(column, renderer, TRUE);
-- gtk_tree_view_column_add_attribute(column, renderer,
-- "text", CONNMAN_COLUMN_NAME);
--
-- renderer = gtk_cell_renderer_pixbuf_new();
-- gtk_tree_view_column_pack_end(column, renderer, FALSE);
-- gtk_tree_view_column_set_cell_data_func(column, renderer,
-- security_to_icon, NULL, NULL);
--
-- tree_networks = tree;
--
-- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
-- gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
-- g_signal_connect(G_OBJECT(selection), "changed",
-- G_CALLBACK(select_callback), NULL);
--
-- return mainbox;
--}
--
--static gboolean delete_callback(GtkWidget *window, GdkEvent *event,
-- gpointer user_data)
--{
-- gtk_widget_destroy(window);
--
-- gtk_main_quit();
--
-- return FALSE;
--}
--
--static void close_callback(GtkWidget *button, gpointer user_data)
--{
-- GtkWidget *window = user_data;
--
-- gtk_widget_destroy(window);
--
-- gtk_main_quit();
--}
--
--static GtkWidget *create_window(void)
--{
-- GtkWidget *window;
-- GtkWidget *vbox;
-- GtkWidget *hbox;
-- GtkWidget *notebook;
-- GtkWidget *buttonbox;
-- GtkWidget *button;
-- GtkWidget *widget;
--
-- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-- gtk_window_set_default_size(GTK_WINDOW(window), 580, 360);
-- g_signal_connect(G_OBJECT(window), "delete-event",
-- G_CALLBACK(delete_callback), NULL);
--
-- vbox = gtk_vbox_new(FALSE, 12);
-- gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
-- gtk_container_add(GTK_CONTAINER(window), vbox);
--
-- notebook = gtk_notebook_new();
-- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
-- gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
--
-- buttonbox = gtk_hbutton_box_new();
-- gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_END);
-- gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0);
--
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-- gtk_container_add(GTK_CONTAINER(buttonbox), button);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_callback), window);
--
-- hbox = gtk_hbox_new(FALSE, 0);
-- gtk_container_set_border_width(GTK_CONTAINER(hbox), 8);
--
-- widget = create_right();
-- gtk_widget_set_size_request(widget, 280, -1);
-- gtk_box_pack_end(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
--
-- widget = create_left();
-- gtk_widget_set_size_request(widget, 260, -1);
-- gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
--
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, NULL);
--
-- return window;
--}
--
--static GOptionEntry options[] = {
-- { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &option_fullscreen,
-- "Start up in fullscreen mode" },
-- { NULL },
--};
--
--int main(int argc, char *argv[])
--{
-- GError *error = NULL;
-- GtkWidget *window;
--
-- if (gtk_init_with_args(&argc, &argv, NULL,
-- options, NULL, &error) == FALSE) {
-- if (error != NULL) {
-- g_printerr("%s\n", error->message);
-- g_error_free(error);
-- } else
-- g_printerr("An unknown error occurred\n");
--
-- gtk_exit(1);
-- }
--
-- g_set_application_name("Connection Manager Demo");
--
-- gtk_window_set_default_icon_name("network-wireless");
--
-- client = connman_client_new();
--
-- window = create_window();
--
-- connman_client_set_callback(client, status_callback, NULL);
--
-- if (option_fullscreen == TRUE)
-- gtk_window_fullscreen(GTK_WINDOW(window));
--
-- gtk_widget_show_all(window);
--
-- gtk_main();
--
-- g_object_unref(client);
--
-- return 0;
--}
-diff --git a/common/test-client.c b/common/test-client.c
-deleted file mode 100644
-index a78823f..0000000
---- a/common/test-client.c
-+++ /dev/null
-@@ -1,227 +0,0 @@
--/*
-- *
-- * Connection Manager
-- *
-- * Copyright (C) 2008 Intel Corporation. All rights reserved.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#include <dbus/dbus-glib.h>
--#include <gtk/gtk.h>
--
--#include "connman-client.h"
--
--static ConnmanClient *client;
--
--static void proxy_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- DBusGProxy *proxy;
-- gchar *markup;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_PROXY, &proxy, -1);
--
-- markup = g_strdup_printf("<b>%s</b>\n"
-- "<span size=\"xx-small\">%s\n\n</span>",
-- dbus_g_proxy_get_interface(proxy),
-- dbus_g_proxy_get_path(proxy));
-- g_object_set(cell, "markup", markup, NULL);
-- g_free(markup);
--
-- g_object_unref(proxy);
--}
--
--static void name_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- gchar *name, *icon;
-- guint type;
-- gchar *markup;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_NAME, &name,
-- CONNMAN_COLUMN_ICON, &icon,
-- CONNMAN_COLUMN_TYPE, &type, -1);
--
-- markup = g_strdup_printf("Name: %s\nIcon: %s\nType: %d",
-- name, icon, type);
-- g_object_set(cell, "markup", markup, NULL);
-- g_free(markup);
--
-- g_free(icon);
-- g_free(name);
--}
--
--static void status_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- gboolean enabled, inrange, remember;
-- gchar *markup;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_ENABLED, &enabled,
-- CONNMAN_COLUMN_INRANGE, &inrange,
-- CONNMAN_COLUMN_REMEMBER, &remember, -1);
--
-- markup = g_strdup_printf("Enabled: %d\n"
-- "InRange: %d\nRemember: %d",
-- enabled, inrange, remember);
-- g_object_set(cell, "markup", markup, NULL);
-- g_free(markup);
--}
--
--static void network_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- guint strength, security;
-- gchar *secret;
-- gchar *markup;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_STRENGTH, &strength,
-- CONNMAN_COLUMN_SECURITY, &security,
-- CONNMAN_COLUMN_PASSPHRASE, &secret, -1);
--
-- markup = g_strdup_printf("Strength: %d\nSecurity: %d\nSecret: %s",
-- strength, security, secret);
-- g_object_set(cell, "markup", markup, NULL);
-- g_free(markup);
--
-- g_free(secret);
--}
--
--static GtkWidget *create_tree(void)
--{
-- GtkWidget *tree;
-- GtkTreeModel *model;
-- GtkTreeSelection *selection;
--
-- tree = gtk_tree_view_new();
-- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE);
-- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree), TRUE);
--
-- gtk_tree_view_insert_column_with_data_func(GTK_TREE_VIEW(tree), -1,
-- "Proxy", gtk_cell_renderer_text_new(),
-- proxy_to_text, NULL, NULL);
--
-- gtk_tree_view_insert_column_with_data_func(GTK_TREE_VIEW(tree), -1,
-- "Name", gtk_cell_renderer_text_new(),
-- name_to_text, NULL, NULL);
--
-- gtk_tree_view_insert_column_with_data_func(GTK_TREE_VIEW(tree), -1,
-- "Status", gtk_cell_renderer_text_new(),
-- status_to_text, NULL, NULL);
--
-- gtk_tree_view_insert_column_with_data_func(GTK_TREE_VIEW(tree), -1,
-- "Network", gtk_cell_renderer_text_new(),
-- network_to_text, NULL, NULL);
--
-- model = connman_client_get_model(client);
-- gtk_tree_view_set_model(GTK_TREE_VIEW(tree), model);
-- g_object_unref(model);
--
-- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
-- gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
--
-- gtk_tree_view_expand_all(GTK_TREE_VIEW(tree));
--
-- return tree;
--}
--
--static gboolean delete_callback(GtkWidget *window, GdkEvent *event,
-- gpointer user_data)
--{
-- gtk_widget_destroy(window);
--
-- gtk_main_quit();
--
-- return FALSE;
--}
--
--static void close_callback(GtkWidget *button, gpointer user_data)
--{
-- GtkWidget *window = user_data;
--
-- gtk_widget_destroy(window);
--
-- gtk_main_quit();
--}
--
--static GtkWidget *create_window(void)
--{
-- GtkWidget *window;
-- GtkWidget *mainbox;
-- GtkWidget *tree;
-- GtkWidget *scrolled;
-- GtkWidget *buttonbox;
-- GtkWidget *button;
-- GtkTreeSelection *selection;
--
-- tree = create_tree();
-- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
--
-- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-- gtk_window_set_title(GTK_WINDOW(window), "Client Test");
-- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-- gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
-- g_signal_connect(G_OBJECT(window), "delete-event",
-- G_CALLBACK(delete_callback), NULL);
--
-- mainbox = gtk_vbox_new(FALSE, 12);
-- gtk_container_set_border_width(GTK_CONTAINER(mainbox), 12);
-- gtk_container_add(GTK_CONTAINER(window), mainbox);
--
-- scrolled = gtk_scrolled_window_new(NULL, NULL);
-- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
-- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
-- GTK_SHADOW_OUT);
-- gtk_box_pack_start(GTK_BOX(mainbox), scrolled, TRUE, TRUE, 0);
--
-- buttonbox = gtk_hbutton_box_new();
-- gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox),
-- GTK_BUTTONBOX_END);
-- gtk_box_pack_end(GTK_BOX(mainbox), buttonbox, FALSE, FALSE, 0);
--
-- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-- gtk_container_add(GTK_CONTAINER(buttonbox), button);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_callback), window);
--
-- gtk_container_add(GTK_CONTAINER(scrolled), tree);
--
-- gtk_widget_show_all(window);
--
-- return window;
--}
--
--int main(int argc, char *argv[])
--{
-- gtk_init(&argc, &argv);
--
-- client = connman_client_new();
--
-- gtk_window_set_default_icon_name("network-wireless");
--
-- create_window();
--
-- gtk_main();
--
-- g_object_unref(client);
--
-- return 0;
--}
-diff --git a/properties/Makefile.am b/properties/Makefile.am
-index ad2fd35..3a47ccf 100644
---- a/properties/Makefile.am
-+++ b/properties/Makefile.am
-@@ -1,8 +1,7 @@
-
- bin_PROGRAMS = connman-properties
-
--connman_properties_SOURCES = main.c advanced.h advanced.c \
-- ethernet.c wifi.c
-+connman_properties_SOURCES = main.c advanced.h ethernet.c wifi.c
-
- connman_properties_LDADD = $(top_builddir)/common/libcommon.a \
- @GTK_LIBS@ @DBUS_LIBS@
-diff --git a/properties/advanced.c b/properties/advanced.c
-deleted file mode 100644
-index 1eb1c3d..0000000
---- a/properties/advanced.c
-+++ /dev/null
-@@ -1,314 +0,0 @@
--/*
-- *
-- * Connection Manager
-- *
-- * Copyright (C) 2008 Intel Corporation. All rights reserved.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#include <dbus/dbus-glib.h>
--#include <glib/gi18n.h>
--
--#include "connman-client.h"
--
--#include "advanced.h"
--
--gboolean separator_function(GtkTreeModel *model,
-- GtkTreeIter *iter, gpointer user_data)
--{
-- gchar *text;
-- gboolean result = FALSE;
--
-- gtk_tree_model_get(model, iter, 0, &text, -1);
--
-- if (text && *text == '\0')
-- result = TRUE;
--
-- g_free(text);
--
-- return result;
--}
--
--static void activate_callback(GtkWidget *button, gpointer user_data)
--{
--}
--
--static void changed_callback(GtkWidget *editable, gpointer user_data)
--{
--}
--
--static void add_network(GtkWidget *mainbox, struct config_data *data)
--{
-- GtkWidget *table;
-- GtkWidget *label;
-- GtkWidget *entry;
-- GtkWidget *combo;
-- GtkWidget *button;
--
-- table = gtk_table_new(3, 5, TRUE);
-- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
-- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-- gtk_box_pack_start(GTK_BOX(mainbox), table, FALSE, FALSE, 0);
--
-- label = gtk_label_new(_("Network Name:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
--
-- combo = gtk_combo_box_entry_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Guest");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
-- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
-- separator_function, NULL, NULL);
-- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 3, 0, 1);
-- //data->network.name = combo;
--
-- label = gtk_label_new(_("Passphrase:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
--
-- entry = gtk_entry_new();
-- gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
-- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 1, 2);
-- //data->network.passphrase = entry;
--
-- button = gtk_button_new_with_label(_("Activate"));
-- gtk_widget_set_sensitive(button, FALSE);
-- gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 2, 3);
-- //data->network.activate = button;
--
-- g_signal_connect(G_OBJECT(combo), "changed",
-- G_CALLBACK(changed_callback), data);
--
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(activate_callback), data);
--}
--
--static void set_widgets(struct config_data *data, gboolean label,
-- gboolean value, gboolean entry)
--{
-- int i;
--
-- for (i = 0; i < 3; i++) {
-- if (label == TRUE)
-- gtk_widget_show(data->ipv4.label[i]);
-- else
-- gtk_widget_hide(data->ipv4.label[i]);
--
-- if (value == TRUE)
-- gtk_widget_show(data->ipv4.value[i]);
-- else
-- gtk_widget_hide(data->ipv4.value[i]);
--
-- if (entry == TRUE)
-- gtk_widget_show(data->ipv4.entry[i]);
-- else
-- gtk_widget_hide(data->ipv4.entry[i]);
-- }
--}
--
--static void config_callback(GtkWidget *widget, gpointer user_data)
--{
-- gint active;
--
-- active = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
--}
--
--static void add_config(GtkWidget *mainbox, struct config_data *data)
--{
-- GtkWidget *table;
-- GtkWidget *label;
-- GtkWidget *entry;
-- GtkWidget *combo;
--
-- table = gtk_table_new(5, 5, TRUE);
-- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
-- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-- gtk_box_pack_start(GTK_BOX(mainbox), table, FALSE, FALSE, 0);
--
-- label = gtk_label_new(_("Configure IPv4:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
--
-- combo = gtk_combo_box_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Using DHCP");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Manually");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
-- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
-- separator_function, NULL, NULL);
-- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 3, 0, 1);
-- data->ipv4.config = combo;
--
-- label = gtk_label_new(_("IP Address:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_widget_set_no_show_all(label, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
-- data->ipv4.label[0] = label;
--
-- label = gtk_label_new(NULL);
-- gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-- gtk_widget_set_no_show_all(label, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 3, 1, 2);
-- data->ipv4.value[0] = label;
--
-- entry = gtk_entry_new();
-- gtk_widget_set_no_show_all(entry, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 1, 2);
-- data->ipv4.entry[0] = entry;
--
-- label = gtk_label_new(_("Subnet Mask:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_widget_set_no_show_all(label, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
-- data->ipv4.label[1] = label;
--
-- label = gtk_label_new(NULL);
-- gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-- gtk_widget_set_no_show_all(label, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 3, 2, 3);
-- data->ipv4.value[1] = label;
--
-- entry = gtk_entry_new();
-- gtk_widget_set_no_show_all(entry, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 2, 3);
-- data->ipv4.entry[1] = entry;
--
-- label = gtk_label_new(_("Router:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_widget_set_no_show_all(label, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
-- data->ipv4.label[2] = label;
--
-- label = gtk_label_new(NULL);
-- gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-- gtk_widget_set_no_show_all(label, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 3, 3, 4);
-- data->ipv4.value[2] = label;
--
-- entry = gtk_entry_new();
-- gtk_widget_set_no_show_all(entry, TRUE);
-- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 3, 4);
-- data->ipv4.entry[2] = entry;
--
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-- set_widgets(data, TRUE, TRUE, FALSE);
--
-- g_signal_connect(G_OBJECT(combo), "changed",
-- G_CALLBACK(config_callback), data);
--}
--
--static void delete_callback(GtkWidget *window, GdkEvent *event,
-- gpointer user_data)
--{
-- gtk_widget_hide(window);
--}
--
--static void close_callback(GtkWidget *button, gpointer user_data)
--{
-- GtkWidget *window = user_data;
--
-- gtk_widget_hide(window);
--}
--
--void create_advanced_dialog(struct config_data *data, guint type)
--{
-- GtkWidget *dialog;
-- GtkWidget *vbox;
-- GtkWidget *notebook;
-- GtkWidget *buttonbox;
-- GtkWidget *button;
-- GtkWidget *widget;
--
-- dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-- gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-- gtk_window_set_transient_for(GTK_WINDOW(dialog),
-- GTK_WINDOW(data->window));
-- gtk_window_set_title(GTK_WINDOW(dialog), _("Advanced Settings"));
-- gtk_window_set_position(GTK_WINDOW(dialog),
-- GTK_WIN_POS_CENTER_ON_PARENT);
-- gtk_window_set_default_size(GTK_WINDOW(dialog), 460, 320);
-- g_signal_connect(G_OBJECT(dialog), "delete-event",
-- G_CALLBACK(delete_callback), NULL);
--
-- vbox = gtk_vbox_new(FALSE, 12);
-- gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
-- gtk_container_add(GTK_CONTAINER(dialog), vbox);
--
-- notebook = gtk_notebook_new();
-- gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
--
-- buttonbox = gtk_hbutton_box_new();
-- gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_END);
-- gtk_box_set_spacing(GTK_BOX(buttonbox), 6);
-- gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0);
--
-- button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-- gtk_container_add(GTK_CONTAINER(buttonbox), button);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_callback), dialog);
--
-- button = gtk_button_new_from_stock(GTK_STOCK_OK);
-- gtk_container_add(GTK_CONTAINER(buttonbox), button);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_callback), dialog);
--
-- if (type == CONNMAN_TYPE_WIFI) {
-- widget = gtk_vbox_new(FALSE, 24);
-- gtk_container_set_border_width(GTK_CONTAINER(widget), 24);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
-- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
-- widget, _("Wireless"));
-- add_network(widget, data);
-- }
--
-- widget = gtk_vbox_new(FALSE, 24);
-- gtk_container_set_border_width(GTK_CONTAINER(widget), 24);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
-- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
-- widget, _("TCP/IP"));
-- add_config(widget, data);
--
-- widget = gtk_label_new(NULL);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
-- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
-- widget, _("DNS"));
--
-- if (type == CONNMAN_TYPE_ETHERNET) {
-- widget = gtk_label_new(NULL);
-- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
-- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
-- widget, _("Ethernet"));
-- }
--
-- data->dialog = dialog;
--}
-diff --git a/properties/advanced.h b/properties/advanced.h
-index f85f10d..42b439f 100644
---- a/properties/advanced.h
-+++ b/properties/advanced.h
-@@ -23,6 +23,7 @@ struct config_data {
- ConnmanClient *client;
-
- GtkWidget *widget;
-+ GtkWidget *table;
- GtkWidget *title;
- GtkWidget *label;
- GtkWidget *button;
-@@ -45,15 +46,34 @@ struct config_data {
- GtkWidget *value[3];
- GtkWidget *entry[3];
- } ipv4;
--};
-
--void create_advanced_dialog(struct config_data *data, guint type);
-+ struct ipv4_config ipv4_config;
-+
-+ struct {
-+ GtkWidget *name;
-+ GtkWidget *security;
-+ GtkWidget *strength;
-+ GtkWidget *passphrase;
-+ GtkWidget *connect_info;
-+ GtkWidget *connect;
-+ GtkWidget *disconnect;
-+ } wifi;
-
--void add_ethernet_policy(GtkWidget *mainbox, struct config_data *data);
--void update_ethernet_policy(struct config_data *data, guint policy);
-+ GtkWidget *ethernet_button;
-+ GtkWidget *wifi_button;
-
--void add_wifi_policy(GtkWidget *mainbox, struct config_data *data);
-+ GtkWidget *scan_button;
-+ GtkWidget *offline_button;
-+};
-+
-+void add_ethernet_policy(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data);
-+void update_ethernet_ipv4(struct config_data *data, guint policy);
-+
-+void add_wifi_policy(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data);
- void update_wifi_policy(struct config_data *data, guint policy);
-
--gboolean separator_function(GtkTreeModel *model,
-- GtkTreeIter *iter, gpointer user_data);
-+void add_ethernet_switch_button(GtkWidget *mainbox, GtkTreeIter *iter,
-+ struct config_data *data);
-+
-+void add_wifi_switch_button(GtkWidget *mainbox, GtkTreeIter *iter,
-+ struct config_data *data);
-diff --git a/properties/ethernet.c b/properties/ethernet.c
-index d5c948d..d443ca1 100644
---- a/properties/ethernet.c
-+++ b/properties/ethernet.c
-@@ -23,6 +23,7 @@
- #include <config.h>
- #endif
-
-+#include <dbus/dbus-glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-
-@@ -30,93 +31,220 @@
-
- #include "advanced.h"
-
-+static gboolean separator_function(GtkTreeModel *model,
-+ GtkTreeIter *iter, gpointer user_data)
-+{
-+ gchar *text;
-+ gboolean result = FALSE;
-+
-+ gtk_tree_model_get(model, iter, 0, &text, -1);
-+
-+ if (text && *text == '\0')
-+ result = TRUE;
-+
-+ g_free(text);
-+
-+ return result;
-+}
-+
- static void changed_callback(GtkWidget *editable, gpointer user_data)
- {
- struct config_data *data = user_data;
- gint active;
-
- active = gtk_combo_box_get_active(GTK_COMBO_BOX(data->policy.config));
-+ update_ethernet_ipv4(data, active);
-+}
-
-- switch (active) {
-- case 0:
-- connman_client_set_policy(data->client, data->device, "auto");
-- update_ethernet_policy(data, CONNMAN_POLICY_AUTO);
-- break;
-- case 1:
-- connman_client_set_policy(data->client, data->device, "ignore");
-- update_ethernet_policy(data, CONNMAN_POLICY_IGNORE);
-- break;
-- case 3:
-- connman_client_set_policy(data->client, data->device, "off");
-- update_ethernet_policy(data, CONNMAN_POLICY_OFF);
-- break;
-- }
-+static void apply_callback(GtkWidget *editable, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+ gint active;
-+
-+ active = gtk_combo_box_get_active(GTK_COMBO_BOX(data->policy.config));
-+ data->ipv4_config.method = active ? "manual" : "dhcp";
-+ data->ipv4_config.address = active ? gtk_entry_get_text(GTK_ENTRY(data->ipv4.entry[0])) : NULL;
-+ data->ipv4_config.netmask = active ? gtk_entry_get_text(GTK_ENTRY(data->ipv4.entry[1])) : NULL;
-+ data->ipv4_config.gateway = active ? gtk_entry_get_text(GTK_ENTRY(data->ipv4.entry[2])) : NULL;
-+
-+ connman_client_set_ipv4(data->client, data->device, &data->ipv4_config);
-+}
-+
-+static void switch_callback(GtkWidget *editable, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+ const gchar *label = gtk_button_get_label(GTK_BUTTON(data->ethernet_button));
-+ if (g_str_equal(label, "Disable"))
-+ connman_client_disable_technology(data->client, data->device, "ethernet");
-+ else if (g_str_equal(label, "Enable"))
-+ connman_client_enable_technology(data->client, data->device, "ethernet");
- }
-
--void add_ethernet_policy(GtkWidget *mainbox, struct config_data *data)
-+void add_ethernet_switch_button(GtkWidget *mainbox, GtkTreeIter *iter,
-+ struct config_data *data)
-+{
-+ GtkWidget *vbox;
-+ GtkWidget *table;
-+ GtkWidget *label;
-+ GtkWidget *buttonbox;
-+ GtkWidget *button;
-+ gboolean ethernet_enabled;
-+
-+ gtk_tree_model_get(data->model, iter,
-+ CONNMAN_COLUMN_ETHERNET_ENABLED, ðernet_enabled,
-+ -1);
-+
-+ vbox = gtk_vbox_new(TRUE, 0);
-+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
-+ gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-+
-+ table = gtk_table_new(1, 1, TRUE);
-+ gtk_table_set_row_spacings(GTK_TABLE(table), 10);
-+ gtk_table_set_col_spacings(GTK_TABLE(table), 10);
-+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-+
-+ label = gtk_label_new(_("Enable/Disable Wired Networks."));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-+
-+ buttonbox = gtk_hbutton_box_new();
-+ gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_CENTER);
-+ gtk_box_pack_start(GTK_BOX(mainbox), buttonbox, FALSE, FALSE, 0);
-+
-+ button = gtk_button_new();
-+ data->ethernet_button = button;
-+
-+ if (ethernet_enabled)
-+ gtk_button_set_label(GTK_BUTTON(button), _("Disable"));
-+ else
-+ gtk_button_set_label(GTK_BUTTON(button), _("Enable"));
-+
-+ gtk_container_add(GTK_CONTAINER(buttonbox), button);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(switch_callback), data);
-+}
-+
-+void add_ethernet_policy(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data)
- {
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *label;
- GtkWidget *combo;
-+ GtkWidget *entry;
-+ GtkWidget *button;
-+
-+ struct ipv4_config ipv4_config = {
-+ .method = NULL,
-+ .address = NULL,
-+ .netmask = NULL,
-+ .gateway = NULL,
-+ };
-+
-+ gtk_tree_model_get(data->model, iter,
-+ CONNMAN_COLUMN_METHOD, &ipv4_config.method,
-+ CONNMAN_COLUMN_ADDRESS, &ipv4_config.address,
-+ CONNMAN_COLUMN_NETMASK, &ipv4_config.netmask,
-+ CONNMAN_COLUMN_GATEWAY, &ipv4_config.gateway,
-+ -1);
-
-- vbox = gtk_vbox_new(FALSE, 0);
-+ vbox = gtk_vbox_new(TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
- gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-
-- table = gtk_table_new(2, 4, FALSE);
-- gtk_table_set_row_spacings(GTK_TABLE(table), 8);
-- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-+ table = gtk_table_new(5, 5, TRUE);
-+ gtk_table_set_row_spacings(GTK_TABLE(table), 10);
-+ gtk_table_set_col_spacings(GTK_TABLE(table), 10);
- gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-
- label = gtk_label_new(_("Configuration:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 0, 1);
-
- combo = gtk_combo_box_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Automatically");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Ignore Interface");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
-+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "DHCP");
-+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Manual");
- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
-- separator_function, NULL, NULL);
-- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 4, 0, 1);
-+ separator_function, NULL, NULL);
-+
-+ gtk_table_attach_defaults(GTK_TABLE(table), combo, 2, 4, 0, 1);
- data->policy.config = combo;
-
-- label = gtk_label_new(NULL);
-- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 4, 1, 2);
-- gtk_widget_set_size_request(label, 180, -1);
-- data->policy.label = label;
-+ label = gtk_label_new(_("IP address:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 1, 2);
-+ data->ipv4.label[0] = label;
-+
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 15);
-+ if (ipv4_config.address)
-+ gtk_entry_set_text(GTK_ENTRY(entry), ipv4_config.address);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 1, 2);
-+ data->ipv4.entry[0] = entry;
-+
-+ label = gtk_label_new(_("Netmask:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 2, 3);
-+ data->ipv4.label[1] = label;
-+
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 15);
-+ if (ipv4_config.netmask)
-+ gtk_entry_set_text(GTK_ENTRY(entry), ipv4_config.netmask);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 2, 3);
-+ data->ipv4.entry[1] = entry;
-+
-+ label = gtk_label_new(_("Gateway:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 3, 4);
-+ data->ipv4.label[2] = label;
-+
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 15);
-+ if (ipv4_config.gateway)
-+ gtk_entry_set_text(GTK_ENTRY(entry), ipv4_config.gateway);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 3, 4);
-+ data->ipv4.entry[2] = entry;
-+
-+ data->ipv4_config = ipv4_config;
-+
-+ button = gtk_button_new_with_label(_("Apply"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), button, 3, 4, 4, 5);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(apply_callback), data);
-+
-+ data->button = button;
-+
-+ if (g_str_equal(ipv4_config.method, "dhcp") == TRUE)
-+ update_ethernet_ipv4(data, CONNMAN_POLICY_DHCP);
-+ else
-+ update_ethernet_ipv4(data, CONNMAN_POLICY_MANUAL);
-
- g_signal_connect(G_OBJECT(combo), "changed",
-- G_CALLBACK(changed_callback), data);
-+ G_CALLBACK(changed_callback), data);
- }
-
--void update_ethernet_policy(struct config_data *data, guint policy)
-+void update_ethernet_ipv4(struct config_data *data, guint policy)
- {
- GtkWidget *combo = data->policy.config;
-- gchar *info = NULL;
-+ GtkWidget *entry[3];
-+ int i;
-+
-+ for (i = 0; i < 3; i++)
-+ entry[i] = data->ipv4.entry[i];
-
- g_signal_handlers_block_by_func(G_OBJECT(combo),
-- G_CALLBACK(changed_callback), data);
-+ G_CALLBACK(changed_callback), data);
-
- switch (policy) {
-- case CONNMAN_POLICY_OFF:
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 3);
-+ case CONNMAN_POLICY_DHCP:
-+ gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-+ for (i = 0; i < 3; i++) {
-+ gtk_entry_set_editable(GTK_ENTRY(entry[i]), 0);
-+ gtk_widget_set_sensitive(entry[i], 0);
-+ gtk_entry_set_text(GTK_ENTRY(entry[i]), _(""));
-+ }
- break;
-- case CONNMAN_POLICY_IGNORE:
-+ case CONNMAN_POLICY_MANUAL:
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 1);
-- info = g_strdup_printf(_("Ignore the interface and don't "
-- "make any attempts for configuration."));
-- break;
-- case CONNMAN_POLICY_AUTO:
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-- info = g_strdup_printf(_("Detect carrier and then "
-- "automatically configure the interface."));
-+ for (i = 0; i < 3; i++) {
-+ gtk_entry_set_editable(GTK_ENTRY(entry[i]), 1);
-+ gtk_widget_set_sensitive(entry[i], 1);
-+ }
- break;
- default:
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), -1);
-@@ -124,9 +252,5 @@ void update_ethernet_policy(struct config_data *data, guint policy)
- }
-
- g_signal_handlers_unblock_by_func(G_OBJECT(combo),
-- G_CALLBACK(changed_callback), data);
--
-- gtk_label_set_markup(GTK_LABEL(data->policy.label), info);
--
-- g_free(info);
-+ G_CALLBACK(changed_callback), data);
- }
-diff --git a/properties/main.c b/properties/main.c
-index 01439e6..6b389bc 100644
---- a/properties/main.c
-+++ b/properties/main.c
-@@ -32,103 +32,139 @@
-
- static ConnmanClient *client;
- static GtkWidget *interface_notebook;
-+static struct config_data *current_data;
-
--static void update_status(struct config_data *data,
-- guint type, gboolean inrange, guint policy,
-- const gchar *network, const gchar *address)
-+static void status_update(GtkTreeModel *model, GtkTreePath *path,
-+ GtkTreeIter *iter, gpointer user_data)
- {
-- const char *str;
-- gchar *markup, *info = NULL;
-
-- switch (type) {
-- case CONNMAN_TYPE_ETHERNET:
-- if (inrange == TRUE) {
-- str = N_("Connected");
-- info = g_strdup_printf(_("%s is currently active "
-- "and has the IP address %s."),
-- N_("Ethernet"), address);
-- } else {
-- str = N_("Cable Unplugged");
-- info = g_strdup_printf(_("The cable for %s is "
-- "not plugged in."), N_("Ethernet"));
-- }
-- break;
-+ struct config_data *data = user_data;
-+ guint type;
-+ const char *name = NULL, *_name = NULL, *state = NULL;
-+ gboolean ethernet_enabled;
-+ gboolean wifi_enabled;
-+ gboolean offline_mode;
-
-- case CONNMAN_TYPE_WIFI:
-- if (inrange == TRUE) {
-- str = N_("Connected");
-- info = g_strdup_printf(_("%s is currently active "
-- "and has the IP address %s."),
-- N_("Wireless"), address);
-- } else
-- str = N_("Not Connected");
-- break;
-+ gtk_tree_model_get(model, iter,
-+ CONNMAN_COLUMN_STATE, &state,
-+ CONNMAN_COLUMN_NAME, &name,
-+ CONNMAN_COLUMN_TYPE, &type,
-+ CONNMAN_COLUMN_ETHERNET_ENABLED, ðernet_enabled,
-+ CONNMAN_COLUMN_WIFI_ENABLED, &wifi_enabled,
-+ CONNMAN_COLUMN_OFFLINEMODE, &offline_mode,
-+ -1);
-+
-+ if (type == CONNMAN_TYPE_WIFI) {
-+ if (data->wifi.name)
-+ _name = gtk_label_get_text(GTK_LABEL(data->wifi.name));
-+
-+ if (!(name && _name && g_str_equal(name, _name)))
-+ return;
-
-- default:
-- if (inrange == TRUE)
-- str = N_("Connected");
-+ if (g_str_equal(state, "failure") == TRUE) {
-+ gtk_label_set_text(GTK_LABEL(data->wifi.connect_info),
-+ _("connection failed"));
-+ gtk_widget_show(data->wifi.connect_info);
-+ gtk_widget_show(data->wifi.connect);
-+ gtk_widget_hide(data->wifi.disconnect);
-+ } else if (g_str_equal(state, "idle") == TRUE) {
-+ gtk_widget_hide(data->wifi.connect_info);
-+ gtk_widget_show(data->wifi.connect);
-+ gtk_widget_hide(data->wifi.disconnect);
-+ } else {
-+ gtk_widget_hide(data->wifi.connect_info);
-+ gtk_widget_hide(data->wifi.connect);
-+ gtk_widget_show(data->wifi.disconnect);
-+ }
-+ } else if (type == CONNMAN_TYPE_LABEL_ETHERNET) {
-+ if (!data->ethernet_button)
-+ return;
-+ if (ethernet_enabled)
-+ gtk_button_set_label(GTK_BUTTON(data->ethernet_button), _("Disable"));
- else
-- str = N_("Not Connected");
-- break;
-+ gtk_button_set_label(GTK_BUTTON(data->ethernet_button), _("Enable"));
-+ } else if (type == CONNMAN_TYPE_LABEL_WIFI) {
-+ if (!data->wifi_button)
-+ return;
-+ if (wifi_enabled) {
-+ gtk_button_set_label(GTK_BUTTON(data->wifi_button), _("Disable"));
-+ gtk_widget_set_sensitive(data->scan_button, 1);
-+ } else {
-+ gtk_button_set_label(GTK_BUTTON(data->wifi_button), _("Enable"));
-+ gtk_widget_set_sensitive(data->scan_button, 0);
-+ }
-+ } else if (type == CONNMAN_TYPE_SYSCONFIG) {
-+ if (!data->offline_button)
-+ return;
-+ if (offline_mode)
-+ gtk_button_set_label(GTK_BUTTON(data->offline_button), _("OnlineMode"));
-+ else
-+ gtk_button_set_label(GTK_BUTTON(data->offline_button), _("OfflineMode"));
- }
-+}
-
-- markup = g_strdup_printf("<b>%s</b>", str);
-- gtk_label_set_markup(GTK_LABEL(data->title), markup);
-- g_free(markup);
--
-- gtk_label_set_markup(GTK_LABEL(data->label), info);
--
-- g_free(info);
--
-- switch (type) {
-- case CONNMAN_TYPE_ETHERNET:
-- update_ethernet_policy(data, policy);
-- break;
-- case CONNMAN_TYPE_WIFI:
-- update_wifi_policy(data, policy);
-- break;
-- default:
-- break;
-- }
-+static void set_offline_callback(GtkWidget *button, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+ const gchar *label = gtk_button_get_label(GTK_BUTTON(data->offline_button));
-+ if (g_str_equal(label, "OnlineMode"))
-+ connman_client_set_offlinemode(client, 0);
-+ else if (g_str_equal(label, "OfflineMode"))
-+ connman_client_set_offlinemode(client, 1);
- }
-
--static void update_config(struct config_data *data)
-+static void add_system_config(GtkWidget *mainbox, GtkTreeIter *iter,
-+ struct config_data *data)
- {
-- GtkTreeIter iter;
-- guint type;
-- gchar *network;
-+ GtkWidget *vbox;
-+ GtkWidget *table;
-+ GtkWidget *label;
-+ GtkWidget *buttonbox;
-+ GtkWidget *button;
-+ gboolean offline_mode;
-
-- if (gtk_tree_model_get_iter_from_string(data->model,
-- &iter, data->index) == FALSE)
-- return;
-+ vbox = gtk_vbox_new(TRUE, 0);
-+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
-+ gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-
-- gtk_tree_model_get(data->model, &iter,
-- CONNMAN_COLUMN_TYPE, &type,
-- CONNMAN_COLUMN_NAME, &network, -1);
-+ table = gtk_table_new(1, 1, TRUE);
-+ gtk_table_set_row_spacings(GTK_TABLE(table), 10);
-+ gtk_table_set_col_spacings(GTK_TABLE(table), 10);
-+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-
-- g_free(network);
--}
-+ label = gtk_label_new(_("System Configuration"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-
--static void advanced_callback(GtkWidget *button, gpointer user_data)
--{
-- struct config_data *data = user_data;
-+ buttonbox = gtk_hbutton_box_new();
-+ gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_CENTER);
-+ gtk_box_pack_start(GTK_BOX(mainbox), buttonbox, FALSE, FALSE, 0);
-+
-+ gtk_tree_model_get(data->model, iter,
-+ CONNMAN_COLUMN_OFFLINEMODE, &offline_mode,
-+ -1);
-+
-+ button = gtk_button_new();
-+ data->offline_button = button;
-+ if (offline_mode)
-+ gtk_button_set_label(GTK_BUTTON(button), _("OnlineMode"));
-+ else
-+ gtk_button_set_label(GTK_BUTTON(button), _("OfflineMode"));
-
-- gtk_widget_show_all(data->dialog);
-+ gtk_container_add(GTK_CONTAINER(buttonbox), button);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(set_offline_callback), data);
- }
-
- static struct config_data *create_config(GtkTreeModel *model,
-- GtkTreeIter *iter, gpointer user_data)
-+ GtkTreeIter *iter, gpointer user_data)
- {
- GtkWidget *mainbox;
- GtkWidget *label;
- GtkWidget *hbox;
-- GtkWidget *button;
- struct config_data *data;
- DBusGProxy *proxy;
-- guint type, policy;
-- gboolean inrange;
-- gchar *markup, *vendor = NULL, *product = NULL;
-- gchar *network = NULL, *address = NULL;
-+ guint type;
-+ char *state = NULL;
-
- data = g_try_new0(struct config_data, 1);
- if (data == NULL)
-@@ -137,15 +173,10 @@ static struct config_data *create_config(GtkTreeModel *model,
- data->client = client;
-
- gtk_tree_model_get(model, iter,
-- CONNMAN_COLUMN_PROXY, &proxy,
-- CONNMAN_COLUMN_TYPE, &type,
-- CONNMAN_COLUMN_INRANGE, &inrange,
-- CONNMAN_COLUMN_NETWORK, &network,
-- CONNMAN_COLUMN_ADDRESS, &address,
-- CONNMAN_COLUMN_POLICY, &policy, -1);
--
-- data->device = g_strdup(dbus_g_proxy_get_path(proxy));
-- g_object_unref(proxy);
-+ CONNMAN_COLUMN_PROXY, &proxy,
-+ CONNMAN_COLUMN_TYPE, &type,
-+ CONNMAN_COLUMN_STATE, &state,
-+ -1);
-
- mainbox = gtk_vbox_new(FALSE, 6);
- data->widget = mainbox;
-@@ -163,12 +194,27 @@ static struct config_data *create_config(GtkTreeModel *model,
- gtk_box_pack_start(GTK_BOX(mainbox), label, FALSE, FALSE, 0);
- data->label = label;
-
-+ data->window = user_data;
-+ data->model = model;
-+ data->index = gtk_tree_model_get_string_from_iter(model, iter);
-+ data->device = g_strdup(dbus_g_proxy_get_path(proxy));
-+ g_object_unref(proxy);
-+
- switch (type) {
- case CONNMAN_TYPE_ETHERNET:
-- add_ethernet_policy(mainbox, data);
-+ add_ethernet_policy(mainbox, iter, data);
- break;
- case CONNMAN_TYPE_WIFI:
-- add_wifi_policy(mainbox, data);
-+ add_wifi_policy(mainbox, iter, data);
-+ break;
-+ case CONNMAN_TYPE_LABEL_ETHERNET:
-+ add_ethernet_switch_button(mainbox, iter, data);
-+ break;
-+ case CONNMAN_TYPE_LABEL_WIFI:
-+ add_wifi_switch_button(mainbox, iter, data);
-+ break;
-+ case CONNMAN_TYPE_SYSCONFIG:
-+ add_system_config(mainbox, iter, data);
- break;
- default:
- break;
-@@ -183,34 +229,10 @@ static struct config_data *create_config(GtkTreeModel *model,
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 1.0);
- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-
-- markup = g_strdup_printf("%s\n<small>%s</small>",
-- vendor ? vendor : "", product ? product : "");
-- gtk_label_set_markup(GTK_LABEL(label), markup);
-- g_free(markup);
--
-- if (0) {
-- button = gtk_button_new_with_label(_("Advanced..."));
-- gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(advanced_callback), data);
-- data->button = button;
-- }
--
-- data->window = user_data;
-- create_advanced_dialog(data, type);
--
-- update_status(data, type, inrange, policy, network, address);
--
-- g_free(network);
-- g_free(address);
--
-- data->model = model;
-- data->index = gtk_tree_model_get_string_from_iter(model, iter);
--
- gtk_widget_show_all(mainbox);
-
-- g_free(product);
-- g_free(vendor);
-+ g_signal_connect(G_OBJECT(model), "row-changed",
-+ G_CALLBACK(status_update), data);
-
- return data;
- }
-@@ -230,112 +252,108 @@ static void select_callback(GtkTreeSelection *selection, gpointer user_data)
- return;
- }
-
-- if (data == NULL) {
-- data = create_config(model, &iter, user_data);
-- if (data == NULL)
-- return;
-+ if (current_data) {
-+ g_signal_handlers_disconnect_by_func(G_OBJECT(model),
-+ G_CALLBACK(status_update), current_data);
-+ g_free(current_data);
-+ }
-+ data = create_config(model, &iter, user_data);
-+ if (data == NULL)
-+ return;
-
-- page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-- data->widget, NULL);
-- } else {
-- update_config(data);
-+ current_data = data;
-
-- page = gtk_notebook_page_num(GTK_NOTEBOOK(notebook),
-- data->widget);
-- }
-+ page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-+ data->widget, NULL);
-
- gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), page);
--
- gtk_widget_show(notebook);
- }
-
--static void row_changed(GtkTreeModel *model, GtkTreePath *path,
-- GtkTreeIter *iter, gpointer user_data)
-+static void device_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-+ GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
- {
- guint type;
-- gboolean powered, inrange;
-+ char *markup, *name, *state;
-+ const char *title;
-
- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_TYPE, &type,
-- CONNMAN_COLUMN_ENABLED, &powered,
-- CONNMAN_COLUMN_INRANGE, &inrange, -1);
--}
--
--static void state_to_icon(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- gboolean inrange;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_INRANGE, &inrange, -1);
--
-- if (inrange == TRUE)
-- g_object_set(cell, "icon-name", GTK_STOCK_YES, NULL);
-- else
-- g_object_set(cell, "icon-name", NULL, NULL);
--}
--
--static void type_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
--{
-- guint type;
-- gboolean powered, inrange;
-- gchar *markup;
-- const char *title, *info;
--
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_TYPE, &type,
-- CONNMAN_COLUMN_ENABLED, &powered,
-- CONNMAN_COLUMN_INRANGE, &inrange, -1);
-+ CONNMAN_COLUMN_NAME, &name,
-+ CONNMAN_COLUMN_STATE, &state,
-+ -1);
-
- switch (type) {
- case CONNMAN_TYPE_ETHERNET:
- title = N_("Ethernet");
-+ markup = g_strdup_printf(" %s\n", title);
- break;
- case CONNMAN_TYPE_WIFI:
-- title = N_("Wireless");
-+ /* Show the AP name */
-+ title = N_(name);
-+ if (g_str_equal(state, "association") == TRUE)
-+ state = "associating...";
-+ else if (g_str_equal(state, "configuration") == TRUE)
-+ state = "configurating...";
-+ else if (g_str_equal(state, "ready") == TRUE ||
-+ g_str_equal(state, "online") == TRUE)
-+ state = "connnected";
-+ else
-+ state = "";
-+ markup = g_strdup_printf(" %s\n %s", title, state);
-+
- break;
- case CONNMAN_TYPE_WIMAX:
- title = N_("WiMAX");
-+ markup = g_strdup_printf(" %s\n", title);
- break;
- case CONNMAN_TYPE_BLUETOOTH:
- title = N_("Bluetooth");
-+ markup = g_strdup_printf(" %s\n", title);
-+ break;
-+ case CONNMAN_TYPE_LABEL_ETHERNET:
-+ title = N_("Wired Networks");
-+ markup = g_strdup_printf("<b>\n%s\n</b>", title);
-+ break;
-+ case CONNMAN_TYPE_LABEL_WIFI:
-+ title = N_("Wireless Networks");
-+ markup = g_strdup_printf("<b>\n%s\n</b>", title);
-+ break;
-+ case CONNMAN_TYPE_SYSCONFIG:
-+ title = N_("System Configuration");
-+ markup = g_strdup_printf("<b>\n%s\n</b>", title);
- break;
- default:
- title = N_("Unknown");
-+ markup = g_strdup_printf(" %s\n", title);
- break;
- }
-
-- if (powered == TRUE) {
-- if (inrange == TRUE)
-- info = N_("Connected");
-- else
-- info = N_("Not Connected");
-- } else
-- info = N_("Disabled");
--
-- markup = g_strdup_printf("<b>%s</b>\n<small>%s</small>", title, info);
- g_object_set(cell, "markup", markup, NULL);
-- g_free(markup);
- }
-
- static void type_to_icon(GtkTreeViewColumn *column, GtkCellRenderer *cell,
-- GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
-+ GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
- {
-- guint type;
-+ guint type, strength;
-+ char *name;
-
-- gtk_tree_model_get(model, iter, CONNMAN_COLUMN_TYPE, &type, -1);
-+ gtk_tree_model_get(model, iter, CONNMAN_COLUMN_TYPE, &type,
-+ CONNMAN_COLUMN_STRENGTH, &strength,
-+ -1);
-
- switch (type) {
-- case CONNMAN_TYPE_ETHERNET:
-+ case CONNMAN_TYPE_WIFI:
-+ name = g_strdup_printf("connman-signal-0%d", (strength-1)/20+1);
-+ g_object_set(cell, "icon-name", name,
-+ "stock-size", 4, NULL);
-+ break;
-+ case CONNMAN_TYPE_LABEL_ETHERNET:
- g_object_set(cell, "icon-name", "network-wired",
-- "stock-size", 5, NULL);
-+ "stock-size", 4, NULL);
- break;
-- case CONNMAN_TYPE_WIFI:
-- case CONNMAN_TYPE_WIMAX:
-+ case CONNMAN_TYPE_LABEL_WIFI:
- g_object_set(cell, "icon-name", "network-wireless",
-- "stock-size", 5, NULL);
-- break;
-- case CONNMAN_TYPE_BLUETOOTH:
-- g_object_set(cell, "icon-name", "bluetooth",
-- "stock-size", 5, NULL);
-+ "stock-size", 4, NULL);
- break;
- default:
- g_object_set(cell, "icon-name", NULL, NULL);
-@@ -362,40 +380,34 @@ static GtkWidget *create_interfaces(GtkWidget *window)
-
- scrolled = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
-- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
-- GTK_SHADOW_OUT);
-+ GTK_SHADOW_OUT);
- gtk_box_pack_start(GTK_BOX(hbox), scrolled, FALSE, TRUE, 0);
-
- tree = gtk_tree_view_new();
- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
- gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(tree), FALSE);
- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree), TRUE);
-- gtk_widget_set_size_request(tree, 180, -1);
-+ gtk_widget_set_size_request(tree, 220, -1);
- gtk_container_add(GTK_CONTAINER(scrolled), tree);
-
-
- column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_expand(column, TRUE);
- gtk_tree_view_column_set_spacing(column, 4);
-+ gtk_tree_view_column_set_alignment(column, 0);
- gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-
- renderer = gtk_cell_renderer_pixbuf_new();
-- gtk_cell_renderer_set_fixed_size(renderer, 20, 45);
- gtk_tree_view_column_pack_start(column, renderer, FALSE);
- gtk_tree_view_column_set_cell_data_func(column, renderer,
-- state_to_icon, NULL, NULL);
-+ type_to_icon, NULL, NULL);
-
- renderer = gtk_cell_renderer_text_new();
-- gtk_tree_view_column_pack_start(column, renderer, TRUE);
-- gtk_tree_view_column_set_cell_data_func(column, renderer,
-- type_to_text, NULL, NULL);
--
-- renderer = gtk_cell_renderer_pixbuf_new();
-- gtk_tree_view_column_pack_end(column, renderer, FALSE);
-+ gtk_tree_view_column_pack_start(column, renderer, FALSE);
- gtk_tree_view_column_set_cell_data_func(column, renderer,
-- type_to_icon, NULL, NULL);
--
-+ device_to_text, NULL, NULL);
-
- interface_notebook = gtk_notebook_new();
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(interface_notebook), FALSE);
-@@ -405,21 +417,19 @@ static GtkWidget *create_interfaces(GtkWidget *window)
-
- model = connman_client_get_device_model(client);
- gtk_tree_view_set_model(GTK_TREE_VIEW(tree), model);
-+
- g_object_unref(model);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
- gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
- g_signal_connect(G_OBJECT(selection), "changed",
-- G_CALLBACK(select_callback), window);
--
-- g_signal_connect(G_OBJECT(model), "row-changed",
-- G_CALLBACK(row_changed), selection);
-+ G_CALLBACK(select_callback), window);
-
- return mainbox;
- }
-
- static gboolean delete_callback(GtkWidget *window, GdkEvent *event,
-- gpointer user_data)
-+ gpointer user_data)
- {
- gtk_widget_destroy(window);
-
-@@ -451,7 +461,7 @@ static GtkWidget *create_window(void)
- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_default_size(GTK_WINDOW(window), 580, 380);
- g_signal_connect(G_OBJECT(window), "delete-event",
-- G_CALLBACK(delete_callback), NULL);
-+ G_CALLBACK(delete_callback), NULL);
-
- vbox = gtk_vbox_new(FALSE, 12);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
-@@ -467,12 +477,12 @@ static GtkWidget *create_window(void)
- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtk_container_add(GTK_CONTAINER(buttonbox), button);
- g_signal_connect(G_OBJECT(button), "clicked",
-- G_CALLBACK(close_callback), window);
-+ G_CALLBACK(close_callback), window);
-
- widget = create_interfaces(window);
- gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), widget, NULL);
- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
-- widget, _("Devices"));
-+ widget, _("Services"));
-
- gtk_widget_show_all(window);
-
-@@ -487,6 +497,8 @@ int main(int argc, char *argv[])
- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- textdomain(GETTEXT_PACKAGE);
-
-+ current_data = NULL;
-+
- gtk_init(&argc, &argv);
-
- gtk_window_set_default_icon_name("network-wireless");
-diff --git a/properties/wifi.c b/properties/wifi.c
-index 320dce4..42fe7d2 100644
---- a/properties/wifi.c
-+++ b/properties/wifi.c
-@@ -23,6 +23,7 @@
- #include <config.h>
- #endif
-
-+#include <dbus/dbus-glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-
-@@ -30,6 +31,24 @@
-
- #include "advanced.h"
-
-+static void update_wifi_ipv4(struct config_data *data, guint policy);
-+
-+static gboolean separator_function(GtkTreeModel *model,
-+ GtkTreeIter *iter, gpointer user_data)
-+{
-+ gchar *text;
-+ gboolean result = FALSE;
-+
-+ gtk_tree_model_get(model, iter, 0, &text, -1);
-+
-+ if (text && *text == '\0')
-+ result = TRUE;
-+
-+ g_free(text);
-+
-+ return result;
-+}
-+
- static void changed_callback(GtkWidget *editable, gpointer user_data)
- {
- struct config_data *data = user_data;
-@@ -37,98 +56,357 @@ static void changed_callback(GtkWidget *editable, gpointer user_data)
-
- active = gtk_combo_box_get_active(GTK_COMBO_BOX(data->policy.config));
-
-- switch (active) {
-- case 0:
-- connman_client_set_policy(data->client, data->device, "auto");
-- update_wifi_policy(data, CONNMAN_POLICY_AUTO);
-- break;
-- case 1:
-- connman_client_set_policy(data->client, data->device, "manual");
-- update_wifi_policy(data, CONNMAN_POLICY_MANUAL);
-- break;
-- case 3:
-- connman_client_set_policy(data->client, data->device, "off");
-- update_wifi_policy(data, CONNMAN_POLICY_OFF);
-- break;
-+ update_wifi_ipv4(data, active);
-+}
-+
-+static void connect_reply_cb(DBusGProxy *proxy, GError *error,
-+ gpointer user_data)
-+{
-+ if (error)
-+ g_error_free(error);
-+}
-+
-+static void connect_callback(GtkWidget *editable, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+
-+ gboolean ret;
-+ gint active;
-+
-+ if (data->wifi.passphrase) {
-+ char *passphrase;
-+ passphrase = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->wifi.passphrase));
-+ ret = connman_client_set_passphrase(data->client, data->device,
-+ passphrase);
-+
-+ if (ret == FALSE) {
-+ return;
-+ }
- }
-+
-+ active = gtk_combo_box_get_active(GTK_COMBO_BOX(data->policy.config));
-+ data->ipv4_config.method = active ? "manual" : "dhcp";
-+ data->ipv4_config.address = active ? gtk_entry_get_text(GTK_ENTRY(data->ipv4.entry[0])) : NULL;
-+ data->ipv4_config.netmask = active ? gtk_entry_get_text(GTK_ENTRY(data->ipv4.entry[1])) : NULL;
-+ data->ipv4_config.gateway = active ? gtk_entry_get_text(GTK_ENTRY(data->ipv4.entry[2])) : NULL;
-+ ret = connman_client_set_ipv4(data->client, data->device, &data->ipv4_config);
-+ if (ret == FALSE) {
-+ return;
-+ }
-+
-+ connman_client_connect_async(data->client, data->device, connect_reply_cb, data);
- }
-
--void add_wifi_policy(GtkWidget *mainbox, struct config_data *data)
-+static void disconnect_callback(GtkWidget *editable, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+
-+ connman_client_disconnect(data->client, data->device);
-+}
-+
-+static void switch_callback(GtkWidget *editable, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+ const gchar *label = gtk_button_get_label(GTK_BUTTON(data->wifi_button));
-+
-+ if (g_str_equal(label, "Disable"))
-+ connman_client_disable_technology(data->client, data->device, "wifi");
-+ else
-+ connman_client_enable_technology(data->client, data->device, "wifi");
-+}
-+
-+static void scan_reply_cb(DBusGProxy *proxy, GError *error,
-+ gpointer user_data)
-+{
-+ GtkWidget *button = user_data;
-+ gtk_widget_set_sensitive(button, 1);
-+
-+ if (error)
-+ g_error_free(error);
-+}
-+
-+static void scan_callback(GtkWidget *button, gpointer user_data)
-+{
-+ struct config_data *data = user_data;
-+ gtk_widget_set_sensitive(button, 0);
-+ connman_client_request_scan(data->client, "", scan_reply_cb, button);
-+}
-+
-+void add_wifi_switch_button(GtkWidget *mainbox, GtkTreeIter *iter,
-+ struct config_data *data)
- {
- GtkWidget *vbox;
- GtkWidget *table;
- GtkWidget *label;
-- GtkWidget *combo;
-+ GtkWidget *buttonbox;
-+ GtkWidget *button;
-+ gboolean wifi_enabled;
-
-- vbox = gtk_vbox_new(FALSE, 0);
-+ gtk_tree_model_get(data->model, iter,
-+ CONNMAN_COLUMN_WIFI_ENABLED, &wifi_enabled,
-+ -1);
-+
-+ vbox = gtk_vbox_new(TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
- gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-
-- table = gtk_table_new(2, 4, FALSE);
-- gtk_table_set_row_spacings(GTK_TABLE(table), 8);
-- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
-+ table = gtk_table_new(1, 1, TRUE);
-+ gtk_table_set_row_spacings(GTK_TABLE(table), 10);
-+ gtk_table_set_col_spacings(GTK_TABLE(table), 10);
- gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-
--#if 0
-- label = gtk_label_new(_("Network Name:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-+ label = gtk_label_new(_("Configure Wifi Networks."));
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-
-- combo = gtk_combo_box_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Guest");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
-- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
-- separator_function, NULL, NULL);
-- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 4, 0, 1);
-- data->policy.config = combo;
--#endif
-+ buttonbox = gtk_hbutton_box_new();
-+ gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_CENTER);
-+ gtk_box_pack_start(GTK_BOX(mainbox), buttonbox, FALSE, FALSE, 0);
-+
-+ button = gtk_button_new();
-+ data->wifi_button = button;
-+
-+ if (wifi_enabled)
-+ gtk_button_set_label(GTK_BUTTON(button), _("Disable"));
-+ else
-+ gtk_button_set_label(GTK_BUTTON(button), _("Enable"));
-+
-+ gtk_container_add(GTK_CONTAINER(buttonbox), button);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(switch_callback), data);
-+
-+ button = gtk_button_new_with_label(_("Scan"));
-+ data->scan_button = button;
-+
-+ if (!wifi_enabled)
-+ gtk_widget_set_sensitive(button, 0);
-+
-+ gtk_container_add(GTK_CONTAINER(buttonbox), button);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(scan_callback), data);
-+}
-+
-+
-+static void wifi_ipconfig(GtkWidget *table, struct config_data *data, GtkTreeIter *iter)
-+{
-+ GtkWidget *entry;
-+ GtkWidget *label;
-+ GtkWidget *combo;
-+ DBusGProxy *proxy;
-+
-+ struct ipv4_config ipv4_config = {
-+ .method = NULL,
-+ .address = NULL,
-+ .netmask = NULL,
-+ .gateway = NULL,
-+ };
-+
-+ gtk_tree_model_get(data->model, iter,
-+ CONNMAN_COLUMN_PROXY, &proxy,
-+ CONNMAN_COLUMN_METHOD, &ipv4_config.method,
-+ CONNMAN_COLUMN_ADDRESS, &ipv4_config.address,
-+ CONNMAN_COLUMN_NETMASK, &ipv4_config.netmask,
-+ CONNMAN_COLUMN_GATEWAY, &ipv4_config.gateway,
-+ -1);
-
- label = gtk_label_new(_("Configuration:"));
-- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 3, 4);
-+ data->ipv4.label[0] = label;
-
- combo = gtk_combo_box_new_text();
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Automatically");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Manually");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
-+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "DHCP");
-+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Manual");
- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
-- separator_function, NULL, NULL);
-- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 4, 0, 1);
-+ separator_function, NULL, NULL);
-+
-+ gtk_table_attach_defaults(GTK_TABLE(table), combo, 2, 4, 3, 4);
- data->policy.config = combo;
-
-- label = gtk_label_new(NULL);
-- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-+ label = gtk_label_new(_("IP address:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 4, 5);
-+ data->ipv4.label[0] = label;
-+
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 15);
-+ if (ipv4_config.address)
-+ gtk_entry_set_text(GTK_ENTRY(entry), ipv4_config.address);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 4, 5);
-+ data->ipv4.entry[0] = entry;
-+
-+ label = gtk_label_new(_("Netmask:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 5, 6);
-+ data->ipv4.label[1] = label;
-+
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 15);
-+ if (ipv4_config.netmask)
-+ gtk_entry_set_text(GTK_ENTRY(entry), ipv4_config.netmask);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 5, 6);
-+ data->ipv4.entry[1] = entry;
-+
-+ label = gtk_label_new(_("Gateway:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 6, 7);
-+ data->ipv4.label[2] = label;
-+
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 15);
-+ if (ipv4_config.gateway)
-+ gtk_entry_set_text(GTK_ENTRY(entry), ipv4_config.gateway);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 6, 7);
-+ data->ipv4.entry[2] = entry;
-+
-+ data->ipv4_config = ipv4_config;
-+
-+ if (g_str_equal(ipv4_config.method, "dhcp") == TRUE)
-+ update_wifi_ipv4(data, CONNMAN_POLICY_DHCP);
-+ else
-+ update_wifi_ipv4(data, CONNMAN_POLICY_MANUAL);
-+
-+ g_signal_connect(G_OBJECT(combo), "changed",
-+ G_CALLBACK(changed_callback), data);
-+}
-+
-+static void toggled_callback(GtkWidget *button, gpointer user_data)
-+{
-+ GtkWidget *entry = user_data;
-+ gboolean mode;
-+
-+ mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-+
-+ gtk_entry_set_visibility(GTK_ENTRY(entry), mode);
-+}
-+
-+void add_wifi_policy(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data)
-+{
-+ GtkWidget *vbox;
-+ GtkWidget *table;
-+ GtkWidget *label;
-+ GtkWidget *entry;
-+ GtkWidget *button;
-+
-+ const char *name, *security, *icon, *state;
-+ guint strength;
-+
-+ gtk_tree_model_get(data->model, iter,
-+ CONNMAN_COLUMN_NAME, &name,
-+ CONNMAN_COLUMN_SECURITY, &security,
-+ CONNMAN_COLUMN_ICON, &icon,
-+ CONNMAN_COLUMN_STATE, &state,
-+ CONNMAN_COLUMN_STRENGTH, &strength,
-+ -1);
-+
-+ if (g_str_equal(state, "failure") == TRUE)
-+ connman_client_remove(data->client, data->device);
-+
-+ vbox = gtk_vbox_new(TRUE, 0);
-+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 24);
-+ gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-+
-+ table = gtk_table_new(10, 5, TRUE);
-+ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
-+ data->table = table;
-+
-+ label = gtk_label_new(_("Access Point:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 0, 1);
-+
-+ label = gtk_label_new(_(name));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 4, 0, 1);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-+ data->wifi.name = label;
-+
-+ label = gtk_label_new(_("Security:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 1, 2);
-+
-+ label = gtk_label_new(_(security));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 4, 1, 2);
-+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-+ data->wifi.security = label;
-+
-+ label = gtk_label_new(_("Passphrase:"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 2, 3);
-+
-+ if (g_str_equal(security, "none") != TRUE &&
-+ g_str_equal(security, "unknown") != TRUE) {
-+ entry = gtk_entry_new();
-+ gtk_entry_set_max_length (GTK_ENTRY (entry), 64);
-+ gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 4, 2, 3);
-+ gtk_entry_set_visibility(GTK_ENTRY(entry), 0);
-+ data->wifi.passphrase = entry;
-+
-+ button = gtk_check_button_new_with_label(_("Show input"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), button, 4, 5, 2, 3);
-+
-+ g_signal_connect(G_OBJECT(button), "toggled",
-+ G_CALLBACK(toggled_callback), entry);
-+
-+
-+ } else {
-+ label = gtk_label_new(_("none"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 4, 2, 3);
-+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-+ data->wifi.passphrase = NULL;
-+ }
-+
-+ label = gtk_label_new(_(""));
-+ gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 3, 8, 9);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
-- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 4, 1, 2);
-- gtk_widget_set_size_request(label, 180, -1);
-- data->policy.label = label;
-+ gtk_widget_hide(label);
-+ data->wifi.connect_info = label;
-
-- g_signal_connect(G_OBJECT(combo), "changed",
-- G_CALLBACK(changed_callback), data);
-+ button = gtk_button_new_with_label(_("Connect"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), button, 3, 4, 8, 9);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(connect_callback), data);
-+ gtk_widget_set_no_show_all(button, TRUE);
-+ data->wifi.connect = button;
-+
-+ button = gtk_button_new_with_label(_("Disconnect"));
-+ gtk_table_attach_defaults(GTK_TABLE(table), button, 3, 4, 8, 9);
-+ g_signal_connect(G_OBJECT(button), "clicked",
-+ G_CALLBACK(disconnect_callback), data);
-+ data->wifi.disconnect = button;
-+ gtk_widget_set_no_show_all(button, TRUE);
-+
-+ if (g_str_equal(state, "failure") == TRUE
-+ || g_str_equal(state, "idle") == TRUE) {
-+ gtk_widget_show(data->wifi.connect);
-+ gtk_widget_hide(data->wifi.disconnect);
-+ } else {
-+ gtk_widget_hide(data->wifi.connect);
-+ gtk_widget_show(data->wifi.disconnect);
-+ }
-+
-+ wifi_ipconfig(table, data, iter);
- }
-
--void update_wifi_policy(struct config_data *data, guint policy)
-+void update_wifi_ipv4(struct config_data *data, guint policy)
- {
- GtkWidget *combo = data->policy.config;
-- gchar *info = NULL;
-+ GtkWidget *entry[3];
-+ int i;
-+
-+ for (i = 0; i < 3; i++)
-+ entry[i] = data->ipv4.entry[i];
-
- g_signal_handlers_block_by_func(G_OBJECT(combo),
-- G_CALLBACK(changed_callback), data);
-+ G_CALLBACK(changed_callback), data);
-
- switch (policy) {
-- case CONNMAN_POLICY_OFF:
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 3);
-+ case CONNMAN_POLICY_DHCP:
-+ gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-+ for (i = 0; i < 3; i++) {
-+ gtk_entry_set_editable(GTK_ENTRY(entry[i]), 0);
-+ gtk_widget_set_sensitive(entry[i], 0);
-+ }
- break;
- case CONNMAN_POLICY_MANUAL:
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 1);
-- break;
-- case CONNMAN_POLICY_AUTO:
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-+ for (i = 0; i < 3; i++) {
-+ gtk_entry_set_editable(GTK_ENTRY(entry[i]), 1);
-+ gtk_widget_set_sensitive(entry[i], 1);
-+ }
- break;
- default:
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), -1);
-@@ -136,9 +414,5 @@ void update_wifi_policy(struct config_data *data, guint policy)
- }
-
- g_signal_handlers_unblock_by_func(G_OBJECT(combo),
-- G_CALLBACK(changed_callback), data);
--
-- gtk_label_set_markup(GTK_LABEL(data->policy.label), info);
--
-- g_free(info);
-+ G_CALLBACK(changed_callback), data);
- }
diff --git a/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch b/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
deleted file mode 100644
index 2a8cff3..0000000
--- a/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ruN connman-gnome-0.5-orig/po/POTFILES.in connman-gnome-0.5/po/POTFILES.in
---- connman-gnome-0.5-orig/po/POTFILES.in 2010-12-16 16:03:29.000000000 +0800
-+++ connman-gnome-0.5/po/POTFILES.in 2010-12-17 10:27:17.000000000 +0800
-@@ -4,4 +4,3 @@
- properties/advanced.c
- properties/ethernet.c
- properties/wifi.c
--properties/connman-properties.desktop.in
-diff -ruN connman-gnome-0.5-orig/properties/Makefile.am connman-gnome-0.5/properties/Makefile.am
---- connman-gnome-0.5-orig/properties/Makefile.am 2010-12-16 16:03:29.000000000 +0800
-+++ connman-gnome-0.5/properties/Makefile.am 2010-12-17 10:27:09.000000000 +0800
-@@ -17,16 +17,6 @@
-
- INCLUDES = -I$(top_srcdir)/common
-
--desktopdir = $(datadir)/applications
--
--desktop_in_files = connman-properties.desktop.in
--
--desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
--
- @INTLTOOL_DESKTOP_RULE@
-
--CLEANFILES = $(desktop_DATA)
--
--EXTRA_DIST = $(desktop_in_files)
--
- MAINTAINERCLEANFILES = Makefile.in
-diff -ruN connman-gnome-0.5-orig/properties/connman-properties.desktop.in connman-gnome-0.5/properties/connman-properties.desktop.in
---- connman-gnome-0.5-orig/properties/connman-properties.desktop.in 2010-12-16 16:03:29.000000000 +0800
-+++ connman-gnome-0.5/properties/connman-properties.desktop.in 1970-01-01 08:00:00.000000000 +0800
-@@ -1,10 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--_Name=Connection Management
--_Comment=Configure connection management
--Icon=stock_internet
--Exec=connman-properties
--Terminal=false
--Type=Application
--Categories=Settings;
--OnlyShowIn=GNOME;
diff --git a/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
deleted file mode 100644
index 942cfc8..0000000
--- a/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN connman-gnome-0.5-orig/common/connman-dbus.h connman-gnome-0.5/common/connman-dbus.h
---- connman-gnome-0.5-orig/common/connman-dbus.h 2010-12-30 09:45:03.312043457 +0800
-+++ connman-gnome-0.5/common/connman-dbus.h 2010-12-30 09:45:33.978499439 +0800
-@@ -22,7 +22,7 @@
- #include <dbus/dbus-glib.h>
- #include <gtk/gtk.h>
-
--#define CONNMAN_SERVICE "org.moblin.connman"
-+#define CONNMAN_SERVICE "net.connman"
-
- #define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error"
- #define CONNMAN_AGENT_INTERFACE CONNMAN_SERVICE ".Agent"
-diff -ruN connman-gnome-0.5-orig/common/instance.c connman-gnome-0.5/common/instance.c
---- connman-gnome-0.5-orig/common/instance.c 2010-12-30 09:45:03.316085542 +0800
-+++ connman-gnome-0.5/common/instance.c 2010-12-30 09:46:01.654479049 +0800
-@@ -29,7 +29,7 @@
-
- #include "instance.h"
-
--#define CONNMAN_SERVICE "org.moblin.connman"
-+#define CONNMAN_SERVICE "net.connman"
- #define CONNMAN_INSTANCE CONNMAN_SERVICE ".Instance"
-
- static DBusGConnection *connection;
-diff -ruN connman-gnome-0.5-orig/common/instance.xml connman-gnome-0.5/common/instance.xml
---- connman-gnome-0.5-orig/common/instance.xml 2010-12-30 09:45:03.312043457 +0800
-+++ connman-gnome-0.5/common/instance.xml 2010-12-30 09:45:49.868372780 +0800
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8" ?>
-
- <node name="/">
-- <interface name="org.moblin.connman.Instance">
-+ <interface name="net.connman.Instance">
- <method name="Present">
- </method>
- </interface>
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index 4fcdfaf..69b2d5b 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,17 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
DEPENDS = "gtk+ dbus"
-PR = "r4"
+PR = "r5"
RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy"
-SRC_URI = "${KERNELORG_MIRROR}/linux/network/connman/connman-gnome-${PV}.tar.gz \
- file://connman-gnome.patch \
- file://remove-connman-property-desktop-file.patch \
- file://service_name_update.patch \
- file://applet_menu_popup_fix.patch"
-
-SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
-SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"
+SRCREV = "78d3c39db6f3f7977b466305110faa8ca5f74ec8"
+SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git"
+S = "${WORKDIR}/git"
inherit autotools gtk-icon-cache
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 18/51] update-alternatives-dpkg: Fix SRC_URI Checksum
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (16 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 17/51] connman-gnome 0.5: build from git Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 19/51] jsib-glib: " Saul Wold
` (32 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../update-alternatives-dpkg_1.16.0.3.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.16.0.3.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.16.0.3.bb
index 5443122..f293177 100644
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.16.0.3.bb
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.16.0.3.bb
@@ -4,5 +4,5 @@ PR = "${INC_PR}.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
-SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
+SRC_URI[md5sum] = "0266b06ef9da8278cea008d21e17e5f6"
+SRC_URI[sha256sum] = "69669720020e67629d70aa5325e3c20c05cae7a9fc2d8abd442672c7b29e31d3"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 19/51] jsib-glib: Fix SRC_URI Checksum
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (17 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 18/51] update-alternatives-dpkg: Fix SRC_URI Checksum Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 20/51] rxvt-unicode: Fix SRC_URI & LIC_FILES Checksum Saul Wold
` (31 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-gnome/json-glib/json-glib_0.12.4.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb b/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
index 2b8bdf6..5bd9dcd 100644
--- a/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
SRC_URI[archive.md5sum] = "347e1714e4a2ce54298969d5ffec7dca"
-SRC_URI[archive.sha256sum] = "462cd611016ae189d5e3f258dc7741e6a2e8267404b4e3806aaf346d50f1df7e"
+SRC_URI[archive.sha256sum] = "462cd611016ae189d5e3f258dc7741e6a2e8267404b4e3806aaf346d50f1df7e"
PR = "r0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 20/51] rxvt-unicode: Fix SRC_URI & LIC_FILES Checksum
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (18 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 19/51] jsib-glib: " Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums Saul Wold
` (30 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb
index 9657e21..db18169 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb
@@ -7,12 +7,12 @@ output. It also supports mixing multiple fonts at the \
same time, including Xft fonts."
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://src/main.C;beginline=1;endline=31;md5=633e23cdeb89fe980ded9a3af4f335c2"
+ file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432"
SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch \
file://rxvt.desktop \
file://rxvt.png"
-PR = "r0"
+PR = "r1"
inherit autotools update-alternatives
@@ -61,5 +61,5 @@ do_install_append () {
FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
-SRC_URI[md5sum] = "a23aa40b31e843878b6f9c44768de430"
-SRC_URI[sha256sum] = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a"
+SRC_URI[md5sum] = "1bed5bfeed026e0bfafa0e9e4f62aa37"
+SRC_URI[sha256sum] = "0452c00066774ef6e32fcd0a1e6f09230392ea9f6f42e1c2ef7b91d6fcb82d85"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (19 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 20/51] rxvt-unicode: Fix SRC_URI & LIC_FILES Checksum Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 9:31 ` Phil Blundell
2011-06-14 8:01 ` [CONSOLIDATED PULL 22/51] libx11-diet: Fixed checksum and rebase patch Saul Wold
` (29 subsequent siblings)
50 siblings, 1 reply; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
index 4a65b91..4f71559 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
@@ -5,12 +5,15 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
DEPENDS = "alsa-lib ncurses"
+PR = "r1"
+
LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-SRC_URI[md5sum] = "6b9d146af621dd712472b3ebb519c596"
-SRC_URI[sha256sum] = "2a05047363b20f16820f36198ed3b139d1c55f55464750ea11d350e00b09cb86"
+SRC_URI[md5sum] = "08fe93a12006093e590d7ecc02b119dd"
+SRC_URI[sha256sum] = "17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05"
+EXTRA_OEFLAGS = "--host ${HOST_SYS}"
inherit autotools
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 22/51] libx11-diet: Fixed checksum and rebase patch
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (20 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 23/51] eglibc 2.12/2.13: Upgrade SRCREV Saul Wold
` (28 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 14 +++--
.../xorg-lib/libx11/X18NCMSstubs.diff | 62 +++++++++++--------
2 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index fee44ae..a4929d2 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -3,13 +3,15 @@ require libx11.inc
DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
this version."
-PR = "r1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0"
-SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
- file://include_fix.patch;patch=1 \
- file://X18NCMSstubs.diff;patch=1 \
- file://fix-disable-xlocale.diff;patch=1 \
- file://fix-utf8-wrong-define.patch;patch=1"
+PR = "r2"
+
+SRC_URI += "file://x11_disable_makekeys.patch \
+ file://include_fix.patch \
+ file://X18NCMSstubs.diff \
+ file://fix-disable-xlocale.diff \
+ file://fix-utf8-wrong-define.patch"
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 2e86a48..91ab180 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -1,8 +1,10 @@
Upstream-Status: Pending
---- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
-@@ -83,6 +83,7 @@
+Index: libX11-1.3/src/imConv.c
+===================================================================
+--- libX11-1.3.orig/src/imConv.c
++++ libX11-1.3/src/imConv.c
+@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[
* from UCS char to specified charset char.
* This converter is needed for _XimGetCharCode subroutine.
*/
@@ -10,7 +12,7 @@ Upstream-Status: Pending
XPointer
_XimGetLocaleCode (
_Xconst char* encoding_name)
-@@ -96,6 +97,7 @@
+@@ -96,6 +97,7 @@ _XimGetLocaleCode (
}
return cvt;
}
@@ -18,15 +20,15 @@ Upstream-Status: Pending
/*
* Returns the locale dependent representation of a keysym.
-@@ -107,6 +109,7 @@
+@@ -106,6 +108,7 @@ _XimGetLocaleCode (
+ * terminating NUL byte. Return 0 if the keysym is not representable in the
* locale
*/
- /*ARGSUSED*/
+#ifdef XLOCALE
- int
+ /*ARGSUSED*/
+ int
_XimGetCharCode (
- XPointer ucs_conv,
-@@ -135,6 +138,7 @@
+@@ -135,6 +138,7 @@ _XimGetCharCode (
buf[count]= '\0';
return count;
}
@@ -34,8 +36,10 @@ Upstream-Status: Pending
#ifdef XKB
static int lookup_string(
---- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
+Index: libX11-1.3/src/X18NCMSstubs.c
+===================================================================
+--- /dev/null
++++ libX11-1.3/src/X18NCMSstubs.c
@@ -0,0 +1,428 @@
+/*
+ * X18NCMSstubs.c
@@ -465,9 +469,11 @@ Upstream-Status: Pending
+}
+
+#endif
---- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
-@@ -331,6 +331,8 @@
+Index: libX11-1.3/src/Makefile.am
+===================================================================
+--- libX11-1.3.orig/src/Makefile.am
++++ libX11-1.3/src/Makefile.am
+@@ -335,6 +335,8 @@ if THRSTUBS
libX11_la_SOURCES+=UIThrStubs.c
endif
@@ -476,7 +482,7 @@ Upstream-Status: Pending
x11datadir = @X11_DATADIR@
x11data_DATA = XKeysymDB XErrorDB
-@@ -338,7 +340,8 @@
+@@ -342,7 +344,8 @@ EXTRA_DIST = \
$(x11data_DATA) \
os2Stubs.c \
udcInf.c \
@@ -484,11 +490,13 @@ Upstream-Status: Pending
+ UIThrStubs.c \
+ X18NCMSstubs.c
- #
- # Figure out which sub-libraries to link into Xlib
---- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
-@@ -55,7 +55,9 @@
+ if XCB
+ libX11_la_SOURCES += \
+Index: libX11-1.3/src/locking.c
+===================================================================
+--- libX11-1.3.orig/src/locking.c
++++ libX11-1.3/src/locking.c
+@@ -66,7 +66,9 @@ in this Software without prior written a
#define NUM_FREE_CVLS 4
/* in lcWrap.c */
@@ -498,7 +506,7 @@ Upstream-Status: Pending
#ifdef WIN32
static DWORD _X_TlsIndex = (DWORD)-1;
-@@ -625,9 +627,11 @@
+@@ -594,9 +596,11 @@ Status XInitThreads(void)
_Xglobal_lock = &global_lock;
xmutex_init(_Xglobal_lock->lock);
xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
@@ -510,10 +518,12 @@ Upstream-Status: Pending
_XLockMutex_fn = _XLockMutex;
_XUnlockMutex_fn = _XUnlockMutex;
_XCreateMutex_fn = _XCreateMutex;
---- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
-@@ -215,7 +215,14 @@
- esac
+Index: libX11-1.3/configure.ac
+===================================================================
+--- libX11-1.3.orig/configure.ac
++++ libX11-1.3/configure.ac
+@@ -289,7 +289,14 @@ else
+ fi
AC_SUBST(KEYSYMDEF)
-AM_CONDITIONAL(UDC, test xfalse = xtrue)
@@ -526,5 +536,5 @@ Upstream-Status: Pending
+ AC_DEFINE(UDC,1,[Include support for UDC])
+fi
- AC_ARG_ENABLE(xcms,
+ AC_ARG_ENABLE(xcms,
AC_HELP_STRING([--disable-xcms],
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 23/51] eglibc 2.12/2.13: Upgrade SRCREV
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (21 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 22/51] libx11-diet: Fixed checksum and rebase patch Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 24/51] eglibc: migrate configurability from oe Saul Wold
` (27 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
We need http://www.eglibc.org/archives/patches/msg00923.html
to get through the problem we see when OPTION_EGLIBC_RTLD_DEBUG
is disabled. This patch has been backported to both 2.12 and 2.13
branches. We bump SRCREVs to have that change.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +-
meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index e69cd0f..d851b5d 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -4,7 +4,7 @@ DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
PR = "r14"
-SRCREV = "11982"
+SRCREV = "14158"
EGLIBC_BRANCH="eglibc-2_12"
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index c77bf3c..9a9773c 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -1,6 +1,6 @@
require eglibc.inc
-SRCREV = "13356"
+SRCREV = "14157"
DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 24/51] eglibc: migrate configurability from oe
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (22 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 23/51] eglibc 2.12/2.13: Upgrade SRCREV Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 25/51] tcmode-default: fix PREFERRED_VERSION_gcc-cross-canadian Saul Wold
` (26 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Kang Kai <kai.kang@windriver.com>
Migrate configurability from oe, try to shrink minimal image size
All eglibc configuration options are included in conf/distro/include/default-distrovars.inc.
Define DISTRO_FEATURES_LIBC and DISTRO_FEATURES in local.conf with the same way
in local.conf.sample.extended to enable those options.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/conf/distro/include/default-distrovars.inc | 9 +++-
meta/recipes-core/eglibc/eglibc-options.inc | 62 +++++++++++++++++++++++
meta/recipes-core/eglibc/eglibc.inc | 6 ++
3 files changed, 76 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 4b68a0a..2cde46c 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -10,7 +10,14 @@ LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
LOCALE_UTF8_ONLY ?= "0"
-DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
+DISTRO_FEATURES_LIBC ?= "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \
+ libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
+ libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \
+ libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
+ libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
+ libc-posix-wchar-io"
+
+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
IMAGE_FEATURES ?= ""
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
new file mode 100644
index 0000000..119ceef
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -0,0 +1,62 @@
+def eglibc_cfg(feature, features, tokens, cnf):
+ if type(tokens) == type(""):
+ tokens = [tokens]
+ if type(features) == type([]) and feature in features:
+ cnf.extend([token + ' = y' for token in tokens])
+ else:
+ for token in tokens:
+ cnf.extend([token + ' = n'])
+ if token == 'OPTION_EGLIBC_NSSWITCH':
+ cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
+ cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])
+
+# Map distro features to eglibc options settings
+def features_to_eglibc_settings(d):
+ cnf = ([])
+ distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split()
+ eglibc_cfg('ipv6', distro_features, 'OPTION_EGLIBC_ADVANCED_INET6', cnf)
+ eglibc_cfg('libc-backtrace', distro_features, 'OPTION_EGLIBC_BACKTRACE', cnf)
+ eglibc_cfg('libc-big-macros', distro_features, 'OPTION_EGLIBC_BIG_MACROS', cnf)
+ eglibc_cfg('libc-bsd', distro_features, 'OPTION_EGLIBC_BSD', cnf)
+ eglibc_cfg('libc-cxx-tests', distro_features, 'OPTION_EGLIBC_CXX_TESTS', cnf)
+ eglibc_cfg('libc-catgets', distro_features, 'OPTION_EGLIBC_CATGETS', cnf)
+ eglibc_cfg('libc-charsets', distro_features, 'OPTION_EGLIBC_CHARSETS', cnf)
+ eglibc_cfg('libc-crypt', distro_features, 'OPTION_EGLIBC_CRYPT', cnf)
+ eglibc_cfg('libc-crypt-ufc', distro_features, 'OPTION_EGLIBC_CRYPT_UFC', cnf)
+ eglibc_cfg('libc-db-aliases', distro_features, 'OPTION_EGLIBC_DB_ALIASES', cnf)
+ eglibc_cfg('libc-envz', distro_features, 'OPTION_EGLIBC_ENVZ', cnf)
+ eglibc_cfg('libc-fcvt', distro_features, 'OPTION_EGLIBC_FCVT', cnf)
+ eglibc_cfg('libc-fmtmsg', distro_features, 'OPTION_EGLIBC_FMTMSG', cnf)
+ eglibc_cfg('libc-fstab', distro_features, 'OPTION_EGLIBC_FSTAB', cnf)
+ eglibc_cfg('libc-ftraverse', distro_features, 'OPTION_EGLIBC_FTRAVERSE', cnf)
+ eglibc_cfg('libc-getlogin', distro_features, 'OPTION_EGLIBC_GETLOGIN', cnf)
+ eglibc_cfg('libc-idn', distro_features, 'OPTION_EGLIBC_IDN', cnf)
+ eglibc_cfg('libc-inet', distro_features, 'OPTION_EGLIBC_INET', cnf)
+ eglibc_cfg('libc-inet-anl', distro_features, 'OPTION_EGLIBC_INET_ANL', cnf)
+ eglibc_cfg('libc-libm', distro_features, 'OPTION_EGLIBC_LIBM', cnf)
+ eglibc_cfg('libc-libm-big', distro_features, 'OPTION_EGLIBC_LIBM_BIG', cnf)
+ eglibc_cfg('libc-locales', distro_features, 'OPTION_EGLIBC_LOCALES', cnf)
+ eglibc_cfg('libc-locale-code', distro_features, 'OPTION_EGLIBC_LOCALE_CODE', cnf)
+ eglibc_cfg('libc-memusage', distro_features, 'OPTION_EGLIBC_MEMUSAGE', cnf)
+ eglibc_cfg('libc-nis', distro_features, 'OPTION_EGLIBC_NIS', cnf)
+ eglibc_cfg('libc-nsswitch', distro_features, 'OPTION_EGLIBC_NSSWITCH', cnf)
+ eglibc_cfg('libc-rcmd', distro_features, 'OPTION_EGLIBC_RCMD', cnf)
+ eglibc_cfg('libc-rtld-debug', distro_features, 'OPTION_EGLIBC_RTLD_DEBUG', cnf)
+ eglibc_cfg('libc-spawn', distro_features, 'OPTION_EGLIBC_SPAWN', cnf)
+ eglibc_cfg('libc-streams', distro_features, 'OPTION_EGLIBC_STREAMS', cnf)
+ eglibc_cfg('libc-sunrpc', distro_features, 'OPTION_EGLIBC_SUNRPC', cnf)
+ eglibc_cfg('libc-utmp', distro_features, 'OPTION_EGLIBC_UTMP', cnf)
+ eglibc_cfg('libc-utmpx', distro_features, 'OPTION_EGLIBC_UTMPX', cnf)
+ eglibc_cfg('libc-wordexp', distro_features, 'OPTION_EGLIBC_WORDEXP', cnf)
+ eglibc_cfg('libc-posix-clang-wchar', distro_features, 'OPTION_POSIX_C_LANG_WIDE_CHAR', cnf)
+ eglibc_cfg('libc-posix-regexp', distro_features, 'OPTION_POSIX_REGEXP', cnf)
+ eglibc_cfg('libc-posix-regexp-glibc', distro_features, 'OPTION_POSIX_REGEXP_GLIBC', cnf)
+ eglibc_cfg('libc-posix-wchar-io', distro_features, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf)
+
+ # try to fix disable charsets/locales/locale-code compile fail
+ if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
+ bb.data.setVar('PACKAGE_NO_GCONV', '0', d)
+ else:
+ bb.data.setVar('PACKAGE_NO_GCONV', '1', d)
+
+ return "\n".join(cnf)
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 46ffa82..616f1af 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -28,6 +28,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES += "virtual/libintl virtual/libiconv"
inherit autotools
+require eglibc-options.inc
LEAD_SONAME = "libc.so"
@@ -43,3 +44,8 @@ EXTRA_OEMAKE += ${EGLIBCPARALLELISM}
PARALLEL_MAKE = ""
PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+
+OE_FEATURES = "${@features_to_eglibc_settings(d)}"
+do_configure_prepend() {
+ echo '${OE_FEATURES}' > ${B}/option-groups.config
+}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 25/51] tcmode-default: fix PREFERRED_VERSION_gcc-cross-canadian
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (23 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 24/51] eglibc: migrate configurability from oe Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 26/51] recipes: update Upstream-Status for multiple recipes' patches Saul Wold
` (25 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
[YOCTO #1163]
For some test I need to back to use gcc-4.5, so I changed GCCVERSION and
SDKGCCVERSION to "4.5.1", but I found gcc-cross-canadian's 4.6.0, rather
than 4.5.1, would be built! Finally I made this patch to fix the issue.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 6eb34ef..90282ee 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -37,7 +37,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}"
-PREFERRED_VERSION_gcc-cross-canadian ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 26/51] recipes: update Upstream-Status for multiple recipes' patches
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (24 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 25/51] tcmode-default: fix PREFERRED_VERSION_gcc-cross-canadian Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 27/51] gnome-doc-utils: upgrade from 0.20.5 to the latest version 0.20.6 Saul Wold
` (24 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
lttng-ust
gnome-doc-utils
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../gnome/gnome-doc-utils/xsltproc_nonet.patch | 2 +-
.../lttng/lttng-ust/uclibc-sched_getcpu.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
index ad81c2f..44d18e7 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch
@@ -1,7 +1,7 @@
This adds the -nonet option to xsltproc invocations, which fixes
compile errors when building the gnome-doc-utils docs.
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [configuration]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff --git a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
index 7ab429c..a6aa6a7 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
+++ b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch
@@ -6,7 +6,7 @@ this header is not needed even in eglibc case so it can be removed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
+Upstream-Status: Submitted
Index: ust-0.12/libust/tracer.h
===================================================================
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 27/51] gnome-doc-utils: upgrade from 0.20.5 to the latest version 0.20.6
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (25 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 26/51] recipes: update Upstream-Status for multiple recipes' patches Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 28/51] startup-notification: upgrade from 0.10 to the latest version 0.12 Saul Wold
` (23 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
...c-utils_0.20.5.bb => gnome-doc-utils_0.20.6.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gnome/{gnome-doc-utils_0.20.5.bb => gnome-doc-utils_0.20.6.bb} (56%)
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
similarity index 56%
rename from meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb
rename to meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index 115eb4d..e7bf6e9 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -1,9 +1,9 @@
require gnome-doc-utils.inc
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r2"
+PR = "r0"
SRC_URI += "file://xsltproc_nonet.patch"
-SRC_URI[archive.md5sum] = "3aa1f651834714090cdbf898ec090a98"
-SRC_URI[archive.sha256sum] = "08d99b8ab813fadd3407873e4a30282debce92e22eb1b45430a8bb9c120e2130"
+SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391"
+SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 28/51] startup-notification: upgrade from 0.10 to the latest version 0.12
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (26 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 27/51] gnome-doc-utils: upgrade from 0.20.5 to the latest version 0.20.6 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 29/51] util-macros: upgrade from 1.13.0 to the latest version 0.14.0 Saul Wold
` (22 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
...cation_0.10.bb => startup-notification_0.12.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/startup-notification/{startup-notification_0.10.bb => startup-notification_0.12.bb} (87%)
diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
similarity index 87%
rename from meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
rename to meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
index 70afb73..d85df6b 100644
--- a/meta/recipes-graphics/startup-notification/startup-notification_0.10.bb
+++ b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
@@ -22,5 +22,5 @@ inherit autotools pkgconfig
SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "bca0ed1c74bc4e483ea2ed12a5717354"
-SRC_URI[sha256sum] = "64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459"
+SRC_URI[md5sum] = "2cd77326d4dcaed9a5a23a1232fb38e9"
+SRC_URI[sha256sum] = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 29/51] util-macros: upgrade from 1.13.0 to the latest version 0.14.0
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (27 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 28/51] startup-notification: upgrade from 0.10 to the latest version 0.12 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 30/51] resourceproto: upgrade from 1.1.1 to the latest version 1.2.0 Saul Wold
` (21 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
...util-macros_1.13.0.bb => util-macros_1.14.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-util/{util-macros_1.13.0.bb => util-macros_1.14.0.bb} (79%)
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
rename to meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb
index 4bac614..88ee4f6 100644
--- a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb
+++ b/meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb
@@ -20,5 +20,5 @@ RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "31e9ddcbc1d8bc8c09ab180443974dd1"
-SRC_URI[sha256sum] = "7bff944fb120192e7fe1706e9c0b7e41666e7983ce3e2bdef0b7734392d9e695"
+SRC_URI[md5sum] = "cbe57cd7cc492a762466f5280a7ffba8"
+SRC_URI[sha256sum] = "9bd6949b930aadfce32bc9e101008d4c6ff48329ed0e3a467990bee69f574d66"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 30/51] resourceproto: upgrade from 1.1.1 to the latest version 1.2.0
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (28 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 29/51] util-macros: upgrade from 1.13.0 to the latest version 0.14.0 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 31/51] dri2proto: upgrade from 2.3 to the latest version 2.4 Saul Wold
` (20 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Update LIC_FILES_CHKSUM due to the only change:
+ Copyright (c) 2002 XFree86 Inc
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
...sourceproto_1.1.1.bb => resourceproto_1.2.0.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-proto/{resourceproto_1.1.1.bb => resourceproto_1.2.0.bb} (61%)
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.1.1.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
similarity index 61%
rename from meta/recipes-graphics/xorg-proto/resourceproto_1.1.1.bb
rename to meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
index fa13970..92c37c6 100644
--- a/meta/recipes-graphics/xorg-proto/resourceproto_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
@@ -7,13 +7,13 @@ Resource extension. XRes provides an interface that allows X clients to \
see and monitor X resource usage of various clients."
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
+LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97"
CONFLICTS = "resourceext"
PR = "r0"
PE = "1"
-SRC_URI[md5sum] = "8ff0525ae7502b48597b78d00bc22284"
-SRC_URI[sha256sum] = "8579818e99aa881c00c04eb5f96fcbeec463816ca8e3cda9d3d25562f7a4b8c6"
+SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4"
+SRC_URI[sha256sum] = "3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 31/51] dri2proto: upgrade from 2.3 to the latest version 2.4
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (29 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 30/51] resourceproto: upgrade from 1.1.1 to the latest version 1.2.0 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 32/51] glproto: upgrade from 1.4.12 to the latest version 1.4.13 Saul Wold
` (19 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../{dri2proto_2.3.bb => dri2proto_2.4.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{dri2proto_2.3.bb => dri2proto_2.4.bb} (76%)
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_2.3.bb b/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-proto/dri2proto_2.3.bb
rename to meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
index 79f7dbc..9d30e94 100644
--- a/meta/recipes-graphics/xorg-proto/dri2proto_2.3.bb
+++ b/meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
@@ -12,5 +12,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
PR = "r0"
-SRC_URI[md5sum] = "3407b494d5e90d584c9af52aa8f9f028"
-SRC_URI[sha256sum] = "b2141892a0db35feffa5e952ff5e1d2727c4436b07d7e2e9dd2ed89c8bb3e677"
+SRC_URI[md5sum] = "0cdeb1e95901813385dc9576be272bd3"
+SRC_URI[sha256sum] = "ff156f178d48ab31beeb4be5eb39d5df7540791ba489a8d94c443bb99a2376f1"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 32/51] glproto: upgrade from 1.4.12 to the latest version 1.4.13
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (30 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 31/51] dri2proto: upgrade from 2.3 to the latest version 2.4 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 33/51] inputproto: upgrade from 2.0.1 to the latest version 2.0.2 Saul Wold
` (18 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../{glproto_1.4.12.bb => glproto_1.4.13.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{glproto_1.4.12.bb => glproto_1.4.13.bb} (77%)
diff --git a/meta/recipes-graphics/xorg-proto/glproto_1.4.12.bb b/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-proto/glproto_1.4.12.bb
rename to meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
index 7b32e70..38b17b6 100644
--- a/meta/recipes-graphics/xorg-proto/glproto_1.4.12.bb
+++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
@@ -15,5 +15,5 @@ PE = "1"
BBCLASSEXTEND = "nativesdk"
-SRC_URI[md5sum] = "55edc5ff2efb734215c868f72f7cf27e"
-SRC_URI[sha256sum] = "48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de"
+SRC_URI[md5sum] = "9542f2d36751a8ad7eae9d8e176f70d4"
+SRC_URI[sha256sum] = "fc0a94d4df003cb6b6953173e6498d9c4c3268ee24bcc46a1172a1e1dbd3d742"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 33/51] inputproto: upgrade from 2.0.1 to the latest version 2.0.2
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (31 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 32/51] glproto: upgrade from 1.4.12 to the latest version 1.4.13 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 34/51] pixman: upgrade from 0.20.2 to the latest stable 0.22.0 Saul Wold
` (17 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../{inputproto_2.0.1.bb => inputproto_2.0.2.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{inputproto_2.0.1.bb => inputproto_2.0.2.bb} (78%)
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_2.0.1.bb b/meta/recipes-graphics/xorg-proto/inputproto_2.0.2.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-proto/inputproto_2.0.1.bb
rename to meta/recipes-graphics/xorg-proto/inputproto_2.0.2.bb
index 7103d0d..26f1e2d 100644
--- a/meta/recipes-graphics/xorg-proto/inputproto_2.0.1.bb
+++ b/meta/recipes-graphics/xorg-proto/inputproto_2.0.2.bb
@@ -17,6 +17,6 @@ inherit gettext
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "da9bf9e5d174163f597d2d72757d9038"
-SRC_URI[sha256sum] = "63663dd88df812738e0efdc52a18868c0756128f09748cbe89c8ec6d17124a44"
+SRC_URI[md5sum] = "07d54ae098ed4e6dce472f6ef3de05ce"
+SRC_URI[sha256sum] = "64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 34/51] pixman: upgrade from 0.20.2 to the latest stable 0.22.0
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (32 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 33/51] inputproto: upgrade from 2.0.1 to the latest version 2.0.2 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 35/51] libxext: upgrade from 1.2.0 to the latest version 1.3.0 Saul Wold
` (16 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Update LIC_FILES_CHKSUM:
1) COPYING: only format change; no actual license change.
2) 0.22.0 doesn't have pixman-x64-mmx-emulation.h, so let's remove it.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../{pixman_0.20.2.bb => pixman_0.22.0.bb} | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/xorg-lib/{pixman_0.20.2.bb => pixman_0.22.0.bb} (66%)
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb
similarity index 66%
rename from meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb
index 00a58bf..e5472c0 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.20.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.22.0.bb
@@ -8,10 +8,10 @@ including trapezoids, triangles, and rectangles."
require xorg-lib-common.inc
LICENSE = "MIT & MIT-style & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fea989a44fb012b5e79584972a863d22 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \
file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \
file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \
- file://pixman/pixman-x64-mmx-emulation.h;beginline=4;endline=9;md5=4e32716f2efaa6c4659222667c339bb8"
+ "
DEPENDS = "virtual/libx11"
@@ -20,6 +20,6 @@ PR = "r0"
EXTRA_OECONF="--disable-gtk"
-SRC_URI[md5sum] = "7ed10a0f0fde6853613105a99735e7e7"
-SRC_URI[sha256sum] = "30316f269a6b84c32b47545ca7fc428fd16875849fea644dc6910b3f8c33f4a9"
+SRC_URI[md5sum] = "307fe4d7dc83b1a558c362907097c0d0"
+SRC_URI[sha256sum] = "24a1bce57c36c773f67d48f7f25f80d69a47ef92a67404f1644d94dee156ae2b"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 35/51] libxext: upgrade from 1.2.0 to the latest version 1.3.0
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (33 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 34/51] pixman: upgrade from 0.20.2 to the latest stable 0.22.0 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 36/51] libxi: upgrade from 1.4.2 to the latest version 1.4.3 Saul Wold
` (15 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../{libxext_1.2.0.bb => libxext_1.3.0.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxext_1.2.0.bb => libxext_1.3.0.bb} (76%)
diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.0.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-lib/libxext_1.2.0.bb
rename to meta/recipes-graphics/xorg-lib/libxext_1.3.0.bb
index 679bb1a..90b4405 100644
--- a/meta/recipes-graphics/xorg-lib/libxext_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.0.bb
@@ -11,7 +11,7 @@ extensions."
require xorg-lib-common.inc
LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0542b0321c1c9a7a20b23a1b9fa45f91"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9b0eca8f3540b7e7f8b447154a20b05a"
DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp"
PROVIDES = "xext"
@@ -23,5 +23,5 @@ XORG_PN = "libXext"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "9bb236ff0193e9fc1c1fb504dd840331"
-SRC_URI[sha256sum] = "4aed3e211e41c47908c293515580e731c26048f61a1212bf0888d1f456de6ff7"
+SRC_URI[md5sum] = "161d200b690ace818db1cc7537e70ba9"
+SRC_URI[sha256sum] = "e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 36/51] libxi: upgrade from 1.4.2 to the latest version 1.4.3
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (34 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 35/51] libxext: upgrade from 1.2.0 to the latest version 1.3.0 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 37/51] distro_tracking_fields.inc: update the info for the following recipes Saul Wold
` (14 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../xorg-lib/{libxi_1.4.2.bb => libxi_1.4.3.bb} | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxi_1.4.2.bb => libxi_1.4.3.bb} (80%)
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.4.2.bb b/meta/recipes-graphics/xorg-lib/libxi_1.4.3.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-lib/libxi_1.4.2.bb
rename to meta/recipes-graphics/xorg-lib/libxi_1.4.3.bb
index 50ff426..80a01fc 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.4.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.4.3.bb
@@ -12,11 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \
file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f"
DEPENDS += "libxext inputproto"
+
PE = "1"
+PR = "r0"
XORG_PN = "libXi"
EXTRA_OECONF_append = " --enable-specs=no"
-SRC_URI[md5sum] = "3d14f7bfc4a4335cf0144de9b67a5444"
-SRC_URI[sha256sum] = "272b8041efc0a0203fb0ba33481ddec989539aed862181b58c8c3e410e325691"
+SRC_URI[md5sum] = "792e8a7ddc7175911d69f823d38eaff6"
+SRC_URI[sha256sum] = "08c9d89a404740592621e6f5078414df86ccc78ca876e3da1af15639d81c74e0"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 37/51] distro_tracking_fields.inc: update the info for the following recipes
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (35 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 36/51] libxi: upgrade from 1.4.2 to the latest version 1.4.3 Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 38/51] pointercal: Inhibit toolchain dependencies as its just config files Saul Wold
` (13 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
screen: remove the duplicate info
tcf-agent: update MANUAL_CHECK_DATE
gnome-doc-utils
startup-notification
util-macros
liberation-fonts
resourceproto
dri2proto
glproto
inputproto
pixman
libxext
libxi
xcb-util
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 113 +++++++++----------
1 files changed, 54 insertions(+), 59 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index babf9e0..f4aa1ea 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -104,11 +104,6 @@ RECIPE_LATEST_VERSION_pn-run-postinsts = "check"
RECIPE_LAST_UPDATE_pn-run-postinsts = "Nov 22, 2010"
RECIPE_MAINTAINER_pn-run-postinsts = "Dongxiao Xu <dongxiao.xu@intel.com"
-RECIPE_STATUS_pn-screen = "red"
-RECIPE_LATEST_VERSION_pn-screen = "check"
-RECIPE_LAST_UPDATE_pn-screen = "Aug 31, 2010"
-RECIPE_MAINTAINER_pn-screen = "Qing He <qing.he@intel.com>"
-
RECIPE_STATUS_pn-subversion = "green"
RECIPE_LATEST_VERSION_pn-subversion = "1.6.15"
RECIPE_MANUAL_CHECK_DATE_pn-subversion = "Jan 25, 2011"
@@ -2777,7 +2772,7 @@ RECIPE_STATUS_pn-tcf-agent = "green"
DISTRO_PN_ALIAS_pn-tcf-agent = "WindRiver upstream=http://www.eclipse.org/dsdp/tm/"
RECIPE_DEPENDENCY_CHECK_pn-tcf-agent = "not done"
RECIPE_LATEST_VERSION_pn-tcf-agent = "0.3.0+svnr1078"
-RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "Apr 11, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "June 13, 2011"
RECIPE_NO_UPDATE_REASON_pn-tcf-agent = "Do not upgrade to version: (998)? because upstraem hasn't defined a formal release tag."
RECIPE_NO_OF_PATCHES_pn-tcf-agent = "2"
RECIPE_PATCH_pn-tcf-agent+terminals_agent = "we might get the patch from git://git.yoctoproject.org/eclipse-poky.git in future"
@@ -3819,25 +3814,25 @@ RECIPE_MAINTAINER_pn-fontsproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-glproto = "green"
DISTRO_PN_ALIAS_pn-glproto = "Meego=xorg-x11-proto-glproto"
RECIPE_DEPENDENCY_CHECK_pn-glproto = "not done"
-RECIPE_LATEST_VERSION_pn-glproto = "1.4.12"
+RECIPE_LATEST_VERSION_pn-glproto = "1.4.13"
RECIPE_NO_OF_PATCHES_pn-glproto = "0"
RECIPE_INTEL_SECTION_pn-glproto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glproto = "7 months"
-RECIPE_LATEST_RELEASE_DATE_pn-glproto = "Aug 10, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glproto = "9 months"
+RECIPE_LATEST_RELEASE_DATE_pn-glproto = "May 4, 2011"
RECIPE_COMMENTS_pn-glproto = ""
-RECIPE_LAST_UPDATE_pn-glproto = "Nov 16, 2010"
+RECIPE_LAST_UPDATE_pn-glproto = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-glproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-inputproto = "green"
DISTRO_PN_ALIAS_pn-inputproto = "Meego=xorg-x11-proto-inputproto"
RECIPE_DEPENDENCY_CHECK_pn-inputproto = "not done"
-RECIPE_LATEST_VERSION_pn-inputproto = "2.0.1"
+RECIPE_LATEST_VERSION_pn-inputproto = "2.0.2"
RECIPE_NO_OF_PATCHES_pn-inputproto = "0"
RECIPE_INTEL_SECTION_pn-inputproto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-inputproto = "1 year"
-RECIPE_LATEST_RELEASE_DATE_pn-inputproto = "Nov 10, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-inputproto = "7 months"
+RECIPE_LATEST_RELEASE_DATE_pn-inputproto = "Jun 7, 2011"
RECIPE_COMMENTS_pn-inputproto = ""
-RECIPE_LAST_UPDATE_pn-inputproto = "Jan 5, 2011"
+RECIPE_LAST_UPDATE_pn-inputproto = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-inputproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-kbproto = "green"
@@ -3865,13 +3860,13 @@ RECIPE_MAINTAINER_pn-libdmx = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-libxi = "green"
RECIPE_DEPENDENCY_CHECK_pn-libxi = "not done"
-RECIPE_LATEST_VERSION_pn-libxi = "1.4.2"
+RECIPE_LATEST_VERSION_pn-libxi = "1.4.3"
RECIPE_NO_OF_PATCHES_pn-libxi = "0"
RECIPE_INTEL_SECTION_pn-libxi = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxi = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-libxi = "Mar 18, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxi = "2+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-libxi = "Jun 6, 2011"
RECIPE_COMMENTS_pn-libxi = ""
-RECIPE_LAST_UPDATE_pn-libxi = "Apr 11, 2011"
+RECIPE_LAST_UPDATE_pn-libxi = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-libxi = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-libxinerama = "green"
@@ -3958,13 +3953,13 @@ RECIPE_MAINTAINER_pn-renderproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-resourceproto = "green"
DISTRO_PN_ALIAS_pn-resourceproto = "Meego=xorg-x11-proto-resourceproto"
RECIPE_DEPENDENCY_CHECK_pn-resourceproto = "not done"
-RECIPE_LATEST_VERSION_pn-resourceproto = "1.1.1"
+RECIPE_LATEST_VERSION_pn-resourceproto = "1.2.0"
RECIPE_NO_OF_PATCHES_pn-resourceproto = "0"
RECIPE_INTEL_SECTION_pn-resourceproto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-resourceproto = "1+ years"
-RECIPE_LATEST_RELEASE_DATE_pn-resourceproto = "Dec 8, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-resourceproto = "5+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-resourceproto = "May 27, 2011"
RECIPE_COMMENTS_pn-resourceproto = ""
-RECIPE_LAST_UPDATE_pn-resourceproto = "Jan 5, 2011"
+RECIPE_LAST_UPDATE_pn-resourceproto = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-resourceproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-scrnsaverproto = "green"
@@ -4090,13 +4085,13 @@ RECIPE_MAINTAINER_pn-xineramaproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-dri2proto = "green"
DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto"
RECIPE_DEPENDENCY_CHECK_pn-dri2proto = "not done"
-RECIPE_LATEST_VERSION_pn-dri2proto = "2.3"
+RECIPE_LATEST_VERSION_pn-dri2proto = "2.4"
RECIPE_NO_OF_PATCHES_pn-dri2proto = "0"
RECIPE_INTEL_SECTION_pn-dri2proto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dri2proto = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-dri2proto = "02/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dri2proto = "1+ years"
+RECIPE_LATEST_RELEASE_DATE_pn-dri2proto = "May 4, 2011"
RECIPE_COMMENTS_pn-dri2proto = ""
-RECIPE_LAST_UPDATE_pn-dri2proto = "Jun 29, 2010"
+RECIPE_LAST_UPDATE_pn-dri2proto = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-dri2proto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-xcb-proto = "green"
@@ -4148,15 +4143,15 @@ RECIPE_MAINTAINER_pn-xproto = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-liberation-fonts = "green"
RECIPE_DEPENDENCY_CHECK_pn-liberation-fonts = "not done"
-RECIPE_LATEST_VERSION_pn-liberation-fonts = "1.06.0.20100721"
-RECIPE_MANUAL_CHECK_DATE_pn-liberation-fonts = "Jan 28, 2011"
-RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "Do not upgrade to version: 1.06.0.20100721 because before doing that, we need adding new native packages like libungif_4.1.3, libspiro and fontforge first"
+RECIPE_LATEST_VERSION_pn-liberation-fonts = "1.07.0"
+RECIPE_MANUAL_CHECK_DATE_pn-liberation-fonts = "Jun 13, 2011"
+RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "Do not upgrade to version: 1.07.0 because before doing that, we need adding new native packages like libungif_4.1.3, libspiro and fontforge first"
RECIPE_NO_OF_PATCHES_pn-liberation-fonts = "0"
RECIPE_INTEL_SECTION_pn-liberation-fonts = "x11/fonts"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liberation-fonts = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-liberation-fonts = "Jul 21, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liberation-fonts = "10 months"
+RECIPE_LATEST_RELEASE_DATE_pn-liberation-fonts = "May 30, 2011"
RECIPE_COMMENTS_pn-liberation-fonts = "current version 1.04 released open source under GPLv2 with exceptions"
-RECIPE_LAST_UPDATE_pn-liberation-fonts = "Nov 24, 2010"
+RECIPE_LAST_UPDATE_pn-liberation-fonts = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-liberation-fonts = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-libfontenc = "green"
@@ -4373,13 +4368,13 @@ RECIPE_MAINTAINER_pn-libxdmcp = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-libxext = "green"
RECIPE_DEPENDENCY_CHECK_pn-libxext = "not done"
-RECIPE_LATEST_VERSION_pn-libxext = "1.1.2"
+RECIPE_LATEST_VERSION_pn-libxext = "1.3.0"
RECIPE_NO_OF_PATCHES_pn-libxext = "0"
RECIPE_INTEL_SECTION_pn-libxext = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxext = "1 year"
-RECIPE_LATEST_RELEASE_DATE_pn-libxext = "06/2009"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxext = "6+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-libxext = "May 6, 2011"
RECIPE_COMMENTS_pn-libxext = ""
-RECIPE_LAST_UPDATE_pn-libxext = "Nov 24, 2010"
+RECIPE_LAST_UPDATE_pn-libxext = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-libxext = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-libxfixes = "green"
@@ -4418,14 +4413,13 @@ RECIPE_MAINTAINER_pn-libxkbfile = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-pixman = "green"
RECIPE_DEPENDENCY_CHECK_pn-pixman = "not done"
-RECIPE_LATEST_VERSION_pn-pixman = "0.21.6"
-RECIPE_NO_UPDATE_REASON_pn-pixman = "Do not upgrade to version: 0.21.6 because it's a development snapshot. pixman's stable releases have even minor version numbers."
+RECIPE_LATEST_VERSION_pn-pixman = "0.22.0"
RECIPE_NO_OF_PATCHES_pn-pixman = "0"
RECIPE_INTEL_SECTION_pn-pixman = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pixman = "1+ month"
-RECIPE_LATEST_RELEASE_DATE_pn-pixman = "Feb 22, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pixman = "14 days"
+RECIPE_LATEST_RELEASE_DATE_pn-pixman = "May 2, 2011"
RECIPE_COMMENTS_pn-pixman = ""
-RECIPE_LAST_UPDATE_pn-pixman = "Jan 31, 2011"
+RECIPE_LAST_UPDATE_pn-pixman = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-pixman = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-xtrans = "green"
@@ -4475,12 +4469,12 @@ RECIPE_MAINTAINER_pn-xkeyboard-config = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-util-macros = "green"
DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros"
RECIPE_DEPENDENCY_CHECK_pn-util-macros = "not done"
-RECIPE_LATEST_VERSION_pn-util-macros = "1.13.0"
+RECIPE_LATEST_VERSION_pn-util-macros = "1.14.0"
RECIPE_INTEL_SECTION_pn-util-macros = "x11/utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "17 days"
-RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "Mar 14, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "2+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "May 27, 2011"
RECIPE_COMMENTS_pn-util-macros = ""
-RECIPE_LAST_UPDATE_pn-util-macros = "Apr 20, 2011"
+RECIPE_LAST_UPDATE_pn-util-macros = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-util-macros = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-fontconfig = "green"
@@ -4559,24 +4553,24 @@ RECIPE_MAINTAINER_pn-gnome-vfs = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-xcb-util = "green"
RECIPE_DEPENDENCY_CHECK_pn-xcb-util = "not done"
-RECIPE_LATEST_VERSION_pn-xcb-util = "0.3.6"
+RECIPE_LATEST_VERSION_pn-xcb-util = "0.3.8"
RECIPE_NO_OF_PATCHES_pn-xcb-util = "0"
RECIPE_INTEL_SECTION_pn-xcb-util = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xcb-util = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-xcb-util = "08/24/2009"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xcb-util = "1+ years"
+RECIPE_LATEST_RELEASE_DATE_pn-xcb-util = "Apr 25, 2011"
RECIPE_COMMENTS_pn-xcb-util = ""
-RECIPE_LAST_UPDATE_pn-xcb-util = "Jul 22, 2010"
+RECIPE_LAST_UPDATE_pn-xcb-util = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-xcb-util = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-startup-notification = "green"
RECIPE_DEPENDENCY_CHECK_pn-startup-notification = "not done"
-RECIPE_LATEST_VERSION_pn-startup-notification = "0.10"
+RECIPE_LATEST_VERSION_pn-startup-notification = "0.12"
RECIPE_NO_OF_PATCHES_pn-startup-notification = "0"
RECIPE_INTEL_SECTION_pn-startup-notification = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-startup-notification = "2 years"
-RECIPE_LATEST_RELEASE_DATE_pn-startup-notification = "04/13/2009"
-RECIPE_COMMENTS_pn-startup-notification = "in recipe, SECTION is libs but to be more accurate it should be x11/libs"
-RECIPE_LAST_UPDATE_pn-startup-notification = "Jul 22, 2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-startup-notification = "11 days"
+RECIPE_LATEST_RELEASE_DATE_pn-startup-notification = "May 16, 2011"
+RECIPE_COMMENTS_pn-startup-notification = ""
+RECIPE_LAST_UPDATE_pn-startup-notification = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-startup-notification = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-galago-daemon = "green"
@@ -4591,13 +4585,14 @@ RECIPE_MAINTAINER_pn-galago-daemon = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-gnome-doc-utils = "green"
RECIPE_DEPENDENCY_CHECK_pn-gnome-doc-utils = "not done"
-RECIPE_LATEST_VERSION_pn-gnome-doc-utils = "0.20.5"
-RECIPE_NO_OF_PATCHES_pn-gnome-doc-utils = "0"
+RECIPE_LATEST_VERSION_pn-gnome-doc-utils = "0.20.6"
+RECIPE_NO_OF_PATCHES_pn-gnome-doc-utils = "1"
+RECIPE_PATCH_pn-gnome-doc-utils+xsltproc_nonet = "add -nonet option to fix compile errors"
RECIPE_INTEL_SECTION_pn-gnome-doc-utils = "utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gnome-doc-utils = "2+ months"
-RECIPE_LATEST_RELEASE_DATE_pn-gnome-doc-utils = "Mar 22, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gnome-doc-utils = "1+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-gnome-doc-utils = "Apr 25, 2011"
RECIPE_COMMENTS_pn-gnome-doc-utils = ""
-RECIPE_LAST_UPDATE_pn-gnome-doc-utils = "Apr 11, 2011"
+RECIPE_LAST_UPDATE_pn-gnome-doc-utils = "Jun 13, 2011"
RECIPE_MAINTAINER_pn-gnome-doc-utils = "Dexuan Cui <dexuan.cui@intel.com>"
RECIPE_STATUS_pn-gnome-settings-daemon = "red"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 38/51] pointercal: Inhibit toolchain dependencies as its just config files
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (36 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 37/51] distro_tracking_fields.inc: update the info for the following recipes Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 39/51] formfactor: " Saul Wold
` (12 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-bsp/pointercal/pointercal_0.0.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-bsp/pointercal/pointercal_0.0.bb b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
index 069d850..c8233ea 100644
--- a/meta/recipes-bsp/pointercal/pointercal_0.0.bb
+++ b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
@@ -19,3 +19,4 @@ do_install() {
ALLOW_EMPTY_${PN} = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+INHIBIT_DEFAULT_DEPS = "1"
\ No newline at end of file
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 39/51] formfactor: Inhibit toolchain dependencies as its just config files
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (37 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 38/51] pointercal: Inhibit toolchain dependencies as its just config files Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 40/51] keymaps: Inhibit toolchain dependencies as its just configuration files Saul Wold
` (11 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-bsp/formfactor/formfactor_0.0.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index 28624a6..abf20e0 100644
--- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb
+++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
@@ -9,6 +9,7 @@ SRC_URI = "file://config file://machconfig"
S = "${WORKDIR}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+INHIBIT_DEFAULT_DEPS = "1"
do_install() {
# Only install file if it has a contents
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 40/51] keymaps: Inhibit toolchain dependencies as its just configuration files
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (38 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 39/51] formfactor: " Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 41/51] usbinit: Inherit allarch as its a generic script Saul Wold
` (10 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 4683fa1..23a3051 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PR = "r19"
+INHIBIT_DEFAULT_DEPS = "1"
+
inherit update-rc.d
SRC_URI = "file://keymap.sh \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 41/51] usbinit: Inherit allarch as its a generic script
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (39 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 40/51] keymaps: Inhibit toolchain dependencies as its just configuration files Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 42/51] base-files: Inherit toolchain dependencies as a compiler isn't used Saul Wold
` (9 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-bsp/usbinit/usbinit.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb
index 834649b..6170362 100644
--- a/meta/recipes-bsp/usbinit/usbinit.bb
+++ b/meta/recipes-bsp/usbinit/usbinit.bb
@@ -14,9 +14,9 @@ do_install() {
install -d ${D}/etc
install -d ${D}/etc/init.d
install usb-gether ${D}/etc/init.d
-}
+}
-inherit update-rc.d
+inherit update-rc.d allarch
INITSCRIPT_NAME = "usb-gether"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 42/51] base-files: Inherit toolchain dependencies as a compiler isn't used
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (40 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 41/51] usbinit: Inherit allarch as its a generic script Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 43/51] poky-feed-opkg: Disable default toolchain dependencies as these are just configuration files Saul Wold
` (8 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 4445081..e76fdf6 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -29,6 +29,8 @@ SRC_URI = "file://rotation \
file://licenses/Artistic"
S = "${WORKDIR}"
+INHIBIT_DEFAULT_DEPS = "1"
+
docdir_append = "/${P}"
dirs1777 = "/tmp ${localstatedir}/volatile/lock ${localstatedir}/volatile/tmp"
dirs2775 = "/home ${prefix}/src ${localstatedir}/local"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 43/51] poky-feed-opkg: Disable default toolchain dependencies as these are just configuration files
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (41 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 42/51] base-files: Inherit toolchain dependencies as a compiler isn't used Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 44/51] initscripts: makedevs is no longer used anywhere so drop dependency. Also inhibit compiler/libc dependencies as they're unused Saul Wold
` (7 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../feed-config/poky-feed-config-opkg_1.0.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
index 9b005d0..fc223c9 100644
--- a/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
+++ b/meta/recipes-core/feed-config/poky-feed-config-opkg_1.0.bb
@@ -3,6 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+INHIBIT_DEFAULT_DEPS = "1"
#FEEDNAMEPREFIX ?= "INVALID"
#FEEDURIPREFIX ?= "INVALID"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 44/51] initscripts: makedevs is no longer used anywhere so drop dependency. Also inhibit compiler/libc dependencies as they're unused
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (42 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 43/51] poky-feed-opkg: Disable default toolchain dependencies as these are just configuration files Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 45/51] sysvinit-inittab: Inhibit compiler/libc dependencies as this is just a configuration file Saul Wold
` (6 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-core/initscripts/initscripts_1.0.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 720c252..48b65b9 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -2,11 +2,11 @@ SUMMARY = "SysV init scripts"
DESCRIPTION = "Initscripts provide the basic system startup initialization scripts for the system. These scripts include actions such as filesystem mounting, fsck, RTC manipulation and other actions routinely performed at system startup. In addition, the scripts are also used during system shutdown to reverse the actions performed at startup."
SECTION = "base"
PRIORITY = "required"
-DEPENDS = "makedevs"
-RDEPENDS_${PN} = "makedevs"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r125"
+PR = "r126"
+
+INHIBIT_DEFAULT_DEPS = "1"
SRC_URI = "file://functions \
file://halt \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 45/51] sysvinit-inittab: Inhibit compiler/libc dependencies as this is just a configuration file
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (43 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 44/51] initscripts: makedevs is no longer used anywhere so drop dependency. Also inhibit compiler/libc dependencies as they're unused Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 46/51] initrdscripts: " Saul Wold
` (5 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 9f34b27..ba60c74 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -9,6 +9,8 @@ SRC_URI = "file://COPYING \
S = "${WORKDIR}/sysvinit-${PV}"
+INHIBIT_DEFAULT_DEPS = "1"
+
do_configure() {
cp ${WORKDIR}/COPYING ${S}/
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 46/51] initrdscripts: Inhibit compiler/libc dependencies as this is just a configuration file
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (44 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 45/51] sysvinit-inittab: Inhibit compiler/libc dependencies as this is just a configuration file Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 47/51] task-sdk-host: Add nativesdk to the task name so its clearer what the contents of the task represent Saul Wold
` (4 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../initrdscripts/initramfs-live-install_1.0.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index c92ee31..c792fe0 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -15,6 +15,7 @@ do_install() {
# simple script, reality is that it is Host specific based
# on the COMPATIBLE_HOST below, which needs to take precedence
#inherit allarch
+INHIBIT_DEFAULT_DEPS = "1"
FILES_${PN} = " /install.sh "
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 47/51] task-sdk-host: Add nativesdk to the task name so its clearer what the contents of the task represent
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (45 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 46/51] initrdscripts: " Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 48/51] nativesdk.bbclass: Correct ordering of manipulations Saul Wold
` (3 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
This is particularly important since the file doens't use BBCLASSEXTEND
and PN is therefore misleading
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/populate_sdk.bbclass | 2 +-
...task-sdk-host.bb => task-sdk-host-nativesdk.bb} | 0
meta/recipes-qt/meta/meta-toolchain-qte.bb | 2 +-
...ost.bb => task-qte-toolchain-host-nativesdk.bb} | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-core/tasks/{task-sdk-host.bb => task-sdk-host-nativesdk.bb} (100%)
rename meta/recipes-qt/tasks/{task-qte-toolchain-host.bb => task-qte-toolchain-host-nativesdk.bb} (70%)
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 413eb52..089ed9a 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -7,7 +7,7 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
-TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
diff --git a/meta/recipes-core/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
similarity index 100%
rename from meta/recipes-core/tasks/task-sdk-host.bb
rename to meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 72fa702..72d58db 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,6 +1,6 @@
# Qt Embedded toolchain
PR = "r5"
-TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
similarity index 70%
rename from meta/recipes-qt/tasks/task-qte-toolchain-host.bb
rename to meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
index 2ab6ccf..cfa45ef 100644
--- a/meta/recipes-qt/tasks/task-qte-toolchain-host.bb
+++ b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
@@ -1,4 +1,4 @@
-require recipes-core/tasks/task-sdk-host.bb
+require recipes-core/tasks/task-sdk-host-nativesdk.bb
DESCRIPTION = "Host packages for Qt Embedded SDK"
LICENSE = "MIT"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 48/51] nativesdk.bbclass: Correct ordering of manipulations
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (46 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 47/51] task-sdk-host: Add nativesdk to the task name so its clearer what the contents of the task represent Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 50/51] autoconf/automake: Bump PR to resolve perl-native issue Saul Wold
` (2 subsequent siblings)
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
OVERDIDES is the key variable that needs to be set prior to data finalisation.
The other variables should be manipulated after finalisation so any
DEPENDS_prepend and _append are accounted for. This patch ensures this is
the case.
The PACKAGES maniupulations are not enabled at this time as they
don't function 100% correctly yet.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/nativesdk.bbclass | 53 ++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 644e731..3fe4bf9 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -62,27 +62,48 @@ python nativesdk_virtclass_handler () {
if not pn.endswith("-nativesdk"):
return
- depends = bb.data.getVar("DEPENDS", e.data, True)
- deps = bb.utils.explode_deps(depends)
- newdeps = []
- for dep in deps:
- if dep.endswith("-native") or dep.endswith("-cross"):
- newdeps.append(dep)
- elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc") or dep.endswith("-g++"):
- newdeps.append(dep + "-crosssdk")
- elif not dep.endswith("-nativesdk"):
- newdeps.append(dep + "-nativesdk")
- else:
- newdeps.append(dep)
- bb.data.setVar("DEPENDS", " ".join(newdeps), e.data)
- provides = bb.data.getVar("PROVIDES", e.data, True)
+ bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", e.data, False) + ":virtclass-nativesdk", e.data)
+}
+
+python () {
+ pn = bb.data.getVar("PN", d, True)
+ if not pn.endswith("-nativesdk"):
+ return
+
+ def map_dependencies(varname, d, suffix = ""):
+ if suffix:
+ varname = varname + "_" + suffix
+ deps = bb.data.getVar(varname, d, True)
+ if not deps:
+ return
+ deps = bb.utils.explode_deps(deps)
+ newdeps = []
+ for dep in deps:
+ if dep.endswith("-native") or dep.endswith("-cross"):
+ newdeps.append(dep)
+ elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc") or dep.endswith("-g++"):
+ newdeps.append(dep + "-crosssdk")
+ elif not dep.endswith("-nativesdk"):
+ newdeps.append(dep.replace("-nativesdk", "") + "-nativesdk")
+ else:
+ newdeps.append(dep)
+ bb.data.setVar(varname, " ".join(newdeps), d)
+
+ map_dependencies("DEPENDS", d)
+ #for pkg in (d.getVar("PACKAGES", True).split() + [""]):
+ # map_dependencies("RDEPENDS", d, pkg)
+ # map_dependencies("RRECOMMENDS", d, pkg)
+ # map_dependencies("RSUGGESTS", d, pkg)
+ # map_dependencies("RPROVIDES", d, pkg)
+ # map_dependencies("RREPLACES", d, pkg)
+
+ provides = bb.data.getVar("PROVIDES", d, True)
for prov in provides.split():
if prov.find(pn) != -1:
continue
if not prov.endswith("-nativesdk"):
provides = provides.replace(prov, prov + "-nativesdk")
- bb.data.setVar("PROVIDES", provides, e.data)
- bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", e.data, False) + ":virtclass-nativesdk", e.data)
+ bb.data.setVar("PROVIDES", provides, d)
}
addhandler nativesdk_virtclass_handler
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 50/51] autoconf/automake: Bump PR to resolve perl-native issue
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (47 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 48/51] nativesdk.bbclass: Correct ordering of manipulations Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 51/51] runqemu: take TMPDIR from bitbake Saul Wold
2011-06-14 12:30 ` [CONSOLIDATED PULL 00/51] 14-June-2011 Richard Purdie
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/autoconf/autoconf_2.68.bb | 2 +-
meta/recipes-devtools/automake/automake.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index c647a15..638e677 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
require autoconf.inc
-PR = "r0"
+PR = "r1"
PARALLEL_MAKE = ""
diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index 524e93e..beeec7b 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
LICENSE = "GPLv2"
HOMEPAGE = "http://www.gnu.org/software/automake/"
SECTION = "devel"
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [CONSOLIDATED PULL 51/51] runqemu: take TMPDIR from bitbake
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (48 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 50/51] autoconf/automake: Bump PR to resolve perl-native issue Saul Wold
@ 2011-06-14 8:01 ` Saul Wold
2011-06-14 12:30 ` [CONSOLIDATED PULL 00/51] 14-June-2011 Richard Purdie
50 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 8:01 UTC (permalink / raw)
To: openembedded-core
From: Anders Darander <anders@chargestorm.se>
The old standard of using /home/anders/openembedded-core/build/tmp as TMPDIR do not work any longer,
as - is appended to the real TMPDIR. Thus, always take TMPDIR from
bitbake, unless TMPDIR is set in the environment.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
scripts/runqemu | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index a09362c..aa44070 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -262,20 +262,16 @@ SPITZ_DEFAULT_ROOTFS="core-image-sato"
setup_tmpdir() {
if [ -z "$TMPDIR" ]; then
- if [ "x$BUILDDIR" = "x" -o ! -d "$BUILDDIR/tmp" ]; then
- # BUILDDIR unset, try and get TMPDIR from bitbake
- type -P bitbake &>/dev/null || {
- echo "In order for this script to dynamically infer paths";
- echo "to kernels or filesystem images, you either need";
- echo "bitbake in your PATH or to source oe-init-build-env";
- echo "before running this script" >&2;
- exit 1; }
-
- # We have bitbake in PATH, get TMPDIR from bitbake
- TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
- else
- TMPDIR=$BUILDDIR/tmp
- fi
+ # BUILDDIR unset, try and get TMPDIR from bitbake
+ type -P bitbake &>/dev/null || {
+ echo "In order for this script to dynamically infer paths";
+ echo "to kernels or filesystem images, you either need";
+ echo "bitbake in your PATH or to source oe-init-build-env";
+ echo "before running this script" >&2;
+ exit 1; }
+
+ # We have bitbake in PATH, get TMPDIR from bitbake
+ TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2`
fi
}
--
1.7.3.4
^ permalink raw reply related [flat|nested] 55+ messages in thread
* Re: [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums
2011-06-14 8:01 ` [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums Saul Wold
@ 2011-06-14 9:31 ` Phil Blundell
2011-06-14 14:51 ` Saul Wold
0 siblings, 1 reply; 55+ messages in thread
From: Phil Blundell @ 2011-06-14 9:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-06-14 at 01:01 -0700, Saul Wold wrote:
> +EXTRA_OEFLAGS = "--host ${HOST_SYS}"
This change isn't mentioned in the checkin comment and, as far as I can
tell, setting that variable isn't going to produce any useful effect.
Can you clarify what's going on here?
p.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [CONSOLIDATED PULL 00/51] 14-June-2011
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
` (49 preceding siblings ...)
2011-06-14 8:01 ` [CONSOLIDATED PULL 51/51] runqemu: take TMPDIR from bitbake Saul Wold
@ 2011-06-14 12:30 ` Richard Purdie
2011-06-14 12:57 ` Koen Kooi
50 siblings, 1 reply; 55+ messages in thread
From: Richard Purdie @ 2011-06-14 12:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Saul,
I did a merge of the "easy" ones in this series. There are some I've
left pending a little further review or feedback.
On Tue, 2011-06-14 at 01:01 -0700, Saul Wold wrote:
> This has number fixes for various issues along with recipe updates.
> While the autobuidler does not look so great, these have built on local
> machines in a cleaner environment.
>
> I removed the large patchset for GCC, it can be reviewed at the browse
> URL below
I merged these with the exception of:
> Kang Kai (2):
> eglibc: migrate configurability from oe
I wanted to read through this one again...
> Khem Raj (6):
> uclibc.inc: libsegfault is only RPROVIDED by uclibc
I'm not 100% sure this is a good idea for various reasons, I need to
reply about ti.
> gcc-4.6.0: Bring in patches from FSF 4.6 branch
I suspect using gcc svn might be better at this point so we might as
well skip merging this and switch straight over.
>
> Koen Kooi (2):
> qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them
This needs more discussion as it forces users to build two image types
and I'm not sure that every user will appreciate this.
> Phil Blundell (5):
> busybox: backport distro-features handling from oe master
I also wanted to read through this one again...
> Saul Wold (8):
> json-glib: Fix up SRC_URI Checksums
This patch looks like a whitespace change only?
> alsa-tools: fix Checksums
This patch has something which looks unintended.
Cheers,
Richard
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [CONSOLIDATED PULL 00/51] 14-June-2011
2011-06-14 12:30 ` [CONSOLIDATED PULL 00/51] 14-June-2011 Richard Purdie
@ 2011-06-14 12:57 ` Koen Kooi
0 siblings, 0 replies; 55+ messages in thread
From: Koen Kooi @ 2011-06-14 12:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 14 jun 2011, om 14:30 heeft Richard Purdie het volgende geschreven:
> Koen Kooi (2):
>> qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them
>
> This needs more discussion as it forces users to build two image types
> and I'm not sure that every user will appreciate this.
If they don't set IMAGE_FSTYPES they'll get 2 images already.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums
2011-06-14 9:31 ` Phil Blundell
@ 2011-06-14 14:51 ` Saul Wold
0 siblings, 0 replies; 55+ messages in thread
From: Saul Wold @ 2011-06-14 14:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 06/14/2011 02:31 AM, Phil Blundell wrote:
> On Tue, 2011-06-14 at 01:01 -0700, Saul Wold wrote:
>> +EXTRA_OEFLAGS = "--host ${HOST_SYS}"
>
> This change isn't mentioned in the checkin comment and, as far as I can
> tell, setting that variable isn't going to produce any useful effect.
> Can you clarify what's going on here?
>
Clarification is too much going on and I missed fixing this during a
rebase. I was in the middle of trying to fix this recipe (currently
does not configure correctly).
Sau!
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 55+ messages in thread
end of thread, other threads:[~2011-06-14 14:55 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-14 8:01 [CONSOLIDATED PULL 00/51] 14-June-2011 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 01/51] ghostscript: update SRC_URI Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 02/51] busybox: backport distro-features handling from oe master Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 03/51] git: restore the dependency on perl-native Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 04/51] uclibc: fix compile error on i586 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 05/51] import recipe_sanity.bbclass from oe master Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 06/51] json-glib: Fix up SRC_URI Checksums Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 07/51] linux-yocto: rename recipes to explicitly indicate version Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 08/51] perl-native: fix download url Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 09/51] clutter-box2d_git: Switch SRC_URI to git.gnome.org Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 10/51] util-macros_1.13.0.bb: Depend on virtual/gettext instead of gettext Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 11/51] uclibc.inc: libsegfault is only RPROVIDED by uclibc Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 12/51] gettext_0.18.1.1.bb: Fix build on uclibc Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 13/51] uclibc: Cleanup the machine dependent config files Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 14/51] uclibc: remove redundant python code Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 15/51] uclibc: remove PACKAGE_ARCH Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 16/51] qemu.inc: append to IMAGE_FSTYPES instead of weakly assigning them Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 17/51] connman-gnome 0.5: build from git Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 18/51] update-alternatives-dpkg: Fix SRC_URI Checksum Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 19/51] jsib-glib: " Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 20/51] rxvt-unicode: Fix SRC_URI & LIC_FILES Checksum Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 21/51] alsa-tools: fix Checksums Saul Wold
2011-06-14 9:31 ` Phil Blundell
2011-06-14 14:51 ` Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 22/51] libx11-diet: Fixed checksum and rebase patch Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 23/51] eglibc 2.12/2.13: Upgrade SRCREV Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 24/51] eglibc: migrate configurability from oe Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 25/51] tcmode-default: fix PREFERRED_VERSION_gcc-cross-canadian Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 26/51] recipes: update Upstream-Status for multiple recipes' patches Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 27/51] gnome-doc-utils: upgrade from 0.20.5 to the latest version 0.20.6 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 28/51] startup-notification: upgrade from 0.10 to the latest version 0.12 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 29/51] util-macros: upgrade from 1.13.0 to the latest version 0.14.0 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 30/51] resourceproto: upgrade from 1.1.1 to the latest version 1.2.0 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 31/51] dri2proto: upgrade from 2.3 to the latest version 2.4 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 32/51] glproto: upgrade from 1.4.12 to the latest version 1.4.13 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 33/51] inputproto: upgrade from 2.0.1 to the latest version 2.0.2 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 34/51] pixman: upgrade from 0.20.2 to the latest stable 0.22.0 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 35/51] libxext: upgrade from 1.2.0 to the latest version 1.3.0 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 36/51] libxi: upgrade from 1.4.2 to the latest version 1.4.3 Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 37/51] distro_tracking_fields.inc: update the info for the following recipes Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 38/51] pointercal: Inhibit toolchain dependencies as its just config files Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 39/51] formfactor: " Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 40/51] keymaps: Inhibit toolchain dependencies as its just configuration files Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 41/51] usbinit: Inherit allarch as its a generic script Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 42/51] base-files: Inherit toolchain dependencies as a compiler isn't used Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 43/51] poky-feed-opkg: Disable default toolchain dependencies as these are just configuration files Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 44/51] initscripts: makedevs is no longer used anywhere so drop dependency. Also inhibit compiler/libc dependencies as they're unused Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 45/51] sysvinit-inittab: Inhibit compiler/libc dependencies as this is just a configuration file Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 46/51] initrdscripts: " Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 47/51] task-sdk-host: Add nativesdk to the task name so its clearer what the contents of the task represent Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 48/51] nativesdk.bbclass: Correct ordering of manipulations Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 50/51] autoconf/automake: Bump PR to resolve perl-native issue Saul Wold
2011-06-14 8:01 ` [CONSOLIDATED PULL 51/51] runqemu: take TMPDIR from bitbake Saul Wold
2011-06-14 12:30 ` [CONSOLIDATED PULL 00/51] 14-June-2011 Richard Purdie
2011-06-14 12:57 ` Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox