[oe-commits] org.oe.dev merge of 'a36e23769513e1d9865ab5c60bcf73693b58581d'
hrw commit
openembedded-commits at lists.openembedded.org
Fri Sep 14 13:09:24 UTC 2007
merge of 'a36e23769513e1d9865ab5c60bcf73693b58581d'
and 'd92d2182662331d76f656089956e624ac7c79230'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: ff93f7e40e9fc3da38670350ec577163c35d8b7c
ViewMTN: http://monotone.openembedded.org/revision/info/ff93f7e40e9fc3da38670350ec577163c35d8b7c
Files:
1
conf/machine/include/tune-geodelx.conf
conf/distro/include/moko-autorev.inc
conf/machine/alix.conf
packages/free42
packages/free42/files
packages/gsm/files/fic-gta01
packages/free42/files/free42-bcd-gtk-only.patch
packages/free42/files/free42-dont-declare-sincos.patch
packages/free42/files/free42-vga-skin.patch
packages/free42/files/free42dec.desktop
packages/free42/free42-vga_1.4.36.bb
packages/gsm/files/fic-gta01/gsmd
conf/distro/include/insane-srcrevs.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/gnome/gconf-dbus_svn.bb
packages/gsm/libgsmd_svn.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux-omap.inc
packages/linux/linux_2.6.21.bb
packages/tasks/task-openmoko-feed.bb
Diffs:
#
# mt diff -ra36e23769513e1d9865ab5c60bcf73693b58581d -rff93f7e40e9fc3da38670350ec577163c35d8b7c
#
#
#
# add_file "conf/machine/include/tune-geodelx.conf"
# content [cb790563e96dcb829b7dd845a47129b0bd6255fe]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [72eda7924347374e0ab868c3b35454bafd3d93d0]
# to [5709f08bc2fb571ee70795901ea2c48568d7653a]
#
# patch "conf/machine/alix.conf"
# from [6ac777208694aa9b00784052d5baca787f429532]
# to [f8fdaa68a61adeffcb530a174e2e182280770dd5]
#
============================================================
--- conf/machine/include/tune-geodelx.conf cb790563e96dcb829b7dd845a47129b0bd6255fe
+++ conf/machine/include/tune-geodelx.conf cb790563e96dcb829b7dd845a47129b0bd6255fe
@@ -0,0 +1,6 @@
+# Geode CPU has it's own target in GCC 4.3
+# in older versions k6-2 is closest
+#
+TARGET_CC_ARCH = "-march=k6-2"
+PACKAGE_ARCH = "geode"
+
============================================================
--- conf/distro/include/moko-autorev.inc 72eda7924347374e0ab868c3b35454bafd3d93d0
+++ conf/distro/include/moko-autorev.inc 5709f08bc2fb571ee70795901ea2c48568d7653a
@@ -1,3 +1,8 @@
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
============================================================
--- conf/machine/alix.conf 6ac777208694aa9b00784052d5baca787f429532
+++ conf/machine/alix.conf f8fdaa68a61adeffcb530a174e2e182280770dd5
@@ -5,9 +5,9 @@
# http://pcengines.ch/alix1c.htm
# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
-TARGET_ARCH = "i686"
+TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 geode"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -17,6 +17,8 @@ MACHINE_FEATURES = "kernel26 usbhost ext
MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+require conf/machine/include/tune-geodelx.conf
+
IMAGE_FSTYPES += "tar.gz"
MACHINE_EXTRA_RRECOMMENDS = "\
#
# mt diff -rd92d2182662331d76f656089956e624ac7c79230 -rff93f7e40e9fc3da38670350ec577163c35d8b7c
#
#
#
# add_dir "packages/free42"
#
# add_dir "packages/free42/files"
#
# add_dir "packages/gsm/files/fic-gta01"
#
# add_file "packages/free42/files/free42-bcd-gtk-only.patch"
# content [5e700cd97adced79c681f2aa6e9bd8e4f89ff895]
#
# add_file "packages/free42/files/free42-dont-declare-sincos.patch"
# content [5e18862aa104d378555e3795e0d218cabe753e80]
#
# add_file "packages/free42/files/free42-vga-skin.patch"
# content [303f7bc3ae4924f88ea2694a9a1156f4f783bc97]
#
# add_file "packages/free42/files/free42dec.desktop"
# content [e1163c16c574864f887fa6786337cf60c2da4fac]
#
# add_file "packages/free42/free42-vga_1.4.36.bb"
# content [affee0392f2e9a5336abf00c6e4fd71d74c796cc]
#
# add_file "packages/gsm/files/fic-gta01/gsmd"
# content [4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22]
#
# patch "conf/distro/include/insane-srcrevs.inc"
# from [7d43699e51596889a904a6311d3707ff7fefd7d4]
# to [63ea6dbb957d94e0f729963a34f021d69c8a2f5a]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [5496c2c028496f67b900d973c1b782fe821e93dc]
# to [5709f08bc2fb571ee70795901ea2c48568d7653a]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8276f0c6e69fdcf546e255dc1764c6d7c2d69326]
# to [35187a201ca64054e1de4f04f9215f5c24f88f54]
#
# patch "conf/distro/openmoko.conf"
# from [c246d427631dbd56b159221956899cc2f40f3b06]
# to [0a270926afec0c57fe65b21d888d50f318f58085]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [7e4571428d559265f6ede4b261cd8d23c16ad8b7]
# to [ac71d333e0e42e01c188b5c90a4374123f6b96b5]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [f40a2af6cf0a3f96d564ff62dd07830973d9154a]
# to [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [7108300d1b93ae19d191325a41b16ac125504bd7]
# to [6b749d9ef772b8e60588711e9d902b4292a7e84b]
#
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
# from [000a3c21d871acfac60d70faca4943121dc77e67]
# to [d30c1b6220264072c4381f7f1942780b702a3a01]
#
# patch "packages/linux/linux-omap.inc"
# from [2d2e1563073a9c9e272aca35faa2b007040acc6e]
# to [ddb0989b0eff634d3c86b2b86fc04e7c795ae8c1]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [27643b882eb2ef188e62836637b435c23a0cb9b6]
# to [d17402966b36edab990d122a0bdf917175c16bff]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [44daf5badff88f9c9cd129df8d27998b67606cb4]
# to [732cc2b15ee798ca00f5bf1855e650be36e08741]
#
============================================================
--- packages/free42/files/free42-bcd-gtk-only.patch 5e700cd97adced79c681f2aa6e9bd8e4f89ff895
+++ packages/free42/files/free42-bcd-gtk-only.patch 5e700cd97adced79c681f2aa6e9bd8e4f89ff895
@@ -0,0 +1,100 @@
+--- free42-orig/gtk/Makefile 2007-01-06 09:37:55.000000000 -0800
++++ free42gtk/gtk/Makefile 2007-09-02 23:54:34.000000000 -0700
+@@ -35,20 +35,14 @@
+ core_math2.o core_phloat.o core_sto_rcl.o core_tables.o \
+ core_variables.o
+
+-ifdef BCD_MATH
+ CXXFLAGS += -DBCD_MATH
+ SRCS += bcdfloat.cc bcd.cc bcdmath.cc
+ OBJS += bcdfloat.o bcd.o bcdmath.o
+ EXE = free42dec
+-else
+-EXE = free42bin
+-endif
+
+ $(EXE): $(OBJS)
+ $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+
+-$(SRCS): symlinks
+-
+ .cc.o:
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+@@ -64,74 +58,18 @@
+ keymap.cc: keymap2cc keymap.txt
+ ./keymap2cc
+
+-symlinks:
+- ln -s ../common/free42.h
+- ln -s ../common/core_commands1.cc
+- ln -s ../common/core_commands1.h
+- ln -s ../common/core_commands2.cc
+- ln -s ../common/core_commands2.h
+- ln -s ../common/core_commands3.cc
+- ln -s ../common/core_commands3.h
+- ln -s ../common/core_commands4.cc
+- ln -s ../common/core_commands4.h
+- ln -s ../common/core_commands5.cc
+- ln -s ../common/core_commands5.h
+- ln -s ../common/core_commands6.cc
+- ln -s ../common/core_commands6.h
+- ln -s ../common/core_display.cc
+- ln -s ../common/core_display.h
+- ln -s ../common/core_globals.cc
+- ln -s ../common/core_globals.h
+- ln -s ../common/core_helpers.cc
+- ln -s ../common/core_helpers.h
+- ln -s ../common/core_keydown.cc
+- ln -s ../common/core_keydown.h
+- ln -s ../common/core_linalg1.cc
+- ln -s ../common/core_linalg1.h
+- ln -s ../common/core_linalg2.cc
+- ln -s ../common/core_linalg2.h
+- ln -s ../common/core_math1.cc
+- ln -s ../common/core_math1.h
+- ln -s ../common/core_math2.cc
+- ln -s ../common/core_math2.h
+- ln -s ../common/core_main.cc
+- ln -s ../common/core_main.h
+- ln -s ../common/core_phloat.cc
+- ln -s ../common/core_phloat.h
+- ln -s ../common/core_sto_rcl.cc
+- ln -s ../common/core_sto_rcl.h
+- ln -s ../common/core_tables.cc
+- ln -s ../common/core_tables.h
+- ln -s ../common/core_variables.cc
+- ln -s ../common/core_variables.h
+- ln -s ../common/shell.h
+- ln -s ../common/shell_loadimage.cc
+- ln -s ../common/shell_loadimage.h
+- ln -s ../common/shell_spool.cc
+- ln -s ../common/shell_spool.h
+- ln -s ../common/skin2cc.cc
+- ln -s ../common/skin2cc.conf
+- ln -s ../common/keymap2cc.cc
+- ln -s ../common/bcd.cc
+- ln -s ../common/bcd.h
+- ln -s ../common/bcdfloat.cc
+- ln -s ../common/bcdfloat.h
+- ln -s ../common/bcdmath.cc
+- ln -s ../common/bcdmath.h
+- touch symlinks
+-
+ clean: FORCE
+ rm -f `find . -type l` \
+ skin2cc skin2cc.exe skins.cc \
+ keymap2cc keymap2cc.exe keymap.cc \
+- *.o *.d *.i *.ii *.s symlinks core.*
++ *.o *.d *.i *.ii *.s core.*
+
+ cleaner: FORCE
+ rm -f `find . -type l` \
+ free42bin free42bin.exe free42dec free42dec.exe \
+ skin2cc skin2cc.exe skins.cc \
+ keymap2cc keymap2cc.exe keymap.cc \
+- *.o *.d *.i *.ii *.s symlinks core.*
++ *.o *.d *.i *.ii *.s core.*
+
+ FORCE:
+
============================================================
--- packages/free42/files/free42-dont-declare-sincos.patch 5e18862aa104d378555e3795e0d218cabe753e80
+++ packages/free42/files/free42-dont-declare-sincos.patch 5e18862aa104d378555e3795e0d218cabe753e80
@@ -0,0 +1,11 @@
+--- free42-orig/common/free42.h 2007-01-06 09:37:50.000000000 -0800
++++ free42gtk/common/free42.h 2007-09-03 22:39:14.000000000 -0700
+@@ -150,7 +150,7 @@
+ * provided by MathLib.
+ */
+ #ifndef PALMOS
+-extern "C" void sincos(double x, double *sinx, double *cosx) HELPERS_SECT;
++
+ #endif
+ //#define NO_SINCOS 1
+
============================================================
--- packages/free42/files/free42-vga-skin.patch 303f7bc3ae4924f88ea2694a9a1156f4f783bc97
+++ packages/free42/files/free42-vga-skin.patch 303f7bc3ae4924f88ea2694a9a1156f4f783bc97
@@ -0,0 +1,12 @@
+--- free42-orig/common/skin2cc.conf 2006-03-22 11:33:35.000000000 -0800
++++ free42gtk/common/skin2cc.conf 2007-09-02 23:52:27.000000000 -0700
+@@ -1,4 +1,4 @@
+-skins/Standard
+-Standard
+-skins/Ehrling42sl
+-Realistic
++skins/Ehrling42ssv
++Portrait
++skins/42ct
++Landscape
+
============================================================
--- packages/free42/files/free42dec.desktop e1163c16c574864f887fa6786337cf60c2da4fac
+++ packages/free42/files/free42dec.desktop e1163c16c574864f887fa6786337cf60c2da4fac
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Free42
+Comment=RPN Calculator
+Exec=free42dec
+Icon=free42.xpm
+StartupNotify=true
+SingleInstance=true
+Terminal=false
+Type=Application
+Categories=Application
============================================================
--- packages/free42/free42-vga_1.4.36.bb affee0392f2e9a5336abf00c6e4fd71d74c796cc
+++ packages/free42/free42-vga_1.4.36.bb affee0392f2e9a5336abf00c6e4fd71d74c796cc
@@ -0,0 +1,44 @@
+DESCRIPTION = "Free42 RPN Calculator"
+SECTION = "openmoko/applications"
+DEPENDS = "gtk+"
+PV = "1.4.36"
+PR = "r1"
+
+SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
+ http://sense.net/zc/free42/42c_skins.tgz \
+ file://free42-bcd-gtk-only.patch;patch=1 \
+ file://free42-vga-skin.patch;patch=1 \
+ file://free42-dont-declare-sincos.patch;patch=1 \
+ file://free42dec.desktop"
+
+S = "${WORKDIR}/free42"
+
+TARGET_CXXFLAGS_append = " -fsigned-char"
+TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+
+do_compile() {
+ cp -fv ${S}/common/* ${S}/gtk
+ cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/
+ cp ${WORKDIR}/42ct.* ${S}/skins/
+ cd ${S}/gtk/
+ ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
+ ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
+}
+
+
============================================================
--- packages/gsm/files/fic-gta01/gsmd 4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
+++ packages/gsm/files/fic-gta01/gsmd 4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
@@ -0,0 +1,51 @@
+##!/bin/sh
+#
+# gsmd This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+ start)
+ stty -F "$GSM_DEV" -crtscts
+ [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+ [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+ [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+ [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+ echo -n "Starting GSM daemon: "
+ start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+ if [ $? = 0 ]; then
+ echo "gsmd."
+ else
+ echo "(failed.)"
+ fi
+ ;;
+ stop)
+ [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+
+ echo -n "Stopping GSM daemon: "
+ start-stop-daemon -K -x /usr/sbin/gsmd
+ stty -F "$GSM_DEV" -crtscts
+ echo "gsmd."
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ exit
+ ;;
+ *)
+ echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
============================================================
--- conf/distro/include/insane-srcrevs.inc 7d43699e51596889a904a6311d3707ff7fefd7d4
+++ conf/distro/include/insane-srcrevs.inc 63ea6dbb957d94e0f729963a34f021d69c8a2f5a
@@ -62,8 +62,11 @@ SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}
SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
SRCREV_pn-openmoko-today ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc 5496c2c028496f67b900d973c1b782fe821e93dc
+++ conf/distro/include/moko-autorev.inc 5709f08bc2fb571ee70795901ea2c48568d7653a
@@ -41,8 +41,11 @@ SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}
SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
SRCREV_pn-openmoko-today ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 8276f0c6e69fdcf546e255dc1764c6d7c2d69326
+++ conf/distro/include/sane-srcrevs.inc 35187a201ca64054e1de4f04f9215f5c24f88f54
@@ -15,6 +15,7 @@ SRCREV_pn-fstests ?= "204"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gconf-dbus ?= "606"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-hildon-1 ?= "13708"
SRCREV_pn-libgsmd ?= "2806"
@@ -71,8 +72,11 @@ SRCREV_pn-openmoko-tasks2 ?= "320"
SRCREV_pn-openmoko-taskmanager ?= "1663"
SRCREV_pn-openmoko-tasks ?= "320"
SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-terminal2 ?= "2964"
SRCREV_pn-openmoko-theme-standard ?= "2370"
SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
+SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
SRCREV_pn-openmoko-today ?= "2556"
SRCREV_pn-openmoko-today2 ?= "2955"
SRCREV_pn-openmoko-today2-folders ?= "2680"
============================================================
--- conf/distro/openmoko.conf c246d427631dbd56b159221956899cc2f40f3b06
+++ conf/distro/openmoko.conf 0a270926afec0c57fe65b21d888d50f318f58085
@@ -35,5 +35,7 @@ require conf/distro/include/preferred-op
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
require conf/distro/include/preferred-openmoko-versions.inc
-require conf/distro/include/moko-autorev.inc
+# Bleeding-edge developers should add the following line to their local.conf:
+# require conf/distro/include/moko-autorev.inc
+
============================================================
--- packages/gnome/gconf-dbus_svn.bb 7e4571428d559265f6ede4b261cd8d23c16ad8b7
+++ packages/gnome/gconf-dbus_svn.bb ac71d333e0e42e01c188b5c90a4374123f6b96b5
@@ -1,44 +1,40 @@ SECTION = "x11/utils"
SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 popt intltool-native"
+DEPENDS = "intltool-native glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-PV = "2.16.0+svn${SRCDATE}"
-PR = "r0"
+PV = "2.16.0+svnr${SRCREV}"
+PR = "r3"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://69gconfd-dbus"
-inherit pkgconfig autotools
+inherit pkgconfig autotools
S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
- ${libdir}/GConf-dbus/2/*.so \
- ${libdir}/dbus-1.0 \
- ${sysconfdir} \
- ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
- ${libdir}/GConf-dbus/2/.debug ""
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
+
do_configure_prepend() {
- touch ${S}/gtk-doc.make
+ touch gtk-doc.make
}
do_stage() {
- autotools_stage_all
+ autotools_stage_all
+ install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
- install -d ${D}/${datadir}/dbus-1.0/services/
- install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
+ install -d ${D}/${datadir}/dbus-1.0/services/
+ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}
-
============================================================
--- packages/gsm/libgsmd_svn.bb f40a2af6cf0a3f96d564ff62dd07830973d9154a
+++ packages/gsm/libgsmd_svn.bb 9aa39b60aa04ee474e8c277bf9337a9194ce32a7
@@ -1,10 +1,10 @@ PV = "0.1+svnr${SRCREV}"
DESCRIPTION = "GSM l%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list