[oe-commits] org.oe.dev merge of '1adf7728881d50d6f0c0d604d00e706cf049e597'

[mickeyl commit]

merge of '1adf7728881d50d6f0c0d604d00e706cf049e597'
     and 'c3529caf8553e1815756aba75bbc52d0f342e609'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a161860cf5907cbf76a33608823d587ec9c07d35
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a161860cf5907cbf76a33608823d587ec9c07d35
Files:
1
classes/distutils.bbclass
packages/abiword/abiword-embedded_2.5.2.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/abiword/abiword_2.5.2.bb
conf/machine/compulab-pxa270.conf
Diffs:

#
# mt diff -r1adf7728881d50d6f0c0d604d00e706cf049e597 -ra161860cf5907cbf76a33608823d587ec9c07d35
#
# 
# 
# patch "classes/distutils.bbclass"
#  from [b9234bdc78eb218048032cb9c9a74cc125e1f7b0]
#    to [539b0b48207ebc4a3d5c0eb1aabe41de88cc8922]
# 
============================================================
--- 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."


#
# mt diff -rc3529caf8553e1815756aba75bbc52d0f342e609 -ra161860cf5907cbf76a33608823d587ec9c07d35
#
# 
# 
# 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]
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [443c1803d7863d67b5739f263a3ddcb7473b2736]
#    to [2ec74f606d3e9e7457eb8ab16c8952481cca761a]
# 
============================================================
--- 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"
============================================================
--- conf/machine/compulab-pxa270.conf	443c1803d7863d67b5739f263a3ddcb7473b2736
+++ conf/machine/compulab-pxa270.conf	2ec74f606d3e9e7457eb8ab16c8952481cca761a
@@ -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,16 @@ 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 bitbake target
+#   - put the following in your local.conf
+#     - MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "mtd-utils"
+#     - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
+# now, when you build the angstrom-minimal-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
 
+