[oe-commits] org.oe.dev merge of '838a60f4684a5fe71ade31d05fb35609808420d1'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Sep 14 13:36:54 UTC 2007
merge of '838a60f4684a5fe71ade31d05fb35609808420d1'
and 'caed6636e646bb9b999bfe3a3234c92da9e20252'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8eb033e1267761674286fcf266b81e02c35fa3d6
ViewMTN: http://monotone.openembedded.org/revision/info/8eb033e1267761674286fcf266b81e02c35fa3d6
Files:
1
conf/machine/include/tune-geodelx.conf
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/alix.conf
packages/gnome/gconf-dbus_svn.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/termcap
packages/termcap/termcap_11.0.1.bb
packages/vte/vte_0.16.8.bb
Diffs:
#
# mt diff -r838a60f4684a5fe71ade31d05fb35609808420d1 -r8eb033e1267761674286fcf266b81e02c35fa3d6
#
#
#
# add_file "conf/machine/include/tune-geodelx.conf"
# content [cb790563e96dcb829b7dd845a47129b0bd6255fe]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [72eda7924347374e0ab868c3b35454bafd3d93d0]
# to [5709f08bc2fb571ee70795901ea2c48568d7653a]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [d8a4aae44c305a13e168a2f3641648fe0671207d]
# to [6f40fd83301e829dda5ced38774f734103633954]
#
# patch "conf/machine/alix.conf"
# from [6ac777208694aa9b00784052d5baca787f429532]
# to [f8fdaa68a61adeffcb530a174e2e182280770dd5]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [7e4571428d559265f6ede4b261cd8d23c16ad8b7]
# to [ac71d333e0e42e01c188b5c90a4374123f6b96b5]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [7108300d1b93ae19d191325a41b16ac125504bd7]
# to [6b749d9ef772b8e60588711e9d902b4292a7e84b]
#
============================================================
--- 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/distro/include/sane-srcrevs.inc d8a4aae44c305a13e168a2f3641648fe0671207d
+++ conf/distro/include/sane-srcrevs.inc 6f40fd83301e829dda5ced38774f734103633954
@@ -15,9 +15,10 @@ 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"
+SRCREV_pn-libgsmd ?= "2957"
SRCREV_pn-libmokogsmd2 ?= "2950"
SRCREV_pn-libmokojournal2 ?= "2780"
SRCREV_pn-libmokopanelui2 ?= "2958"
============================================================
--- 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 = "\
============================================================
--- 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/gtk+/gdk-pixbuf-csource-native_2.10.14.bb 7108300d1b93ae19d191325a41b16ac125504bd7
+++ packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb 6b749d9ef772b8e60588711e9d902b4292a7e84b
@@ -5,6 +5,11 @@ SRC_URI += "file://reduce-dependencies.p
FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
SRC_URI += "file://reduce-dependencies.patch;patch=1"
+#clear recommends for uclibc builds
+RRECOMMENDS = " "
+RRECOMMENDS_${PN}_linux = " "
+RRECOMMENDS_${PN}_linux-gnueabi = " "
+
EXTRA_OECONF = "\
--without-x \
--with-gdktarget=linux-fb \
#
# mt diff -rcaed6636e646bb9b999bfe3a3234c92da9e20252 -r8eb033e1267761674286fcf266b81e02c35fa3d6
#
#
#
# add_dir "packages/termcap"
#
# add_file "packages/termcap/termcap_11.0.1.bb"
# content [48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5]
#
# patch "packages/vte/vte_0.16.8.bb"
# from [877f5cc30d4eaa0bb61c823b10a4536806cf11bf]
# to [4642ff116b6101c8293be250f4507ca114aa02b7]
#
============================================================
--- packages/termcap/termcap_11.0.1.bb 48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5
+++ packages/termcap/termcap_11.0.1.bb 48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5
@@ -0,0 +1,16 @@
+DESCRIPTION = "Terminal Capabilities File"
+SECTION = "base"
+HOMEPAGE = "http://www.catb.org/~esr/terminfo/"
+LICENSE = "PD"
+
+SRC_URI = "http://www.catb.org/~esr/terminfo/termtypes.tc.gz"
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}${sysconfdir}
+ install -m 0644 termtypes.tc ${D}${sysconfdir}/termcap
+}
+
+PACKAGES = "termcap"
+FILES_termcap = "${sysconfdir}"
+
============================================================
--- packages/vte/vte_0.16.8.bb 877f5cc30d4eaa0bb61c823b10a4536806cf11bf
+++ packages/vte/vte_0.16.8.bb 4642ff116b6101c8293be250f4507ca114aa02b7
@@ -1,6 +1,7 @@ LICENSE = "LGPL"
DESCRIPTION = "vte is a virtual terminal emulator"
LICENSE = "LGPL"
-PR = "r2"
+RDEPENDS = "termcap"
+PR = "r3"
inherit gnome
More information about the Openembedded-commits
mailing list