org.openmoko.dev: d5fd1847d8ae604d31c6b9680f671b8114993ffc

oe at monotone.openmoko.org oe at monotone.openmoko.org
Tue May 6 21:40:38 CEST 2008


revision:            d5fd1847d8ae604d31c6b9680f671b8114993ffc
date:                2008-05-06T19:06:43
author:              julian_chu at openmoko.com
branch:              org.openmoko.dev
changelog:
merge of '6d846a4ffe70093808f6f332fab900f0568db533'
     and 'b74c5252ce9967cbb5a48313bd022a0975307afc'

manifest:
format_version "1"

new_manifest [406eb0ff4cab1e044b2e394bc0acd989b70f7d3a]

old_revision [6d846a4ffe70093808f6f332fab900f0568db533]

patch "classes/sdk.bbclass"
 from [2fd6da925d72a7d66eaa4f9817de7c4a9658126f]
   to [5eb983812841fbe0c5b37fa5232ee672cfa15ec9]

old_revision [b74c5252ce9967cbb5a48313bd022a0975307afc]

patch "packages/xorg-xserver/xserver-kdrive-common.inc"
 from [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
   to [77ad25b09ec5d7afb286d85075768e69fe9d566e]

patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
 from [d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042]
   to [7693486fcf3946f64cb89d87c50fce76dbbddadd]

patch "packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb"
 from [0e72a73ed8c431c237be94d012f71e1c0ba17de4]
   to [9e22e57d519a3db6506a03abb3832a698dd2580f]

patch "packages/xorg-xserver/xserver-kdrive_1.1.0.bb"
 from [e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a]
   to [025fb5ef7bbba8e693cf91a7f19966b41a61b6ac]

patch "packages/xorg-xserver/xserver-xorg_1.2.0.bb"
 from [c73bffb1e3641cde21223b8fe821232c15036b4d]
   to [851bb3b6b25a7e03953ef2c03063779bdcc0ec9f]

patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
 from [90ab10be4b7894e29fabbe78fccead9685ff87ac]
   to [228af28a9592f1bb445ca5ffd4054533d0a5498e]

patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
 from [b205054696412235974c4bc8ba8c5ab1d7eb3104]
   to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
-------------- next part --------------
#
#
# patch "classes/sdk.bbclass"
#  from [2fd6da925d72a7d66eaa4f9817de7c4a9658126f]
#    to [5eb983812841fbe0c5b37fa5232ee672cfa15ec9]
#
============================================================
--- classes/sdk.bbclass	2fd6da925d72a7d66eaa4f9817de7c4a9658126f
+++ classes/sdk.bbclass	5eb983812841fbe0c5b37fa5232ee672cfa15ec9
@@ -4,6 +4,7 @@ PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACK
 
 OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
+STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
@@ -49,4 +50,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \
                     ${prefix}/bin/.debug \
                    "
 
+export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
-export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${HOST_SYS}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080506/6bc92d39/attachment.htm 
-------------- next part --------------
#
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
#  from [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
#    to [77ad25b09ec5d7afb286d85075768e69fe9d566e]
# 
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
#  from [d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042]
#    to [7693486fcf3946f64cb89d87c50fce76dbbddadd]
# 
# patch "packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb"
#  from [0e72a73ed8c431c237be94d012f71e1c0ba17de4]
#    to [9e22e57d519a3db6506a03abb3832a698dd2580f]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.1.0.bb"
#  from [e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a]
#    to [025fb5ef7bbba8e693cf91a7f19966b41a61b6ac]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.2.0.bb"
#  from [c73bffb1e3641cde21223b8fe821232c15036b4d]
#    to [851bb3b6b25a7e03953ef2c03063779bdcc0ec9f]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  from [90ab10be4b7894e29fabbe78fccead9685ff87ac]
#    to [228af28a9592f1bb445ca5ffd4054533d0a5498e]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [b205054696412235974c4bc8ba8c5ab1d7eb3104]
#    to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-common.inc	41111959110e4d02e8cbcb965b17cd1d2494d5b9
+++ packages/xorg-xserver/xserver-kdrive-common.inc	77ad25b09ec5d7afb286d85075768e69fe9d566e
@@ -117,7 +117,7 @@ EXTRA_OECONF = "--enable-composite --ena
                 --disable-dmx ${W100_OECONF} \
                 --with-default-font-path=built-ins \
                 --enable-tslib --enable-xcalibrate \
-                ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+                ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 do_configure_prepend() {
     sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
============================================================
--- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	d37b72983a9c1d1e7eb3f0e5f64a5599b18d3042
+++ packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	7693486fcf3946f64cb89d87c50fce76dbbddadd
@@ -52,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --ena
                 --disable-dmx \
                 --with-default-font-path=built-ins \
                 --enable-tslib --enable-xcalibrate \
-                ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+                ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 do_configure_prepend() {
     sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb	0e72a73ed8c431c237be94d012f71e1c0ba17de4
+++ packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb	9e22e57d519a3db6506a03abb3832a698dd2580f
@@ -45,7 +45,7 @@ EXTRA_OECONF = "--enable-composite --ena
 		--disable-xkb --disable-xnest --disable-xvfb \
 		--disable-xevie --disable-xprint --disable-xtrap \
 		--with-default-font-path=built-ins \
-		ac_cv_file__usr_share_X11_sgml_defs_ent=no \
+		ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 		--enable-xomap"
 
 do_configure_prepend() {
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.1.0.bb	e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a
+++ packages/xorg-xserver/xserver-kdrive_1.1.0.bb	025fb5ef7bbba8e693cf91a7f19966b41a61b6ac
@@ -52,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --ena
 		--disable-xkb --disable-xnest --disable-xvfb \
 		--disable-xevie --disable-xprint --disable-xtrap \
 		--with-default-font-path=built-ins \
-		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+		ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 do_configure_prepend() {
     sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
============================================================
--- packages/xorg-xserver/xserver-xorg_1.2.0.bb	c73bffb1e3641cde21223b8fe821232c15036b4d
+++ packages/xorg-xserver/xserver-xorg_1.2.0.bb	851bb3b6b25a7e03953ef2c03063779bdcc0ec9f
@@ -3,7 +3,7 @@ PE = "1"
 require xorg-xserver-common.inc
 PE = "1"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
 export LDFLAGS += " -ldl "
 
============================================================
--- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	90ab10be4b7894e29fabbe78fccead9685ff87ac
+++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	228af28a9592f1bb445ca5ffd4054533d0a5498e
@@ -6,7 +6,7 @@ SRC_URI += "file://drmfix.patch;patch=1"
 
 SRC_URI += "file://drmfix.patch;patch=1"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
 export LDFLAGS += " -ldl "
 
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	b205054696412235974c4bc8ba8c5ab1d7eb3104
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	aa88c8fb589cdbefddf67d5801f17ec2980d02e9
@@ -11,6 +11,6 @@ MESA_VER = "7.0.2"
 
 MESA_VER = "7.0.2"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
 export LDFLAGS += " -ldl "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080506/6bc92d39/attachment-0001.htm 


More information about the commitlog mailing list