[oe-commits] org.oe.dev merge of '0b7113a85be8ed98e75a1000c58eb9ea5de39919'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Jan 22 02:42:35 UTC 2008
merge of '0b7113a85be8ed98e75a1000c58eb9ea5de39919'
and '43f6b35dcf8438ea9fc7e6a23fa4541225259e15'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 214ed7e892086095fb4e656e5d3777e201866e46
ViewMTN: http://monotone.openembedded.org/revision/info/214ed7e892086095fb4e656e5d3777e201866e46
Files:
1
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb
packages/fontconfig/fontconfig_2.4.1.bb
packages/fontconfig/fontconfig.inc
packages/tzcode/tzcode-native_2007e.bb
packages/tzcode/tzcode-native_2007k.bb
packages/tzdata/tzdata_2007e.bb
packages/tzdata/tzdata_2007k.bb
packages/images/qtopia-core-gui-image.bb
packages/tasks/task-qtopia-core-gui.bb
classes/kernel.bbclass
packages/fontconfig/fontconfig_2.2.95.bb
packages/fontconfig/fontconfig_2.3.91.bb
packages/fontconfig/fontconfig_2.3.95.bb
packages/linux/linux_2.6.23.bb
Diffs:
#
# mt diff -r0b7113a85be8ed98e75a1000c58eb9ea5de39919 -r214ed7e892086095fb4e656e5d3777e201866e46
#
#
#
# delete "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
#
# delete "packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb"
#
#
# mt diff -r43f6b35dcf8438ea9fc7e6a23fa4541225259e15 -r214ed7e892086095fb4e656e5d3777e201866e46
#
#
#
# rename "packages/fontconfig/fontconfig_2.4.1.bb"
# to "packages/fontconfig/fontconfig.inc"
#
# rename "packages/tzcode/tzcode-native_2007e.bb"
# to "packages/tzcode/tzcode-native_2007k.bb"
#
# rename "packages/tzdata/tzdata_2007e.bb"
# to "packages/tzdata/tzdata_2007k.bb"
#
# add_file "packages/fontconfig/fontconfig_2.4.1.bb"
# content [fe2e2ad3e810abacc7e4a262948fda32bc9e3d4e]
#
# add_file "packages/images/qtopia-core-gui-image.bb"
# content [de137d54f827fed4605f688cbafe43031d66a17f]
#
# add_file "packages/tasks/task-qtopia-core-gui.bb"
# content [390e8a35d32d41b492b2323404a2cc9018d8a895]
#
# patch "classes/kernel.bbclass"
# from [0a8f1fb021e05b2bb2d0d90220ce554ae65408c2]
# to [5e2fcea2343f6d39c34c218026c453952cb0c444]
#
# patch "packages/fontconfig/fontconfig.inc"
# from [d1bbd036150276e6c165ee78593ba796695d165a]
# to [559cea134a00aa5a65ad372fdc6bdc240230158d]
#
# patch "packages/fontconfig/fontconfig_2.2.95.bb"
# from [197fffee9b784fd7b410efd7a2eb659854a8132e]
# to [c6a206f872776511443061cdf4658dd0cb8731e2]
#
# patch "packages/fontconfig/fontconfig_2.3.91.bb"
# from [d97369f811908211ce5ddfe2e6c74ce94f76042d]
# to [659e5a544d7b9e7eac310d11cfaf70a46622bf67]
#
# patch "packages/fontconfig/fontconfig_2.3.95.bb"
# from [763b0825072948b482c16cbd7b2ae0e650c6c0ad]
# to [100e7a80eed5c537bde90802f7395103fe509d1d]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [578a8f7bc99edbd97bba396a1766993c401990d2]
# to [b060aceb9f60701b044dbfe175116aa95b285aa5]
#
============================================================
--- packages/fontconfig/fontconfig_2.4.1.bb fe2e2ad3e810abacc7e4a262948fda32bc9e3d4e
+++ packages/fontconfig/fontconfig_2.4.1.bb fe2e2ad3e810abacc7e4a262948fda32bc9e3d4e
@@ -0,0 +1,45 @@
+require fontconfig.inc
+
+PR = "r2"
+
+SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
+
+EXTRA_OECONF += " --with-arch=${HOST_ARCH}"
+
+do_stage () {
+ cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/fontconfig
+ for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+ ln -sf ${STAGING_INCDIR}/fontconfig/device_symbols.h ${STAGING_INCDIR}
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+ autotools_do_install
+}
+
============================================================
--- packages/images/qtopia-core-gui-image.bb de137d54f827fed4605f688cbafe43031d66a17f
+++ packages/images/qtopia-core-gui-image.bb de137d54f827fed4605f688cbafe43031d66a17f
@@ -0,0 +1,20 @@
+#QtopiaCore 'console' image
+#gives you a small images with ssh access
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+DISTRO_SSH_DAEMON ?= "dropbear"
+DEPENDS = "task-boot task-qtopia-core-gui task-qtopia-core-gui"
+
+IMAGE_INSTALL = "task-boot \
+ util-linux-mount util-linux-umount \
+ ${DISTRO_SSH_DAEMON} \
+ angstrom-version \
+ task-qtopia-core-console \
+ task-qtopia-core-gui \
+ "
+
+export IMAGE_BASENAME = "trolltech-qtopia-core-gui-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
============================================================
--- packages/tasks/task-qtopia-core-gui.bb 390e8a35d32d41b492b2323404a2cc9018d8a895
+++ packages/tasks/task-qtopia-core-gui.bb 390e8a35d32d41b492b2323404a2cc9018d8a895
@@ -0,0 +1,11 @@
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "MIT"
+
+inherit task
+
+DESCRIPTION_task-qtopia-core-gui = "QtopiaCore GUI library"
+RDEPENDS_task-qtopia-core-gui = " \
+ task-qtopia-core-console \
+ libqtopiacoregui4 \
+ libqtopiacorescript4 \
+ libqtopiacoredbus4"
============================================================
--- classes/kernel.bbclass 0a8f1fb021e05b2bb2d0d90220ce554ae65408c2
+++ classes/kernel.bbclass 5e2fcea2343f6d39c34c218026c453952cb0c444
@@ -231,6 +231,8 @@ module_autoload_sa1100-rtc = "sa1100-rtc
module_autoload_ircomm-tty = "ircomm-tty"
module_autoload_rfcomm = "rfcomm"
module_autoload_sa1100-rtc = "sa1100-rtc"
+# sa1100-rtc was renamed in 2.6.23 onwards
+module_autoload_rtc-sa1100 = "rtc-sa1100"
# alias defaults (alphabetically sorted)
module_conf_af_packet = "alias net-pf-17 af_packet"
============================================================
--- packages/fontconfig/fontconfig_2.4.1.bb d1bbd036150276e6c165ee78593ba796695d165a
+++ packages/fontconfig/fontconfig.inc 559cea134a00aa5a65ad372fdc6bdc240230158d
@@ -1,29 +1,23 @@
+DESCRIPTION = "A library for configuring and customizing font access."
SECTION = "libs"
LICENSE = "BSD"
-DESCRIPTION = "A library for configuring and customizing font access."
DEPENDS = "expat freetype freetype-native zlib"
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
- https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
-PR = "r2"
-
-PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
-FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
-FILES_fontconfig-utils = "${bindir}/*"
-
# Work around past breakage in debian.bbclass
RPROVIDES_fontconfig-utils = "libfontconfig-utils"
RREPLACES_fontconfig-utils = "libfontconfig-utils"
RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
+
S = "${WORKDIR}/fontconfig-${PV}"
inherit autotools pkgconfig
export HASDOCBOOK="no"
-EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OECONF = " --disable-docs"
EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
# The tarball has some of the patched files as read only, which
@@ -38,40 +32,6 @@ python do_unpack () {
bb.build.exec_func('fontconfig_do_unpack', d)
}
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
-do_stage () {
- cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/
- oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/fontconfig
- for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
- ln -sf ${STAGING_INCDIR}/fontconfig/device_symbols.h ${STAGING_INCDIR}
-}
-
-BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
-
-do_configure_append () {
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
-
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
-
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
-
- sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
- sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
- sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
- sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
-
-}
-
-do_install () {
- autotools_do_install
-}
-
============================================================
--- packages/fontconfig/fontconfig_2.2.95.bb 197fffee9b784fd7b410efd7a2eb659854a8132e
+++ packages/fontconfig/fontconfig_2.2.95.bb c6a206f872776511443061cdf4658dd0cb8731e2
@@ -1,45 +1,12 @@
-SECTION = "libs"
-LICENSE = "BSD"
-DESCRIPTION = "A library for configuring and customizing font access."
-DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
+require fontconfig.inc
-SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \
- file://fc-glyphname.patch;patch=1 \
+DEPENDS += "fontconfig-native"
+
+SRC_URI += "file://fc-glyphname.patch;patch=1 \
file://fc-lang.patch;patch=1 \
file://local.conf"
PR = "r8"
-PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
-FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
-FILES_fontconfig-utils = "${bindir}/*"
-
-# Work around past breakage in debian.bbclass
-RPROVIDES_fontconfig-utils = "libfontconfig-utils"
-RREPLACES_fontconfig-utils = "libfontconfig-utils"
-RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
-DEBIAN_NOAUTONAME_fontconfig-utils = "1"
-
-S = "${WORKDIR}/fontconfig-${PV}"
-
-inherit autotools pkgconfig
-
-export HASDOCBOOK="no"
-
-EXTRA_OECONF = " --disable-docs "
-EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
-
-# The tarball has some of the patched files as read only, which
-# patch doesn't like at all
-
-fontconfig_do_unpack() {
- chmod -R u+rw ${S}
-}
-
-python do_unpack () {
- bb.build.exec_func('base_do_unpack', d)
- bb.build.exec_func('fontconfig_do_unpack', d)
-}
-
do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
============================================================
--- packages/fontconfig/fontconfig_2.3.91.bb d97369f811908211ce5ddfe2e6c74ce94f76042d
+++ packages/fontconfig/fontconfig_2.3.91.bb 659e5a544d7b9e7eac310d11cfaf70a46622bf67
@@ -1,47 +1,14 @@
-SECTION = "libs"
-LICENSE = "BSD"
-DESCRIPTION = "A library for configuring and customizing font access."
-DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
+require fontconfig.inc
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
- file://fc-glyphname.patch;patch=1 \
+DEPENDS += "fontconfig-native"
+
+SRC_URI += "file://fc-glyphname.patch;patch=1 \
file://fc-lang.patch;patch=1 \
file://one-j-too-many.patch;patch=1 \
file://local.conf"
PR = "r3"
-PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
-FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
-FILES_fontconfig-utils = "${bindir}/*"
-
-# Work around past breakage in debian.bbclass
-RPROVIDES_fontconfig-utils = "libfontconfig-utils"
-RREPLACES_fontconfig-utils = "libfontconfig-utils"
-RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
-DEBIAN_NOAUTONAME_fontconfig-utils = "1"
-
-S = "${WORKDIR}/fontconfig-${PV}"
-
-inherit autotools pkgconfig
-
-export HASDOCBOOK="no"
-
-EXTRA_OECONF = " --disable-docs "
-EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
-
-# The tarball has some of the patched files as read only, which
-# patch doesn't like at all
-
-fontconfig_do_unpack() {
- chmod -R u+rw ${S}
-}
-
-python do_unpack () {
- bb.build.exec_func('base_do_unpack', d)
- bb.build.exec_func('fontconfig_do_unpack', d)
-}
-
do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
============================================================
--- packages/fontconfig/fontconfig_2.3.95.bb 763b0825072948b482c16cbd7b2ae0e650c6c0ad
+++ packages/fontconfig/fontconfig_2.3.95.bb 100e7a80eed5c537bde90802f7395103fe509d1d
@@ -1,44 +1,9 @@
-SECTION = "libs"
-LICENSE = "BSD"
-DESCRIPTION = "A library for configuring and customizing font access."
-DEPENDS = "expat freetype freetype-native zlib"
+require fontconfig.inc
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
- file://one-j-too-many.patch;patch=1"
+SRC_URI += "file://one-j-too-many.patch;patch=1"
PR = "r2"
-PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
-FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
-FILES_fontconfig-utils = "${bindir}/*"
-
-# Work around past breakage in debian.bbclass
-RPROVIDES_fontconfig-utils = "libfontconfig-utils"
-RREPLACES_fontconfig-utils = "libfontconfig-utils"
-RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
-DEBIAN_NOAUTONAME_fontconfig-utils = "1"
-
-S = "${WORKDIR}/fontconfig-${PV}"
-
-inherit autotools pkgconfig
-
-export HASDOCBOOK="no"
-
-EXTRA_OECONF = " --disable-docs "
-EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
-
-# The tarball has some of the patched files as read only, which
-# patch doesn't like at all
-
-fontconfig_do_unpack() {
- chmod -R u+rw ${S}
-}
-
-python do_unpack () {
- bb.build.exec_func('base_do_unpack', d)
- bb.build.exec_func('fontconfig_do_unpack', d)
-}
-
do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
============================================================
--- packages/linux/linux_2.6.23.bb 578a8f7bc99edbd97bba396a1766993c401990d2
+++ packages/linux/linux_2.6.23.bb b060aceb9f60701b044dbfe175116aa95b285aa5
@@ -39,10 +39,8 @@ SRC_URI_append_mpc8313e-rdb = "\
SRC_URI_append_mpc8313e-rdb = "\
file://mpc831x-nand.patch;patch=1 \
file://mpc8313e-rdb-leds.patch;patch=1 \
- file://mpc8313e-rdb-rtc.patch;patch=1 \
- file://defconfig-rt"
+ file://mpc8313e-rdb-rtc.patch;patch=1"
-
SRC_URI_append_mpc8323e-rdb = "\
file://mpc832x-leds.patch;patch=1"
More information about the Openembedded-commits
mailing list