diff options
19 files changed, 96 insertions, 27 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index 8a34594a70..c07a9911cd 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -13,7 +13,8 @@ distutils_stage_headers() { } 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." diff --git a/classes/image.bbclass b/classes/image.bbclass index 248ccab60b..aa0c73adb7 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -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 diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 75c85e8f3d..53b0162eac 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -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 diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index dcf224f798..655d435994 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -29,8 +29,8 @@ PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12" 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" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 262f452058..72f652df55 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -40,6 +40,9 @@ SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" +# OpenMoko +SRCDATE_uboot-openmoko = "20070820" + # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index b0f6952eba..c82c2500d1 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -11,10 +11,12 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te" 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 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no- 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 + diff --git a/files/device_table-jlime.txt b/files/device_table-jlime.txt index 6c5d53d18e..d8fbc8e26a 100644 --- a/files/device_table-jlime.txt +++ b/files/device_table-jlime.txt @@ -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 - - - - diff --git a/files/device_table-minimal.txt b/files/device_table-minimal.txt index 04fcc413a2..495b5d5635 100644 --- a/files/device_table-minimal.txt +++ b/files/device_table-minimal.txt @@ -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 - - - diff --git a/files/device_table-slugos.txt b/files/device_table-slugos.txt index 185d70f6ea..17e8064b97 100644 --- a/files/device_table-slugos.txt +++ b/files/device_table-slugos.txt @@ -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 - - - diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt index ef81494ee4..cd5d5f7bc5 100644 --- a/files/device_table-unslung.txt +++ b/files/device_table-unslung.txt @@ -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 - - - - - diff --git a/packages/abiword/abiword-embedded_2.5.2.bb b/packages/abiword/abiword-embedded_2.5.2.bb new file mode 100644 index 0000000000..47cf9e03c0 --- /dev/null +++ b/packages/abiword/abiword-embedded_2.5.2.bb @@ -0,0 +1,10 @@ +require abiword-2.5.inc + +EXTRA_OECONF += "--enable-embedded" + +S = "${WORKDIR}/abiword-${PV}" + +RCONFLICTS = "abiword" +RPROVIDES += "abiword" + + diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb new file mode 100644 index 0000000000..54d87ac554 --- /dev/null +++ b/packages/abiword/abiword-plugins_2.5.2.bb @@ -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" + diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb new file mode 100644 index 0000000000..66d8fae0ad --- /dev/null +++ b/packages/abiword/abiword_2.5.2.bb @@ -0,0 +1,7 @@ +require abiword-2.5.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +RCONFLICTS = "abiword-embedded" diff --git a/packages/glibc/glibc-initial_2.6.bb b/packages/glibc/glibc-initial_2.6.1.bb index 0d4a79f2a4..0d4a79f2a4 100644 --- a/packages/glibc/glibc-initial_2.6.bb +++ b/packages/glibc/glibc-initial_2.6.1.bb diff --git a/packages/glibc/glibc-intermediate_2.6.bb b/packages/glibc/glibc-intermediate_2.6.1.bb index 7610f560a7..7610f560a7 100644 --- a/packages/glibc/glibc-intermediate_2.6.bb +++ b/packages/glibc/glibc-intermediate_2.6.1.bb diff --git a/packages/glibc/glibc_2.6.bb b/packages/glibc/glibc_2.6.1.bb index 87a99ebbe9..87a99ebbe9 100644 --- a/packages/glibc/glibc_2.6.bb +++ b/packages/glibc/glibc_2.6.1.bb diff --git a/packages/images/angstrom-minimal-image-with-mtd-utils.bb b/packages/images/angstrom-minimal-image-with-mtd-utils.bb new file mode 100644 index 0000000000..635833af4e --- /dev/null +++ b/packages/images/angstrom-minimal-image-with-mtd-utils.bb @@ -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" + diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index eff85aca45..ff14d95667 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "evas" -PR = "r1" +PR = "r2" do_stage() { distutils_stage_all diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb index 35fa1ccd62..181fd5086f 100644 --- a/packages/qt/qt4-x11-free_4.3.0.bb +++ b/packages/qt/qt4-x11-free_4.3.0.bb @@ -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}/ |