[oe-commits] org.oe.dev merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
mickeyl commit
oe at amethyst.openembedded.net
Mon Jul 14 11:28:45 UTC 2008
merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
and 'dff33d19f55f5e1289901a814a5e358b4a4a9981'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d52ba7ba4d60e822f2fe1c39db829edbfa8a115a
ViewMTN: http://monotone.openembedded.org/revision/info/d52ba7ba4d60e822f2fe1c39db829edbfa8a115a
Files:
1
packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
packages/epdfview/epdfview_0.1.2.bb
packages/epdfview/epdfview_0.1.3.bb
packages/epdfview/epdfview_0.1.4.bb
packages/epdfview/epdfview_0.1.5.bb
packages/cacao/cacao-native_0.99.1.bb
packages/cacao/cacao-native_0.99.2.bb
packages/cacao/cacao_0.99.1.bb
packages/cacao/cacao_0.99.2.bb
packages/cacao/cacaoh-native_0.99.1.bb
packages/cacao/cacaoh-native_0.99.2.bb
packages/qmake/qmake2-native/0001-fix-mkspecs.patch
packages/qmake/files/0001-fix-mkspecs.patch
packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch
packages/qmake/files/0008-backport-qt-lib-infix.patch
packages/qmake/qmake2-native/qt-config.patch
packages/qmake/files/qt-config.patch
packages/qmake/qmake2-native/use-lflags-last.patch
packages/qmake/files/use-lflags-last.patch
packages/asio
packages/bind/bind-9.3.5-P1
packages/epdfview/files
packages/icon-naming-utils
packages/javasqlite
packages/javasqlite/files
packages/miglayout
packages/mml-widget/files
packages/qmake/qmake2-sdk
packages/sqlitejdbc
packages/abiword/abiword-plugins_2.6.4.bb
packages/abiword/abiword_2.6.4.bb
packages/asio/asio_1.1.1.bb
packages/bind/bind-9.3.5-P1/conf.patch
packages/bind/bind-9.3.5-P1/configure.in.patch
packages/bind/bind-9.3.5-P1/so_bsdcompat.patch
packages/bind/bind_9.3.5-P1.bb
packages/epdfview/files/poppler8.diff
packages/evince/evince_2.23.4.bb
packages/gcc/gcc-csl-arm-2007q3/gcc-Os-fix.diff
packages/gnome/gnome-icon-theme_2.22.0.bb
packages/hicolor-icon-theme/hicolor-icon-theme_0.10.bb
packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb
packages/jamvm/jamvm-native.inc
packages/jamvm/jamvm-native_1.5.1.bb
packages/javasqlite/files/build-fix.patch
packages/javasqlite/javasqlite-mkconst-native_20080130.bb
packages/javasqlite/javasqlite_20080130.bb
packages/libwpd/libwpd_0.8.14.bb
packages/mml-widget/files/mathview-gcc43x.diff
packages/mml-widget/gtkmathview_0.8.0.bb
packages/perl/libxml-simple-perl-native_2.18.bb
packages/perl/libxml-simple-perl_2.18.bb
packages/poppler/poppler_0.8.4.bb
packages/qmake/qmake2-sdk/linux-oe-qmake.conf
packages/qmake/qmake2-sdk_2.10a.bb
packages/sqlite/sqlite-native_2.8.17.bb
packages/sqlite/sqlite3-native.inc
packages/sqlite/sqlite3-native_3.5.6.bb
packages/sqlitejdbc/sqlitejdbc_041.bb
packages/uicmoc/files/qapplication.diff
packages/uicmoc/uicmoc4-sdk_4.4.0.bb
packages/util-linux-ng/util-linux-ng_2.14.bb
MAINTAINERS
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
packages/angstrom/angstrom-led-config.bb
packages/cacao/cacao-native.inc
packages/cacao/cacao-native_0.98+hg20071001.bb
packages/classpath/classpath_0.97.2.bb
packages/epdfview/epdfview_0.1.6.bb
packages/ffmpeg/ffmpeg_git.bb
packages/gcc/gcc-cross_csl-arm-2007q3.bb
packages/gcc/gcc-csl-arm-2007q3.inc
packages/gcc/gcc_csl-arm-2007q3.bb
packages/images/beagleboard-demo-image.bb
packages/lcd4linux/files/lcd4linux.init
packages/lcd4linux/lcd4linux_0.10.0.bb
packages/meta/meta-toolchain-neuros.bb
packages/mml-widget/gtkmathview_0.7.6.bb
packages/qmake/qmake2-native.inc
packages/qmake/qmake2-native_2.10a.bb
packages/swfdec/swfdec-mozilla_0.7.2.bb
packages/t1lib/t1lib_5.0.2.bb
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/tasks/task-proper-tools.bb
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot_git.bb
packages/uicmoc/uicmoc4-native.inc
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/uicmoc/uicmoc4-native_4.3.3.bb
packages/uicmoc/uicmoc4-native_4.4.0.bb
packages/util-linux-ng/util-linux-ng.inc
packages/linux/linux-openmoko-devel/defconfig-om-gta01
packages/linux/linux-openmoko-devel/del-hardcoded-led-behaviour.patch
packages/linux/linux-openmoko-devel/fix-defconfig-gta01.patch
packages/linux/linux-openmoko-devel/defconfig-om-gta02
packages/linux/linux-openmoko-devel/defconfig-oe
packages/linux/linux-openezx-devel_svn.bb
packages/linux/linux-openmoko-devel_git.bb
packages/linux/linux-openmoko_2.6.24+git.bb
Diffs:
#
# mt diff -rd39fcbb20e8ed63ddeb563f8bcffc41b528163cd -rd52ba7ba4d60e822f2fe1c39db829edbfa8a115a
#
#
#
# delete "packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch"
#
# delete "packages/epdfview/epdfview_0.1.2.bb"
#
# delete "packages/epdfview/epdfview_0.1.3.bb"
#
# delete "packages/epdfview/epdfview_0.1.4.bb"
#
# delete "packages/epdfview/epdfview_0.1.5.bb"
#
# rename "packages/cacao/cacao-native_0.99.1.bb"
# to "packages/cacao/cacao-native_0.99.2.bb"
#
# rename "packages/cacao/cacao_0.99.1.bb"
# to "packages/cacao/cacao_0.99.2.bb"
#
# rename "packages/cacao/cacaoh-native_0.99.1.bb"
# to "packages/cacao/cacaoh-native_0.99.2.bb"
#
# rename "packages/qmake/qmake2-native/0001-fix-mkspecs.patch"
# to "packages/qmake/files/0001-fix-mkspecs.patch"
#
# rename "packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch"
# to "packages/qmake/files/0008-backport-qt-lib-infix.patch"
#
# rename "packages/qmake/qmake2-native/qt-config.patch"
# to "packages/qmake/files/qt-config.patch"
#
# rename "packages/qmake/qmake2-native/use-lflags-last.patch"
# to "packages/qmake/files/use-lflags-last.patch"
#
# add_dir "packages/asio"
#
# add_dir "packages/bind/bind-9.3.5-P1"
#
# add_dir "packages/epdfview/files"
#
# add_dir "packages/icon-naming-utils"
#
# add_dir "packages/javasqlite"
#
# add_dir "packages/javasqlite/files"
#
# add_dir "packages/miglayout"
#
# add_dir "packages/mml-widget/files"
#
# add_dir "packages/qmake/qmake2-sdk"
#
# add_dir "packages/sqlitejdbc"
#
# add_file "packages/abiword/abiword-plugins_2.6.4.bb"
# content [d1fd52759d17edfde1c883a1c63346c786ba9807]
#
# add_file "packages/abiword/abiword_2.6.4.bb"
# content [c206e4f1553666d98b19e12fbdb0b78763839f22]
#
# add_file "packages/asio/asio_1.1.1.bb"
# content [94c47ccdb0586b145409ff7b5a40cb1849191568]
#
# add_file "packages/bind/bind-9.3.5-P1/conf.patch"
# content [fa927c9c76b99962bb7a92d8ab0576e4ab88ba60]
#
# add_file "packages/bind/bind-9.3.5-P1/configure.in.patch"
# content [036e628bf0ee12be0aa9e56cf436aa57c1858b6c]
#
# add_file "packages/bind/bind-9.3.5-P1/so_bsdcompat.patch"
# content [984e3553992dec43c8de0b84fbebad95d52f1127]
#
# add_file "packages/bind/bind_9.3.5-P1.bb"
# content [315c08f8756c0f9d0a3a10318fd75ed9883ff174]
#
# add_file "packages/epdfview/files/poppler8.diff"
# content [a689e7ecd2eb96297da67182d90023c0c658575e]
#
# add_file "packages/evince/evince_2.23.4.bb"
# content [5f5e5c4d137be729191614e2f6a498f062401264]
#
# add_file "packages/gcc/gcc-csl-arm-2007q3/gcc-Os-fix.diff"
# content [9d4eb8cf17c7b1c99580147dba22597f2f05e2c8]
#
# add_file "packages/gnome/gnome-icon-theme_2.22.0.bb"
# content [931193cc8c6a7881178a94c05759f57f7fcaf899]
#
# add_file "packages/hicolor-icon-theme/hicolor-icon-theme_0.10.bb"
# content [4d50fc5b730a2a911c92d03092887ede6e2cbc2c]
#
# add_file "packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb"
# content [6a95ebbc46c4f74d87c142d50bfe1196dd239e08]
#
# add_file "packages/jamvm/jamvm-native.inc"
# content [6860472b71586e2ce8530c2f408cdc435b89d12e]
#
# add_file "packages/jamvm/jamvm-native_1.5.1.bb"
# content [c3027d0494f5e3f40644beea7b8baa8e0cc90b39]
#
# add_file "packages/javasqlite/files/build-fix.patch"
# content [dcdbc513ca5b58f41d3de2d3c48ed1bb5f715cc9]
#
# add_file "packages/javasqlite/javasqlite-mkconst-native_20080130.bb"
# content [40934f30932a49d6d23cd876f616390b920d9bb7]
#
# add_file "packages/javasqlite/javasqlite_20080130.bb"
# content [8c8178e5422b17d57da6df73ad25e42cd90eb3f9]
#
# add_file "packages/libwpd/libwpd_0.8.14.bb"
# content [d94ab8003d42c654cd7c798c1f66c7232b8316fb]
#
# add_file "packages/mml-widget/files/mathview-gcc43x.diff"
# content [606a7ab8b8033a24ef72e432cb8604978a4538aa]
#
# add_file "packages/mml-widget/gtkmathview_0.8.0.bb"
# content [6722b48e3fb9faefeef745d321ccd2fb22122a38]
#
# add_file "packages/perl/libxml-simple-perl-native_2.18.bb"
# content [4509edaa50eb5e4151befd963b22744f198b228a]
#
# add_file "packages/perl/libxml-simple-perl_2.18.bb"
# content [d16ca0e5961262368a1c4cd0cd31d05adb258970]
#
# add_file "packages/poppler/poppler_0.8.4.bb"
# content [5051018c95108165af0a9b9d2a66681132cac581]
#
# add_file "packages/qmake/qmake2-sdk/linux-oe-qmake.conf"
# content [c82809da5345d47e3b84f36c116a3d8f9a283d4d]
#
# add_file "packages/qmake/qmake2-sdk_2.10a.bb"
# content [931674d68171befe4ba574c8c1333e334ac6efab]
#
# add_file "packages/sqlite/sqlite-native_2.8.17.bb"
# content [f14eb2863449924fda968d07fab5d9613e3df742]
#
# add_file "packages/sqlite/sqlite3-native.inc"
# content [e8600a42d40eab90de6f2a9a88a20a4d662f58ea]
#
# add_file "packages/sqlite/sqlite3-native_3.5.6.bb"
# content [3426a2d74a100a05085b2f3706b5a62c3c842f66]
#
# add_file "packages/sqlitejdbc/sqlitejdbc_041.bb"
# content [016d4f047235c72b4e8fc9090fc8a01ef2fbb62d]
#
# add_file "packages/uicmoc/files/qapplication.diff"
# content [51c3e599aa93c5448fb3c2dcb3e340280a0fa986]
#
# add_file "packages/uicmoc/uicmoc4-sdk_4.4.0.bb"
# content [8e0cacdabfd0b87bc63a1ddab2da7d09520add25]
#
# add_file "packages/util-linux-ng/util-linux-ng_2.14.bb"
# content [5661ee890f7e557f934a1d336b7ab7ee3f8a410e]
#
# patch "MAINTAINERS"
# from [0952dfc25909402fe342c1727a4aa54c98c16a72]
# to [86c3ad4586fdf8bb08b7b9755791703eda5da5bf]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [c8851b3ee0837d56ce5ebc197ec9aa3505fb7f91]
# to [f64ebcf55e85b504d3be169befac3c7981aa74d9]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [62520e6f06c372811a13891d31a33e8723a29d92]
# to [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
#
# patch "packages/angstrom/angstrom-led-config.bb"
# from [c538e731baf16dafe26a872d463203b820c9d252]
# to [595ecccae369f64df3aeebe7b7fe105dbce41623]
#
# patch "packages/cacao/cacao-native.inc"
# from [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
# to [01518adc1a5be594a1b7a0745fbe809fe9c32e37]
#
# patch "packages/cacao/cacao-native_0.98+hg20071001.bb"
# from [b087b9a24b9593dfff241d8dbafef831492c316b]
# to [8929611fd90eb4fdcb23fe53d68ecbb8c33008a2]
#
# patch "packages/cacao/cacao-native_0.99.2.bb"
# from [99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22]
# to [ec6694c3440d7213e55f7fc7aa9401c8252419a2]
#
# patch "packages/cacao/cacao_0.99.2.bb"
# from [77d2dd2b46672fce71c875cb18b3294166d240cd]
# to [c37006a6c2daf29f28f7a3af6c18f2546da63545]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [278cb300abf8c1fd2c84992aad5b9a71d2f050e5]
# to [950979b9546b09b411c3a41c14bf06b8450bd8bd]
#
# patch "packages/epdfview/epdfview_0.1.6.bb"
# from [d69520dd4a8189f45fe661be6cbdd872fc0243a2]
# to [50d81d822117bcc77f1bba303bf94b88f59e4881]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [6595b7db30a4c0aa450baa53b7c03f70acc8211b]
# to [a8a6467f13b3028168ae3bb4c7c5826fa0894061]
#
# patch "packages/gcc/gcc-cross_csl-arm-2007q3.bb"
# from [411e7a0405fc328443f0f03dd886fc4f48fd00da]
# to [e67b47e1a4fdb73d40f91021aa4d1bee3e8c3b45]
#
# patch "packages/gcc/gcc-csl-arm-2007q3.inc"
# from [01e125daae24e6a2f2f71eb12b6d2232b0ada01a]
# to [9a2de5e37780ff3bb8cb1bfa6ab35f97f077bd6d]
#
# patch "packages/gcc/gcc_csl-arm-2007q3.bb"
# from [55df580a34f1d73c5eba25daf9c87e87a6b20344]
# to [fcdbd67805c15ba4c7925acf07b60a96addc0669]
#
# patch "packages/images/beagleboard-demo-image.bb"
# from [a5e29d5371d9630726fac8ef24450a866fcd1dec]
# to [a331c7d784384394318bb658ab691ae57a70156d]
#
# patch "packages/lcd4linux/files/lcd4linux.init"
# from [83848ea064a0946e3a7921d51cfea062858be9e2]
# to [491daa80397dc689b2de379e45f1d1012eeff65b]
#
# patch "packages/lcd4linux/lcd4linux_0.10.0.bb"
# from [88dad79f87ed32ec0895aa8c75781aea20ad1307]
# to [5d3cf9afec0757a742e933264ff87db21986d225]
#
# patch "packages/meta/meta-toolchain-neuros.bb"
# from [975bc80b05a6d5c8ee34c730b23a41c8d922ad55]
# to [e081df87f5ca63291bdf98ffef64692331dfd484]
#
# patch "packages/mml-widget/gtkmathview_0.7.6.bb"
# from [5ff90d604ced3e24dba96dc592a79f9c2a5ad971]
# to [2daa6a30825798dbe1bbb6118251caf2b9af965a]
#
# patch "packages/qmake/qmake2-native.inc"
# from [18bf1cd3568fef0b75bb3527dc1810cb148196b2]
# to [f5000ca45c6fa48ac244de67f96888ef38d5d7b1]
#
# patch "packages/qmake/qmake2-native_2.10a.bb"
# from [87d12872c36ccf6797ad38776a929652d95a4850]
# to [c50778fcd7cdf33c89fe6a0ea1bd651b90adb62a]
#
# patch "packages/swfdec/swfdec-mozilla_0.7.2.bb"
# from [476a536d65a42dc84c8bb188f0b086df54ef315a]
# to [941e21548d2bf8b6a5e08554b0d9d784265940da]
#
# patch "packages/t1lib/t1lib_5.0.2.bb"
# from [c42e341a911838b8d58aaf7c0aa1d3d900719030]
# to [7ebaa9fd120c1d2222ab4a6e1a6ca782c998cc5a]
#
# patch "packages/tasks/task-base.bb"
# from [c013fadaf0387eb1ffe99d00b051d75fbff69b82]
# to [7a415eba1e3b66456e05cc2930cb45e8f94cc7fc]
#
# patch "packages/tasks/task-boot.bb"
# from [0fdedbe09f9a03c68bf7b5ba674c82b029187bb3]
# to [f2c84552aa3961a5c659902a79d3519d7d8fc38a]
#
# patch "packages/tasks/task-proper-tools.bb"
# from [19579ef6eea2dd2ffcf3fc6b9647a580c5f51cab]
# to [cc5af44de4e3dd164c513eb397092d3291b2d647]
#
# patch "packages/u-boot/u-boot-git/beagleboard/base.patch"
# from [1135185807d979f189a4aa922827442a60400f0c]
# to [131ee68f67adb38f32a5f4ecfe1ab25729e8939b]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [a76a67d588b4bc029e9a3d3fd1f8d255af4ccc2c]
# to [91095d5509af9328f8d193b5251d464b08333d06]
#
# patch "packages/uicmoc/uicmoc4-native.inc"
# from [4c402959a827e4fca268fdf66ffb1970c81dfd02]
# to [043e25c5533489d6bcfe95d8ae39f63961957071]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
# from [7cc53a71e63f8787010e6481bcaf2f1d1958283a]
# to [53dc3b079efb3a707825659e794510ab71d98bbf]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.3.bb"
# from [7cc53a71e63f8787010e6481bcaf2f1d1958283a]
# to [d07679a6b088211ea65c2ce940cfaac2d902fc96]
#
# patch "packages/uicmoc/uicmoc4-native_4.4.0.bb"
# from [301657a33a03471124a9ed314c128a1d49dd97f9]
# to [3279313c21ce4a2e7869d37eb6ad6781132a9f42]
#
# patch "packages/util-linux-ng/util-linux-ng.inc"
# from [b7c335928a65a41a8c98d632b9009e69898d7d11]
# to [9c6e41ba232c2d1f3a02d2a0cafe2b665b7a4970]
#
============================================================
--- packages/abiword/abiword-plugins_2.6.4.bb d1fd52759d17edfde1c883a1c63346c786ba9807
+++ packages/abiword/abiword-plugins_2.6.4.bb d1fd52759d17edfde1c883a1c63346c786ba9807
@@ -0,0 +1,45 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "asio boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+# file://abiword-cxx-for-ld-fix.patch;patch=1 \
+ "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+#export LDFLAGS += " -lstdc++ "
+
+EXTRA_OECONF = " --enable-shared=yes \
+ --enable-static \
+ --without-libwmf \
+ --without-inter7eps \
+ --with-abiword=${WORKDIR}/abiword-${PV} \
+ --with-boost=${STAGING_DIR_HOST} \
+ --with-boost-thread=boost_thread-mt \
+ "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+ abiword_libdir = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+ do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+ do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
============================================================
--- packages/abiword/abiword_2.6.4.bb c206e4f1553666d98b19e12fbdb0b78763839f22
+++ packages/abiword/abiword_2.6.4.bb c206e4f1553666d98b19e12fbdb0b78763839f22
@@ -0,0 +1,10 @@
+require abiword-2.5.inc
+
+PR = "r1"
+
+RCONFLICTS = "abiword-embedded"
+
+FILES_${PN} += "${datadir}/mime-info"
+FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings"
+FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*"
+
============================================================
--- packages/asio/asio_1.1.1.bb 94c47ccdb0586b145409ff7b5a40cb1849191568
+++ packages/asio/asio_1.1.1.bb 94c47ccdb0586b145409ff7b5a40cb1849191568
@@ -0,0 +1,14 @@
+DESCRIPTION = "Asio"
+HOMEPAGE = "http://asio.sf.net/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Boost Software License"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/bind/bind-9.3.5-P1/conf.patch fa927c9c76b99962bb7a92d8ab0576e4ab88ba60
+++ packages/bind/bind-9.3.5-P1/conf.patch fa927c9c76b99962bb7a92d8ab0576e4ab88ba60
@@ -0,0 +1,301 @@
+diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0
+--- bind-9.3.1.orig/conf/db.0 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.0 2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,12 @@
++;
++; BIND reverse data file for broadcast zone
++;
++$TTL 604800
++@ IN SOA localhost. root.localhost. (
++ 1 ; Serial
++ 604800 ; Refresh
++ 86400 ; Retry
++ 2419200 ; Expire
++ 604800 ) ; Negative Cache TTL
++;
++@ IN NS localhost.
+diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127
+--- bind-9.3.1.orig/conf/db.127 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.127 2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND reverse data file for local loopback interface
++;
++$TTL 604800
++@ IN SOA localhost. root.localhost. (
++ 1 ; Serial
++ 604800 ; Refresh
++ 86400 ; Retry
++ 2419200 ; Expire
++ 604800 ) ; Negative Cache TTL
++;
++@ IN NS localhost.
++1.0.0 IN PTR localhost.
+diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty
+--- bind-9.3.1.orig/conf/db.empty 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.empty 2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,14 @@
++; BIND reverse data file for empty rfc1918 zone
++;
++; DO NOT EDIT THIS FILE - it is used for multiple zones.
++; Instead, copy it, edit named.conf, and use that copy.
++;
++$TTL 86400
++@ IN SOA localhost. root.localhost. (
++ 1 ; Serial
++ 604800 ; Refresh
++ 86400 ; Retry
++ 2419200 ; Expire
++ 86400 ) ; Negative Cache TTL
++;
++@ IN NS localhost.
+diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local
+--- bind-9.3.1.orig/conf/db.local 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.local 2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,13 @@
++;
++; BIND data file for local loopback interface
++;
++$TTL 604800
++@ IN SOA localhost. root.localhost. (
++ 1 ; Serial
++ 604800 ; Refresh
++ 86400 ; Retry
++ 2419200 ; Expire
++ 604800 ) ; Negative Cache TTL
++;
++@ IN NS localhost.
++@ IN A 127.0.0.1
+diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root
+--- bind-9.3.1.orig/conf/db.root 1970-01-01 01:00:00.000000000 +0100
++++ bind-9.3.1/conf/db.root 2005-07-10 22:14:00.000000000 +0200
+@@ -0,0 +1,45 @@
++
++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net.
++;; global options: printcmd
++;; Got answer:
++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944
++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13
++
++;; QUESTION SECTION:
++;. IN NS
++
++;; ANSWER SECTION:
++. 518400 IN NS A.ROOT-SERVERS.NET.
++. 518400 IN NS B.ROOT-SERVERS.NET.
++. 518400 IN NS C.ROOT-SERVERS.NET.
++. 518400 IN NS D.ROOT-SERVERS.NET.
++. 518400 IN NS E.ROOT-SERVERS.NET.
++. 518400 IN NS F.ROOT-SERVERS.NET.
++. 518400 IN NS G.ROOT-SERVERS.NET.
++. 518400 IN NS H.ROOT-SERVERS.NET.
++. 518400 IN NS I.ROOT-SERVERS.NET.
++. 518400 IN NS J.ROOT-SERVERS.NET.
++. 518400 IN NS K.ROOT-SERVERS.NET.
++. 518400 IN NS L.ROOT-SERVERS.NET.
++. 518400 IN NS M.ROOT-SERVERS.NET.
++
++;; ADDITIONAL SECTION:
++A.ROOT-SERVERS.NET. 3600000 IN A 198.41.0.4
++B.ROOT-SERVERS.NET. 3600000 IN %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdff33d19f55f5e1289901a814a5e358b4a4a9981 -rd52ba7ba4d60e822f2fe1c39db829edbfa8a115a
#
#
#
# delete "packages/linux/linux-openmoko-devel/defconfig-om-gta01"
#
# delete "packages/linux/linux-openmoko-devel/del-hardcoded-led-behaviour.patch"
#
# delete "packages/linux/linux-openmoko-devel/fix-defconfig-gta01.patch"
#
# rename "packages/linux/linux-openmoko-devel/defconfig-om-gta02"
# to "packages/linux/linux-openmoko-devel/defconfig-oe"
#
# patch "packages/linux/linux-openezx-devel_svn.bb"
# from [7bd4eadd5d685a33b182d47ad133fe9a1daf0863]
# to [7d1f3327e48c4f072a28d93609f49cfce8239dfa]
#
# patch "packages/linux/linux-openmoko-devel/defconfig-oe"
# from [720ccf8d31848113663470173d1e4ca94d2e448d]
# to [2718a78fdc1b4bb16308b28db21353815d3900c9]
#
# patch "packages/linux/linux-openmoko-devel_git.bb"
# from [97d07044ee9d02e743567f439f5ef24e85e8ad6f]
# to [a558ba890553e9ff9d3cb9f68b07df41b7dea683]
#
# patch "packages/linux/linux-openmoko_2.6.24+git.bb"
# from [f6554c25cbdf6ca9464d300be87c1ba691ea7a92]
# to [919295f566a486fe805a50645eab20b1f4744037]
#
============================================================
--- packages/linux/linux-openezx-devel_svn.bb 7bd4eadd5d685a33b182d47ad133fe9a1daf0863
+++ packages/linux/linux-openezx-devel_svn.bb 7d1f3327e48c4f072a28d93609f49cfce8239dfa
@@ -8,8 +8,8 @@ RPSRC = "http://www.rpsys.net/openzaurus
RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
-KERNEL_RELEASE = "2.6.24"
-KERNEL_PATCHES = "kernel-2.6.24.x-patches"
+KERNEL_RELEASE = "2.6.25"
+KERNEL_PATCHES = "kernel-${KERNEL_RELEASE}.x-patches"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
PR = "r0"
============================================================
--- packages/linux/linux-openmoko-devel/defconfig-om-gta02 720ccf8d31848113663470173d1e4ca94d2e448d
+++ packages/linux/linux-openmoko-devel/defconfig-oe 2718a78fdc1b4bb16308b28db21353815d3900c9
@@ -33,8 +33,8 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION="oe"
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -44,7 +44,8 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_USER_NS is not set
# CONFIG_PID_NS is not set
# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_FAIR_GROUP_SCHED is not set
@@ -1020,7 +1021,7 @@ CONFIG_POWER_SUPPLY=y
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
-CONFIG_APM_POWER=y
+# CONFIG_APM_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
CONFIG_BATTERY_BQ27000_HDQ=y
CONFIG_GTA02_HDQ=y
============================================================
--- packages/linux/linux-openmoko-devel_git.bb 97d07044ee9d02e743567f439f5ef24e85e8ad6f
+++ packages/linux/linux-openmoko-devel_git.bb a558ba890553e9ff9d3cb9f68b07df41b7dea683
@@ -14,14 +14,13 @@ UBOOT_ENTRYPOINT = "30008000"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "30008000"
-SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy"
+SRC_URI = "\
+ git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy \
+ file://defconfig-oe"
S = "${WORKDIR}/git"
-SRC_URI_append-om-gta02 = " file://del-hardcoded-led-behaviour.patch;patch=1"
-SRC_URI += "file://defconfig-${MACHINE}"
-
##############################################################
-# kernel image resides on a seperate flash partition (for now)
+# kernel image resides on a seperate flash partition
#
FILES_kernel-image = ""
ALLOW_EMPTY = "1"
@@ -45,6 +44,11 @@ do_configure_prepend() {
module_autoload_s3cmci = "s3cmci"
do_configure_prepend() {
- cp ${WORKDIR}/defconfig-${MACHINE} ${WORKDIR}/defconfig
+ install -m 0644 ${WORKDIR}/defconfig-oe ${WORKDIR}/defconfig
+ if [ ${MACHINE} == "om-gta01" ]; then
+ echo -n "fixing up configuration for Openmoko GTA01..."
+ sed -i -e s,CONFIG_S3C_LOWLEVEL_UART_PORT=2,CONFIG_S3C_LOWLEVEL_UART_PORT=0, ${WORKDIR}/defconfig
+ sed -i -e s,CONFIG_DEBUG_S3C_UART=2,CONFIG_DEBUG_S3C_UART=0, ${WORKDIR}/defconfig
+ echo "done"
+ fi
}
-
============================================================
--- packages/linux/linux-openmoko_2.6.24+git.bb f6554c25cbdf6ca9464d300be87c1ba691ea7a92
+++ packages/linux/linux-openmoko_2.6.24+git.bb 919295f566a486fe805a50645eab20b1f4744037
@@ -3,8 +3,7 @@ DESCRIPTION = "Linux 2.6.x (development)
DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
-PE = "1"
-PV = "${KERNEL_RELEASE}+git${SRCREV}"
+PV = "${KERNEL_RELEASE}+gitr${SRCREV}"
PR = "r0"
SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable"
More information about the Openembedded-commits
mailing list