[oe-commits] org.oe.dev merge of '61fbd617cd31be5cf16e7fef30e206cf64890e27'
ifaistos commit
openembedded-commits at lists.openembedded.org
Wed Aug 22 16:06:11 UTC 2007
merge of '61fbd617cd31be5cf16e7fef30e206cf64890e27'
and '842df413eedc02ad89050dbcaa83f9139bfa98b5'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 98b14503e47a28e2ea274f0efb9dca54e5ce4037
ViewMTN: http://monotone.openembedded.org/revision.psp?id=98b14503e47a28e2ea274f0efb9dca54e5ce4037
Files:
1
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/glibc/glibc-initial_2.6.bb
packages/glibc/glibc-initial_2.6.1.bb
packages/glibc/glibc-intermediate_2.6.bb
packages/glibc/glibc-intermediate_2.6.1.bb
packages/glibc/glibc_2.6.bb
packages/glibc/glibc_2.6.1.bb
packages/abiword/abiword-embedded_2.5.2.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/abiword/abiword_2.5.2.bb
packages/images/angstrom-minimal-image-with-mtd-utils.bb
classes/distutils.bbclass
classes/image.bbclass
classes/rootfs_ipk.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/sane-srcdates.inc
conf/machine/compulab-pxa270.conf
files/device_table-jlime.txt
files/device_table-minimal.txt
files/device_table-slugos.txt
files/device_table-unslung.txt
packages/python/python-evas_cvs.bb
packages/qt/qt4-x11-free_4.3.0.bb
Diffs:
#
# mt diff -r61fbd617cd31be5cf16e7fef30e206cf64890e27 -r98b14503e47a28e2ea274f0efb9dca54e5ce4037
#
#
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [dc32409e752ed5db7c5885ac404c458875c5cb87]
# to [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
#
============================================================
--- packages/linux/linux-ml403-slab-2.6.x_git.bb dc32409e752ed5db7c5885ac404c458875c5cb87
+++ packages/linux/linux-ml403-slab-2.6.x_git.bb 9199fb7885a068659ab66b6897c7dcf1f94cf3c4
@@ -1,11 +1,10 @@ LICENSE = "GPL"
#Kernel for the xilinx-ml403 board using SecretLabs git tree
# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
# Released under the MIT license (see packages/COPYING)
SECTION = "kernel"
DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
LICENSE = "GPL"
-DEPENDS = "git-native"
-PR = "r1"
+PR = "r2"
PV = "2.6+git${SRCDATE}"
COMPATIBLE_MACHINE = "xilinx-ml403"
@@ -24,7 +23,19 @@ KERNEL_OUTPUT = "arch/ppc/boot/images/zI
KERNEL_IMAGETYPE = "zImage"
KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
+#make sure git-native gets build before as
+python __anonymous () {
+ import bb
+
+
+ depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
+ depends = depends + " git-native:do_populate_staging"
+ bb.data.setVarFlag('do_fetch', 'depends', depends, d)
+
+}
+
+
do_fetch () {
cd ${WORKDIR}
#
# mt diff -r842df413eedc02ad89050dbcaa83f9139bfa98b5 -r98b14503e47a28e2ea274f0efb9dca54e5ce4037
#
#
#
# rename "packages/glibc/glibc-initial_2.6.bb"
# to "packages/glibc/glibc-initial_2.6.1.bb"
#
# rename "packages/glibc/glibc-intermediate_2.6.bb"
# to "packages/glibc/glibc-intermediate_2.6.1.bb"
#
# rename "packages/glibc/glibc_2.6.bb"
# to "packages/glibc/glibc_2.6.1.bb"
#
# add_file "packages/abiword/abiword-embedded_2.5.2.bb"
# content [f5eb7c78697311dd47c0487749b1225434ed84f9]
#
# add_file "packages/abiword/abiword-plugins_2.5.2.bb"
# content [380a4ea0f3f1f3606d2a65ae330bb4bc025f1452]
#
# add_file "packages/abiword/abiword_2.5.2.bb"
# content [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
#
# add_file "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
# content [5788c842aec73348a25d838114582c5b6e44c17e]
#
# patch "classes/distutils.bbclass"
# from [b9234bdc78eb218048032cb9c9a74cc125e1f7b0]
# to [539b0b48207ebc4a3d5c0eb1aabe41de88cc8922]
#
# patch "classes/image.bbclass"
# from [6bfd73489be48ca3395112458e8092971909dc82]
# to [595cc43abdb263656c0634c60c8284c213ab4af9]
#
# patch "classes/rootfs_ipk.bbclass"
# from [9592480b5cedd24c510d2644e968734f65965f9a]
# to [731a40ee3d0b40e7e6d9bdc838728a484250233e]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [783879e52665932b7ebc461dd753e4481635d326]
# to [8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [ccb3a58cdc94f8b3782b9c1addc3638f883f4b83]
# to [f1ab446a8fd03f4c3c21fe929989805983c34b8d]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [443c1803d7863d67b5739f263a3ddcb7473b2736]
# to [0ae0bc3504f44c5c874639256fb2920d10ca79ce]
#
# patch "files/device_table-jlime.txt"
# from [9396d11246737c79494de74f3f4b47b18cbb26f4]
# to [f966a7b8e72a7ba7c7567af6395ca8a7cd2a3e79]
#
# patch "files/device_table-minimal.txt"
# from [f1e4c99637a1cd0b786d168124e5233b7034166b]
# to [798d81ecd7eccc86f66cf37de0ff939fcedaf969]
#
# patch "files/device_table-slugos.txt"
# from [109a9083ab4f9ade217e31866977e14774016fec]
# to [28589cde378dd2c30fc023812dd0c536c9ef5545]
#
# patch "files/device_table-unslung.txt"
# from [e027f5bfb711476c2c67d123afad5b9894be7949]
# to [b4d14abfc8b96ef6eac361dd2d22c80f0b585608]
#
# patch "packages/python/python-evas_cvs.bb"
# from [bb7b8c9bb13d246c9bb4f67239195ed7596be3e9]
# to [38264868dc3fb93df627bbdca124ddae4143423a]
#
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
# from [9cc09d8cdd4f53ae7503b1a7dccf8907c9472431]
# to [b40fdda327f4da1d37441a34c084f97335ce58a5]
#
============================================================
--- packages/abiword/abiword-embedded_2.5.2.bb f5eb7c78697311dd47c0487749b1225434ed84f9
+++ packages/abiword/abiword-embedded_2.5.2.bb f5eb7c78697311dd47c0487749b1225434ed84f9
@@ -0,0 +1,10 @@
+require abiword-2.5.inc
+
+EXTRA_OECONF += "--enable-embedded"
+
+S = "${WORKDIR}/abiword-${PV}"
+
+RCONFLICTS = "abiword"
+RPROVIDES += "abiword"
+
+
============================================================
--- packages/abiword/abiword-plugins_2.5.2.bb 380a4ea0f3f1f3606d2a65ae330bb4bc025f1452
+++ packages/abiword/abiword-plugins_2.5.2.bb 380a4ea0f3f1f3606d2a65ae330bb4bc025f1452
@@ -0,0 +1,39 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+DEFAULT_PREFERENCE = "-1"
+
+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 \
+ "
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = " --without-libwmf \
+ --without-inter7eps \
+ --with-abiword=${WORKDIR}/abiword-${PV} \
+ --with-boost=${STAGINC_INCDIR}/../ \
+ "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+ abiword_libdir = bb.data.expand('${libdir}/abiword-2.5/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.5/plugins/.debug"
+
============================================================
--- packages/abiword/abiword_2.5.2.bb c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
+++ packages/abiword/abiword_2.5.2.bb c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1
@@ -0,0 +1,7 @@
+require abiword-2.5.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+
+RCONFLICTS = "abiword-embedded"
============================================================
--- packages/images/angstrom-minimal-image-with-mtd-utils.bb 5788c842aec73348a25d838114582c5b6e44c17e
+++ packages/images/angstrom-minimal-image-with-mtd-utils.bb 5788c842aec73348a25d838114582c5b6e44c17e
@@ -0,0 +1,7 @@
+# this image was created for use with the compulab cm-x270 platform
+# for creating a small initramfs image in NOR flash that can be used
+# to program the NAND flash.
+
+require angstrom-minimal-image.bb
+RDEPENDS += "mtd-utils"
+
============================================================
--- classes/distutils.bbclass b9234bdc78eb218048032cb9c9a74cc125e1f7b0
+++ classes/distutils.bbclass 539b0b48207ebc4a3d5c0eb1aabe41de88cc8922
@@ -13,7 +13,8 @@ distutils_stage_all() {
}
distutils_stage_all() {
- PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
+ install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages
+ PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \
oefatal "python setup.py install (stage) execution failed."
============================================================
--- classes/image.bbclass 6bfd73489be48ca3395112458e8092971909dc82
+++ classes/image.bbclass 595cc43abdb263656c0634c60c8284c213ab4af9
@@ -71,7 +71,6 @@ fakeroot do_rootfs () {
rm -rf ${IMAGE_ROOTFS}
if [ "${USE_DEVFS}" != "1" ]; then
- mkdir -p ${IMAGE_ROOTFS}/dev
for devtable in ${@get_devtable_list(d)}; do
makedevs -r ${IMAGE_ROOTFS} -D $devtable
done
============================================================
--- classes/rootfs_ipk.bbclass 9592480b5cedd24c510d2644e968734f65965f9a
+++ classes/rootfs_ipk.bbclass 731a40ee3d0b40e7e6d9bdc838728a484250233e
@@ -37,7 +37,6 @@ fakeroot rootfs_ipk_do_rootfs () {
rootfs_ipk_do_indexes
- mkdir -p ${IMAGE_ROOTFS}/dev
mkdir -p ${T}
#Add deploy/ipk as well for backward compat
============================================================
--- conf/distro/angstrom-2008.1.conf 783879e52665932b7ebc461dd753e4481635d326
+++ conf/distro/angstrom-2008.1.conf 8a3187bfeabfc7d9f5c299a7ba5cd346e3aba275
@@ -29,8 +29,8 @@ PREFERRED_VERSION_linux-libc-headers = "
PREFERRED_VERSION_linux-libc-headers = "2.6.22"
#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc = "2.6"
-PREFERRED_VERSION_glibc-intermediate = "2.6"
-PREFERRED_VERSION_glibc-initial = "2.6"
+PREFERRED_VERSION_glibc = "2.6.1"
+PREFERRED_VERSION_glibc-intermediate = "2.6.1"
+PREFERRED_VERSION_glibc-initial = "2.6.1"
============================================================
--- conf/distro/include/sane-srcdates.inc ccb3a58cdc94f8b3782b9c1addc3638f883f4b83
+++ conf/distro/include/sane-srcdates.inc f1ab446a8fd03f4c3c21fe929989805983c34b8d
@@ -40,6 +40,9 @@ SRCDATE_zaurusd ?= "20060628"
SRCDATE_web ?= "20060613"
SRCDATE_zaurusd ?= "20060628"
+# OpenMoko
+SRCDATE_uboot-openmoko = "20070820"
+
# GPE
SRCDATE_dasher-gpe ?= "20060814"
SRCDATE_rosetta ?= "20060804"
============================================================
--- conf/machine/compulab-pxa270.conf 443c1803d7863d67b5739f263a3ddcb7473b2736
+++ conf/machine/compulab-pxa270.conf 0ae0bc3504f44c5c874639256fb2920d10ca79ce
@@ -11,10 +11,12 @@ require conf/machine/include/tune-xscale
require conf/machine/include/tune-xscale.conf
-# used by sysvinit_2
+# used by sysvinit_2 package, so rebuild this
+# package if you change the SERIAL_CONSOLE setting
# the following is the for the cm-x270 L module
# I think the W module would use ttyS0, but has
-# not been tested
+# not been tested. This can be overwritten in
+# local.conf
SERIAL_CONSOLE ?= "38400 ttyS1"
# used by opie-collections.inc
@@ -32,9 +34,15 @@ MACHINE_FEATURES = "kernel26 pcmcia usbh
MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
-# the following is require for building tiny images that can fit in NOR flash.
-# recommend using uclibc, Angstrom, and angstrom-minimal-image bitbake target
-# note, if these are define in your local.conf, they will be overwritten
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "mtd-utils ipkg"
-IMAGE_FSTYPES ?= "jffs2 tar cpio.gz"
+# to program the compulab NAND flash, the following scheme is suggested. Create
+# a small rootfs that can fit in NOR flash using the following config:
+# - Angstrom distro
+# - uclibc
+# - angstrom-minimal-image-with-mtd-utils bitbake target
+# - put the following in your local.conf
+# - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
+# now, when you build the image, a cpio.gz will be generated
+# that can be used as an initramfs. You can boot into this image and then
+# program the main rootfs jffs2 image in NAND flash using mtd-utils
+
============================================================
--- files/device_table-jlime.txt 9396d11246737c79494de74f3f4b47b18cbb26f4
+++ files/device_table-jlime.txt f966a7b8e72a7ba7c7567af6395ca8a7cd2a3e79
@@ -1,4 +1,5 @@
-/dev/initctl p 600 0 0 - - - -
+/dev d 755 0 0 - - - - -
+/dev/initctl p 600 0 0 - - - - -
/dev/dsp c 644 0 0 14 3 - - -
/dev/apm_bios c 660 0 46 10 134 - - -
/dev/fb0 c 600 0 0 29 0 - - -
@@ -18,6 +19,3 @@
/dev/console c 662 0 5 5 1 - -
/dev/urandom c 644 0 0 1 9 - - -
/dev/random c 644 0 0 1 8 - - -
-/bin/tinylogin f 4755 0 0 - - - -
-/bin/mount f 4755 0 0 - - - -
-/bin/umount f 4755 0 0 - - - -
============================================================
--- files/device_table-minimal.txt f1e4c99637a1cd0b786d168124e5233b7034166b
+++ files/device_table-minimal.txt 798d81ecd7eccc86f66cf37de0ff939fcedaf969
@@ -8,7 +8,8 @@
# b Block special device file
# p Fifo (named pipe)
-/dev/initctl p 600 0 0 - - - -
+/dev d 755 0 0 - - - - -
+/dev/initctl p 600 0 0 - - - - -
/dev/apm_bios c 660 0 46 10 134 - - -
/dev/fb0 c 600 0 0 29 0 - - -
/dev/hda b 660 0 6 3 0 - - -
@@ -21,12 +22,9 @@
/dev/tty c 666 0 5 4 0 0 1 9
/dev/ttyS c 640 0 5 4 64 0 1 1
/dev/ttySA c 640 0 5 204 5 0 1 1
-/dev/zero c 644 0 0 1 5 - -
+/dev/zero c 644 0 0 1 5 - - -
/dev/mtd c 660 0 6 90 0 0 2 8
/dev/mtdblock b 640 0 0 31 0 0 1 8
-/dev/console c 662 0 5 5 1 - -
-/bin/tinylogin f 4755 0 0 - - - -
-/bin/mount f 4755 0 0 - - - -
-/bin/umount f 4755 0 0 - - - -
+/dev/console c 662 0 5 5 1 - - -
/dev/random c 644 0 0 1 8 - - -
/dev/urandom c 644 0 0 1 9 - - -
============================================================
--- files/device_table-slugos.txt 109a9083ab4f9ade217e31866977e14774016fec
+++ files/device_table-slugos.txt 28589cde378dd2c30fc023812dd0c536c9ef5545
@@ -8,6 +8,7 @@
# c Character special device file
# b Block special device file
# p Fifo (named pipe)
+/dev d 755 0 0 - - - - -
/dev/buzzer c 660 0 0 13 64 - - -
/dev/console c 622 0 0 5 1 - - -
/dev/kmem c 640 0 0 1 2 - - -
============================================================
--- files/device_table-unslung.txt e027f5bfb711476c2c67d123afad5b9894be7949
+++ files/device_table-unslung.txt b4d14abfc8b96ef6eac361dd2d22c80f0b585608
@@ -49,4 +49,3 @@
/dev/urandom c 644 0 0 1 9 - - -
/dev/video c 664 0 0 81 0 0 1 4
/dev/zero c 666 0 0 1 5 - - -
-/bin/tinylogin f 6755 0 0 - - - - -
============================================================
--- packages/python/python-evas_cvs.bb bb7b8c9bb13d246c9bb4f67239195ed7596be3e9
+++ packages/python/python-evas_cvs.bb 38264868dc3fb93df627bbdca124ddae4143423a
@@ -1,7 +1,7 @@ DEPENDS += "evas"
require python-efl.inc
DEPENDS += "evas"
-PR = "r1"
+PR = "r2"
do_stage() {
distutils_stage_all
============================================================
--- packages/qt/qt4-x11-free_4.3.0.bb 9cc09d8cdd4f53ae7503b1a7dccf8907c9472431
+++ packages/qt/qt4-x11-free_4.3.0.bb b40fdda327f4da1d37441a34c084f97335ce58a5
@@ -77,8 +77,8 @@ do_stage() {
install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri
- for pc in ${STAGING_QT_DIR}/lib/pkgconfig/Qt{AssistantClient,DBus,Test,UiTools}.pc ; do
- sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' $pc
+ for pcc in AssistantClient DBus Test UiTools ; do
+ sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc
done
for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
install -m 0644 $pc ${PKG_CONFIG_PATH}/
More information about the Openembedded-commits
mailing list