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

florian commit openembedded-commits at lists.openembedded.org
Tue Jan 15 16:17:55 UTC 2008 

merge of '1f9075ae3f232cc2e5b6024d908c97361fa4cd82'
     and '8996304d45d20965f75c306e6317a0238f26fbf7'

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 39f8c0faee1780e683399b25e5ca28f88f9e83ab
ViewMTN: http://monotone.openembedded.org/revision/info/39f8c0faee1780e683399b25e5ca28f88f9e83ab
Files:
1
packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb
classes/module-base.bbclass
classes/module.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/openmoko.conf
packages/tasks/task-openmoko-feed.bb
packages/gpephone/libiac2
packages/gpephone/libim2
packages/gpephone/almmgrd_svn.bb
packages/gpephone/calendar2_svn.bb
packages/gpephone/dialer_svn.bb
packages/gpephone/libalmmgr_svn.bb
packages/gpephone/libgemwidget_svn.bb
packages/gpephone/libiac2/disable-tests.patch
packages/gpephone/libiac2_svn.bb
packages/gpephone/libiac_svn.bb
packages/gpephone/libim2/disable-tests.patch
packages/gpephone/libim2_svn.bb
packages/gpephone/liblipsevent2_svn.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/gpephone/libmsgenabler_svn.bb
packages/gpephone/addressbook_svn.bb
packages/gpephone/contact_svn.bb
packages/gpephone/firewall_svn.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libabenabler_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libmsgenabler_1.0.bb
packages/gpephone/librecord2_svn.bb
packages/gpephone/libsettings_svn.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-headers_svn.bb
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/gpephone/quickdial_svn.bb
packages/gpephone/useen_svn.bb
Diffs:

#
# mt diff -r1f9075ae3f232cc2e5b6024d908c97361fa4cd82 -r39f8c0faee1780e683399b25e5ca28f88f9e83ab
#
# 
# 
# add_file "packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb"
#  content [9b2a2354c222d9e3a4068950e45a4445d31981c9]
# 
# patch "classes/module-base.bbclass"
#  from [d364b8e27548112f9d1fce0e4a6a6905d955fe4f]
#    to [542662416cb5cc52f033c9b773e388e9c54ad891]
# 
# patch "classes/module.bbclass"
#  from [04ebb27c817750a39f3c15612ebc60e9fad68bc8]
#    to [6534a9ab951349893220f85fb9b4760000b8b2de]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [e9d69ef671e762d41a8626f692a75ada0753c7d4]
#    to [aa578df0dc91a178786a5d3c808aa37f370e60f9]
# 
# patch "conf/distro/openmoko.conf"
#  from [bb73329f13f5df86594c09adb3e58552511e268f]
#    to [0faa207a22693f2ef2ed13e12ce53f250340b63f]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [9461263af6f125afb45a029174fca08703d76041]
#    to [02d92dbdbb6c58dd3e7f980dd5aeda1082357007]
# 
============================================================
--- packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb	9b2a2354c222d9e3a4068950e45a4445d31981c9
+++ packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb	9b2a2354c222d9e3a4068950e45a4445d31981c9
@@ -0,0 +1,59 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+VANILLA_VERSION = "2.6.23"
+KERNEL_RELEASE = "2.6.24-rc7"
+
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+# If you use a rc, you will need to use this:
+PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
+PR = "r0"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
+
+##############################################################
+# source and patches
+#
+SRCREV_FORMAT = "patches-rconfig"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.24-rc7 \
+           svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \
+           svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config "
+
+S = "${WORKDIR}/git"
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+FILES_kernel-image = ""
+ALLOW_EMPTY = "1"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02'
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+###############################################################
+# module configs specific to this kernel
+#
+
+# usb
+module_autoload_ohci-hcd = "ohci-hcd"
+module_autoload_hci_usb = "hci_usb"
+module_autoload_g_ether = "g_ether"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
+
+do_prepatch() {
+        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+        mv patches patches.openmoko
+        mv .pc .pc.old
+        mv ${WORKDIR}/config/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig
+}
+
+addtask prepatch after do_unpack before do_patch
============================================================
--- classes/module-base.bbclass	d364b8e27548112f9d1fce0e4a6a6905d955fe4f
+++ classes/module-base.bbclass	542662416cb5cc52f033c9b773e388e9c54ad891
@@ -10,6 +10,7 @@ KERNEL_LDSUFFIX = "${@base_read_file('${
 KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}"
 KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
 KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
+KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"
 
 # Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
 # specific options necessary for building the kernel and modules.
@@ -17,9 +18,12 @@ HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERN
 HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
 TARGET_LD_KERNEL_ARCH ?= ""
 HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
+TARGET_AR_KERNEL_ARCH ?= ""
+HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
 
 KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}"
 KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
+KERNEL_AR = "${AR}${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH}"
 
 # kernel modules are generally machine specific
 PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- classes/module.bbclass	04ebb27c817750a39f3c15612ebc60e9fad68bc8
+++ classes/module.bbclass	6534a9ab951349893220f85fb9b4760000b8b2de
@@ -9,7 +9,8 @@ module_do_compile() {
 		   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
 		   KERNEL_VERSION=${KERNEL_VERSION}    \
 		   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-		   ${MAKE_TARGETS}
+		   AR="${KERNEL_AR}" \
+                   ${MAKE_TARGETS}
 }
 
 module_do_install() {
============================================================
--- conf/distro/angstrom-2008.1.conf	e9d69ef671e762d41a8626f692a75ada0753c7d4
+++ conf/distro/angstrom-2008.1.conf	aa578df0dc91a178786a5d3c808aa37f370e60f9
@@ -87,16 +87,44 @@ PREFERRED_PROVIDER_xserver          ?= "
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
+#powerpc needs additional patches to gcc
+PREFERRED_VERSION_gcc_dht-walnut               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_dht-walnut         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_dht-walnut     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_xilinx-ml403               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_xilinx-ml403         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_mpc8323e-rdb               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_mpc8323e-rdb         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
+
 PREFERRED_VERSION_gcc               ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross-sdk     ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
 
+
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_VERSION_gcc_avr32               = "4.1.2"
+PREFERRED_VERSION_gcc-cross_avr32         = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2"
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
 
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
============================================================
--- conf/distro/openmoko.conf	bb73329f13f5df86594c09adb3e58552511e268f
+++ conf/distro/openmoko.conf	0faa207a22693f2ef2ed13e12ce53f250340b63f
@@ -48,6 +48,8 @@ PACKAGE_ARCH_pn-linux-openmoko_fic-gta02
 # Same kernel runs on both these machines
 PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}"
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}"
============================================================
--- packages/tasks/task-openmoko-feed.bb	9461263af6f125afb45a029174fca08703d76041
+++ packages/tasks/task-openmoko-feed.bb	02d92dbdbb6c58dd3e7f980dd5aeda1082357007
@@ -9,7 +9,7 @@ RDEPENDS_task-openmoko-feed = "\
   aspell enchant \
   bluez-hcidump \
   bootchart \
-  eet evas ecore embryo epsilon edje efreet emotion epdf \
+  eet evas ecore embryo epsilon edje efreet emotion \
   exhibit edje-viewer \
   free42-vga \
   gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \


#
# mt diff -r8996304d45d20965f75c306e6317a0238f26fbf7 -r39f8c0faee1780e683399b25e5ca28f88f9e83ab
#
# 
# 
# add_dir "packages/gpephone/libiac2"
# 
# add_dir "packages/gpephone/libim2"
# 
# add_file "packages/gpephone/almmgrd_svn.bb"
#  content [25c7f68d4e9e07ed59265a1f275da3696532163b]
# 
# add_file "packages/gpephone/calendar2_svn.bb"
#  content [82196f61eca7b47d785a964144a279c6acdfd001]
# 
# add_file "packages/gpephone/dialer_svn.bb"
#  content [98dc9faf7118c94be8d57048d92db391f716a290]
# 
# add_file "packages/gpephone/libalmmgr_svn.bb"
#  content [f89397c2a6549797eec60645fcb0f1f141ce941c]
# 
# add_file "packages/gpephone/libgemwidget_svn.bb"
#  content [3e0c2912b00d90e5873a3782d885e3934046f433]
# 
# add_file "packages/gpephone/libiac2/disable-tests.patch"
#  content [efd8947a1d613f17903217fc9db1d3a5116bce60]
# 
# add_file "packages/gpephone/libiac2_svn.bb"
#  content [f7478f731cfbefa2721b6995c1c57629826efab6]
# 
# add_file "packages/gpephone/libiac_svn.bb"
#  content [7cc7ff46bb9359e3883a4f9c0c15fb232157d69e]
# 
# add_file "packages/gpephone/libim2/disable-tests.patch"
#  content [0df0f232ed225a157ef20cfc949862fe4028f296]
# 
# add_file "packages/gpephone/libim2_svn.bb"
#  content [19f2ddb013683120a735b58a3dd67387d006147f]
# 
# add_file "packages/gpephone/liblipsevent2_svn.bb"
#  content [9168c8ec313ad837ae2d7b4896b4314aa79e3673]
# 
# add_file "packages/gpephone/libmsgenabler2_svn.bb"
#  content [54a29d568f999ecbd83b1ce249da584fbcec85f3]
# 
# add_file "packages/gpephone/libmsgenabler_svn.bb"
#  content [c0e9d7dafdbb5d413c2e8addd95c5d0f4a9ed5a9]
# 
# patch "packages/gpephone/addressbook_svn.bb"
#  from [109115b4d8175a5c26d96375484eac86020f1fc3]
#    to [2f736f148a7f8733f862502f7ea15dc9a7818a00]
# 
# patch "packages/gpephone/contact_svn.bb"
#  from [2bdcfd37fa7331f354b090527f502870cee6fea5]
#    to [7972b2952ee56c26a4f9768c0d579d27d14c9b1f]
# 
# patch "packages/gpephone/firewall_svn.bb"
#  from [707e5f62435c7c0130c795babdbe705aced3f0e8]
#    to [2d0b3255aeb70f0b2d0c7b4926484b4954ed2372]
# 
# patch "packages/gpephone/gpe-applauncher_svn.bb"
#  from [4d20c813ad46630580e0ffc689c3794f8154fff7]
#    to [6440fe8aa26c874ff5b0ef8ba11e739418a62743]
# 
# patch "packages/gpephone/libabenabler2_svn.bb"
#  from [6cedd4eaaae17335f9912cbdd4124a86765aae34]
#    to [22f1cd9eeaa95300a79ed51b8b2a097c6567a0d4]
# 
# patch "packages/gpephone/libabenabler_svn.bb"
#  from [8fbbb2915a10d96ef59cee640bc880d3fba234cb]
#    to [cb7b0bf422e58f8c25ab31340031100f7fcd894d]
# 
# patch "packages/gpephone/libcalenabler2_svn.bb"
#  from [ca595393866e1e0b2240421e240db9ddbefbedff]
#    to [5b6055aa245611a73721654f2dd87047930cbb27]
# 
# patch "packages/gpephone/libmsgenabler_1.0.bb"
#  from [10f73c41814056d4275d16b2685ca899455ef739]
#    to [71441c3a8ea417a1e08ecae7245f9d759c690c3c]
# 
# patch "packages/gpephone/librecord2_svn.bb"
#  from [b437eb625142c9037b79657bf84ba5305ae560e2]
#    to [d22430f9f2e594e66730d1beb973b3690d08702d]
# 
# patch "packages/gpephone/libsettings_svn.bb"
#  from [3ec47b4c7f7282f6b14237e73d2fc1fec4ec2701]
#    to [b0e07271b04905ad3a3458893e93c4b54635fbe3]
# 
# patch "packages/gpephone/machined_svn.bb"
#  from [b1aa2bc7c8b777a29ced8ae606722efa408e1301]
#    to [7e9b0c026c20bc06b7096008d90923bd86524633]
# 
# patch "packages/gpephone/ptim-engine_svn.bb"
#  from [ef51d9a661f2eb0e31b90b646ef0763265f8e070]
#    to [3cbbae29d72d3c01316172678ad3f68817878123]
# 
# patch "packages/gpephone/ptim-headers_svn.bb"
#  from [f87f52cf9dd3b0fbbcd93b9dc26924797234e78b]
#    to [ad9799e1762c1048057c6521901d7c0ca0285b24]
# 
# patch "packages/gpephone/ptim-helper_svn.bb"
#  from [513ccb848c66db512ec88c73d15970eb5210a843]
#    to [aa8aaf8204bc0e79b11602028b16ba56764f4c29]
# 
# patch "packages/gpephone/ptim-manager_svn.bb"
#  from [e0ddcec53b318d7b7301948e99d5a260791f538f]
#    to [52d2b87ce5e5642e3f2f11f97e4e11b64ef8af70]
# 
# patch "packages/gpephone/quickdial_svn.bb"
#  from [5a7854af3e370761f2adf68476bdf0c2eea3e7d1]
#    to [65c4c197535acedd5ba6cfdfc84531ed2906f358]
# 
# patch "packages/gpephone/useen_svn.bb"
#  from [df6794b692b6307ab4efda6349b60b4a0680e420]
#    to [c877d081287cc4561ce042aa75ea9d9a610103b3]
# 
============================================================
--- packages/gpephone/almmgrd_svn.bb	25c7f68d4e9e07ed59265a1f275da3696532163b
+++ packages/gpephone/almmgrd_svn.bb	25c7f68d4e9e07ed59265a1f275da3696532163b
@@ -0,0 +1,15 @@
+DESCRIPTION = "Alarm manager daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 libiac sqlite3 libcalenabler2 libalmmgr"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
============================================================
--- packages/gpephone/calendar2_svn.bb	82196f61eca7b47d785a964144a279c6acdfd001
+++ packages/gpephone/calendar2_svn.bb	82196f61eca7b47d785a964144a279c6acdfd001
@@ -0,0 +1,16 @@
+DESCRIPTION = "Calendar application for GPE Phone Edition"
+LICENSE     = "LiPS"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 libiac"
+
+inherit gpephone autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+FILES_${PN} += "${datadir}/database ${datadir}/res"
============================================================
--- packages/gpephone/dialer_svn.bb	98dc9faf7118c94be8d57048d92db391f716a290
+++ packages/gpephone/dialer_svn.bb	98dc9faf7118c94be8d57048d92db391f716a290
@@ -0,0 +1,20 @@
+DESCRIPTION = "GPE Phone Edition phone dialer"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ libgpephone libgemwidget"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone autotools
+
+SRC_URI = ${GPEPHONE_SVN}
+
+EXTRA_OECONF = "--disable-hiker"
+
+S = "${WORKDIR}/${PN}"
+
+
+FILES_${PN} += "${datadir}"
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libalmmgr_svn.bb	f89397c2a6549797eec60645fcb0f1f141ce941c
+++ packages/gpephone/libalmmgr_svn.bb	f89397c2a6549797eec60645fcb0f1f141ce941c
@@ -0,0 +1,17 @@
+DESCRIPTION = "LiPS alarm framework library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 libiac"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+        autotools_stage_all
+}
============================================================
--- packages/gpephone/libgemwidget_svn.bb	3e0c2912b00d90e5873a3782d885e3934046f433
+++ packages/gpephone/libgemwidget_svn.bb	3e0c2912b00d90e5873a3782d885e3934046f433
@@ -0,0 +1,19 @@
+DESCRIPTION = "Extended widget library for GPE phone environment."
+LICENSE     = "LiPS"
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget"
+PV = "1.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+FILES_${PN} += "${datadir}/gem"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/libiac2/disable-tests.patch	efd8947a1d613f17903217fc9db1d3a5116bce60
+++ packages/gpephone/libiac2/disable-tests.patch	efd8947a1d613f17903217fc9db1d3a5116bce60
@@ -0,0 +1,25 @@
+--- Makefile.am~	2008-01-10 17:43:18.000000000 +0100
++++ Makefile.am	2008-01-10 17:43:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS			= src include test po
++SUBDIRS			= src include po
+ 
+ if BUILD_DAEMON
+ SUBDIRS += daemon
+--- configure.ac~	2008-01-10 17:50:03.000000000 +0100
++++ configure.ac	2008-01-10 17:50:03.000000000 +0100
+@@ -40,14 +40,11 @@
+ AM_CONDITIONAL(BUILD_DAEMON,
+ 							 test x$enable_daemon = xyes)
+ 
+-AM_PATH_CUNIT
+-
+ AC_CONFIG_FILES([
+ Makefile
+ daemon/Makefile
+ src/Makefile
+ include/Makefile
+-test/Makefile
+ po/Makefile.in
+ libiac2.pc
+ ])
============================================================
--- packages/gpephone/libiac2_svn.bb	f7478f731cfbefa2721b6995c1c57629826efab6
+++ packages/gpephone/libiac2_svn.bb	f7478f731cfbefa2721b6995c1c57629826efab6
@@ -0,0 +1,20 @@
+DESCRIPTION = "LiPS IPC library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ gtk-doc dbus-glib"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN} \
+           file://disable-tests.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--enable-gui --enable-test=no  --with-cuint=no"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+        autotools_stage_all
+}
============================================================
--- packages/gpephone/libiac_svn.bb	7cc7ff46bb9359e3883a4f9c0c15fb232157d69e
+++ packages/gpephone/libiac_svn.bb	7cc7ff46bb9359e3883a4f9c0c15fb232157d69e
@@ -0,0 +1,17 @@
+DESCRIPTION = "LiPS IPC library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ gtk-doc"
+PV = "1.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+        autotools_stage_all
+}
============================================================
--- packages/gpephone/libim2/disable-tests.patch	0df0f232ed225a157ef20cfc949862fe4028f296
+++ packages/gpephone/libim2/disable-tests.patch	0df0f232ed225a157ef20cfc949862fe4028f296
@@ -0,0 +1,11 @@
+--- libim2/Makefile.am~	2008-01-12 01:24:42.000000000 +0100
++++ libim2/Makefile.am	2008-01-12 01:24:42.000000000 +0100
+@@ -2,7 +2,7 @@
+ # have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign 1.4
+ 
+-SUBDIRS = src include test
++SUBDIRS = src include
+ 
+ #servicesdir = @DBUS_SERVICES_DIR@
+ #services_DATA = improxy.service
============================================================
--- packages/gpephone/libim2_svn.bb	19f2ddb013683120a735b58a3dd67387d006147f
+++ packages/gpephone/libim2_svn.bb	19f2ddb013683120a735b58a3dd67387d006147f
@@ -0,0 +1,22 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "LiPS instant messenger library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 librecord2 libabenabler2 liblipsevent2 telepathy-glib telepathy-mission-control"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN} \
+           file://disable-tests.patch;patch=1"
+
+EXTRA_OECONF = "--enable-test=no"
+
+S = ${WORKDIR}/libim2
+
+FILES_${PN} += " ${datadir}/dbus-1"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/liblipsevent2_svn.bb	9168c8ec313ad837ae2d7b4896b4314aa79e3673
+++ packages/gpephone/liblipsevent2_svn.bb	9168c8ec313ad837ae2d7b4896b4314aa79e3673
@@ -0,0 +1,17 @@
+DESCRIPTION = "LiPS event model library."
+LICENSE     = "LiPS"
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/libmsgenabler2_svn.bb	54a29d568f999ecbd83b1ce249da584fbcec85f3
+++ packages/gpephone/libmsgenabler2_svn.bb	54a29d568f999ecbd83b1ce249da584fbcec85f3
@@ -0,0 +1,21 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS message backend library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+FILES_${PN} += "$(datadir)/libmsgenabler2"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/libmsgenabler_svn.bb	c0e9d7dafdbb5d413c2e8addd95c5d0f4a9ed5a9
+++ packages/gpephone/libmsgenabler_svn.bb	c0e9d7dafdbb5d413c2e8addd95c5d0f4a9ed5a9
@@ -0,0 +1,21 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS message backend library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
+PV = "1.0+svnr-${SRCREV}"
+PR          = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+FILES_${PN} += "$(datadir)/libmsgenabler"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gpephone/addressbook_svn.bb	109115b4d8175a5c26d96375484eac86020f1fc3
+++ packages/gpephone/addressbook_svn.bb	2f736f148a7f8733f862502f7ea15dc9a7818a00
@@ -1,9 +1,9 @@ PR          = "r0"
 LICENSE     = "LiPS"
 DESCRIPTION = "LiPS address book"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/gpephone/contact_svn.bb	2bdcfd37fa7331f354b090527f502870cee6fea5
+++ packages/gpephone/contact_svn.bb	7972b2952ee56c26a4f9768c0d579d27d14c9b1f
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ libgpephone dbus-glib li
 DESCRIPTION = "G(PE)^2 address book v2"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
-PV = "0.0+svn-${SRCREV}"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 inherit gpephone autotools
============================================================
--- packages/gpephone/firewall_svn.bb	707e5f62435c7c0130c795babdbe705aced3f0e8
+++ packages/gpephone/firewall_svn.bb	2d0b3255aeb70f0b2d0c7b4926484b4954ed2372
@@ -5,8 +5,6 @@ PV = "0.0+svnr-${SRCREV}"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1400"
-
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus"
============================================================
--- packages/gpephone/gpe-applauncher_svn.bb	4d20c813ad46630580e0ffc689c3794f8154fff7
+++ packages/gpephone/gpe-applauncher_svn.bb	6440fe8aa26c874ff5b0ef8ba11e739418a62743
@@ -1,9 +1,9 @@ PR          = "r1"
 LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r1"
-PV          = "0.11+svn-${SRCREV}"
+PV          = "0.11+svnr-${SRCREV}"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libabenabler2_svn.bb	6cedd4eaaae17335f9912cbdd4124a86765aae34
+++ packages/gpephone/libabenabler2_svn.bb	22f1cd9eeaa95300a79ed51b8b2a097c6567a0d4
@@ -1,17 +1,17 @@ DEPENDS = "glib-2.0 librecord2 gconf sql
 DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
+inherit gpephone pkgconfig autotools
+
 SRC_URI = "${GPEPHONE_SVN}"
 
 S = "${WORKDIR}/${PN}"
 
-inherit gpephone pkgconfig autotools
-
 do_stage () {
         autotools_stage_all
 }
============================================================
--- packages/gpephone/libabenabler_svn.bb	8fbbb2915a10d96ef59cee640bc880d3fba234cb
+++ packages/gpephone/libabenabler_svn.bb	cb7b0bf422e58f8c25ab31340031100f7fcd894d
@@ -1,10 +1,10 @@ PR          = "r0"
 LICENSE     = "LGPL"
 DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/gpephone/libcalenabler2_svn.bb	ca595393866e1e0b2240421e240db9ddbefbedff
+++ packages/gpephone/libcalenabler2_svn.bb	5b6055aa245611a73721654f2dd87047930cbb27
@@ -1,18 +1,17 @@ LICENSE = "LiPS"
 DESCRIPTION = "LiPS calendar API."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LiPS"
-DEPENDS = "glib-2.0 sqlite3 libical"
-PV = "0.0+svn-${SRCREV}"
+DEPENDS = "glib-2.0 sqlite3 libical libalmmgr"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
-SRC_URI = "${GPEPHONE_SVN}"
 
-S = "${WORKDIR}/${PN}"
+inherit gpephone pkgconfig autotools
 
-GPE_TARBALL_%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list