[oe-commits] org.oe.dev merge of '5f9ded38d3bb3f4a0369515dbb717e835f0acc61'
oe commit
oe at amethyst.openembedded.net
Mon Mar 31 22:29:43 UTC 2008
merge of '5f9ded38d3bb3f4a0369515dbb717e835f0acc61'
and '774a9654f13013fc4f169930d4cfec26a95b97e5'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 521b7fa5d0b9792727ae9419ddc71ebfa2650202
ViewMTN: http://monotone.openembedded.org/revision/info/521b7fa5d0b9792727ae9419ddc71ebfa2650202
Files:
1
packages/hostap/hostap-daemon-0.6.0
packages/hostap/hostap-daemon-0.6.3
packages/hostap/hostap-daemon_0.6.0.bb
packages/hostap/hostap-daemon_0.6.3.bb
contrib/mtn2git/update-script.example
packages/abiword/abiword-plugins_2.6.0.bb
packages/abiword/abiword_2.6.0.bb
packages/abiword/files/abiword-cxx-for-ld-fix.patch
classes/kernel.bbclass
packages/abiword/abiword-plugins_2.5.1.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/linux/linux-rt_2.6.24.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/zaurus-updater/zaurus-updater.bb
packages/libpixman/libpixman_0.9.6.bb
packages/libpixman/libpixman_0.10.0.bb
Diffs:
#
# mt diff -r5f9ded38d3bb3f4a0369515dbb717e835f0acc61 -r521b7fa5d0b9792727ae9419ddc71ebfa2650202
#
#
#
# rename "packages/hostap/hostap-daemon-0.6.0"
# to "packages/hostap/hostap-daemon-0.6.3"
#
# rename "packages/hostap/hostap-daemon_0.6.0.bb"
# to "packages/hostap/hostap-daemon_0.6.3.bb"
#
# add_file "contrib/mtn2git/update-script.example"
# content [9f8caa85b400e9a7af49d8714a42648ffc346027]
#
# add_file "packages/abiword/abiword-plugins_2.6.0.bb"
# content [08cb74f7ccc32068a49834d218b474e7f487b3d5]
#
# add_file "packages/abiword/abiword_2.6.0.bb"
# content [e1a10b5275d12dca63a83d0c19b8277c9cd110ea]
#
# add_file "packages/abiword/files/abiword-cxx-for-ld-fix.patch"
# content [273f436489f287d13297340c5a6475232a4f933e]
#
# patch "classes/kernel.bbclass"
# from [56eee918e2285b8298e9e2feecc353c0723683aa]
# to [a2023556ff7f2b754b62219b795ef6bf47185281]
#
# patch "packages/abiword/abiword-plugins_2.5.1.bb"
# from [62e4936aba824f0155caa54f5911ce2750c5a7ae]
# to [80bb349de2e542daecc78e094218894b5f117405]
#
# patch "packages/abiword/abiword-plugins_2.5.2.bb"
# from [b02d055a699a18d721d373c5bcbe26e5d8a5f882]
# to [156bd16e63ca8fba3be27dade721ca7936fbd5cf]
#
# patch "packages/linux/linux-rt_2.6.24.bb"
# from [29d97acddf75b09d01099358d07240db5d4e2353]
# to [108bbff7661bc9d0a62d80e522cfb37313ce823c]
#
# patch "packages/linux/linux.inc"
# from [0196432d82c97552c01b010a212e24c2a8b0016a]
# to [7bf95936e9aa2c19910b87746edc070ad1cdbea5]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [8cef3230be1ba924b6e2c80492f1092a17566910]
# to [801134850169bd093cb2c9401f2e93bbd3acc903]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [2440043a73616ef8837486eec4d51aa891d62868]
# to [6991c88082897d8ca8c8f3777423bdb092b34a0b]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [4eabbe972f1ffeca4ea26e4d897079e1542a5624]
# to [1698797d4e832dd0ac53b480d89c620c02d4add1]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [6e0132a319145e0bee0939723f38518cc48760b8]
# to [2b959c7a89c5e81e41024dbd651be2f09998f09e]
#
============================================================
--- contrib/mtn2git/update-script.example 9f8caa85b400e9a7af49d8714a42648ffc346027
+++ contrib/mtn2git/update-script.example 9f8caa85b400e9a7af49d8714a42648ffc346027
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export PATH=/home/zecke/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+
+cd $HOME/mtn2git-scm/oe-convert/
+
+# Update monotone
+mtn --db ../OE.mtn pull monotone.linuxtogo.org "org.openembedded.*"
+
+OLD_OE_DIR=openembedded-git.$$.$RANDOM
+
+git-clone -l openembedded-git $OLD_OE_DIR
+cp git-import-marks2 $OLD_OE_DIR/
+cp mtn2git-status.v2 $OLD_OE_DIR/
+cp mtn2git-marks $OLD_OE_DIR/
+
+cd openembedded-git
+# Convert (this could fail as our marks are not complete...) and we hardcode the revision
+#../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 2> /dev/null | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+
+
+
+# Push all changes to the server, update the master tag as well
+for branch in dev dreambox documentation oetest oz354x packaged-staging oz354fam083 angstrom-2007.12-stable entity stable;
+do
+ git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.$branch;
+done
+
+#dev is our master
+git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.dev:master;
+
============================================================
--- packages/abiword/abiword-plugins_2.6.0.bb 08cb74f7ccc32068a49834d218b474e7f487b3d5
+++ packages/abiword/abiword-plugins_2.6.0.bb 08cb74f7ccc32068a49834d218b474e7f487b3d5
@@ -0,0 +1,44 @@
+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"
+
+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=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --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.0.bb e1a10b5275d12dca63a83d0c19b8277c9cd110ea
+++ packages/abiword/abiword_2.6.0.bb e1a10b5275d12dca63a83d0c19b8277c9cd110ea
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
============================================================
--- packages/abiword/files/abiword-cxx-for-ld-fix.patch 273f436489f287d13297340c5a6475232a4f933e
+++ packages/abiword/files/abiword-cxx-for-ld-fix.patch 273f436489f287d13297340c5a6475232a4f933e
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac 2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac 2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+
+ AM_INIT_AUTOMAKE
+
============================================================
--- classes/kernel.bbclass 56eee918e2285b8298e9e2feecc353c0723683aa
+++ classes/kernel.bbclass a2023556ff7f2b754b62219b795ef6bf47185281
@@ -463,8 +463,8 @@ addtask sizecheck before do_install afte
addtask sizecheck before do_install after do_compile
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
@@ -475,22 +475,22 @@ do_deploy() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
- uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
rm -f linux.bin
else
${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
rm -f linux.bin.gz
gzip -9 linux.bin
- uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
rm -f linux.bin.gz
fi
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+ package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
fi
cd ${DEPLOY_DIR_IMAGE}
rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
+ package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
}
do_deploy[dirs] = "${S}"
============================================================
--- packages/abiword/abiword-plugins_2.5.1.bb 62e4936aba824f0155caa54f5911ce2750c5a7ae
+++ packages/abiword/abiword-plugins_2.5.1.bb 80bb349de2e542daecc78e094218894b5f117405
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
HOMEPAGE = "http://www.abiword.org"
SECTION = "x11/office"
LICENSE = "GPLv2"
============================================================
--- packages/abiword/abiword-plugins_2.5.2.bb b02d055a699a18d721d373c5bcbe26e5d8a5f882
+++ packages/abiword/abiword-plugins_2.5.2.bb 156bd16e63ca8fba3be27dade721ca7936fbd5cf
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
HOMEPAGE = "http://www.abiword.org"
SECTION = "x11/office"
LICENSE = "GPLv2"
============================================================
--- packages/linux/linux-rt_2.6.24.bb 29d97acddf75b09d01099358d07240db5d4e2353
+++ packages/linux/linux-rt_2.6.24.bb 108bbff7661bc9d0a62d80e522cfb37313ce823c
@@ -4,8 +4,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
@@ -24,18 +22,3 @@ SRC_URI_append_mpc8313e-rdb = "\
# file://mpc831x-nand.patch;patch=1 \
# file://mpc8313e-rdb-rtc.patch;patch=1 "
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
-addtask devicetree_image after do_deploy before do_package
-
============================================================
--- packages/linux/linux.inc 0196432d82c97552c01b010a212e24c2a8b0016a
+++ packages/linux/linux.inc 7bf95936e9aa2c19910b87746edc070ad1cdbea5
@@ -18,6 +18,23 @@ CMDLINE_append = " ${CMDLINE_DEBUG} "
CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
CMDLINE_append = " ${CMDLINE_DEBUG} "
+# Support for binary device tree generation
+
+KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
+KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+
+python __anonymous () {
+
+ import bb
+
+ devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
+ if devicetree:
+ depends = bb.data.getVar("DEPENDS", d, 1)
+ depends = "%s dtc-native" % depends
+ bb.data.setVar("DEPENDS", depends, d)
+}
+
do_configure_prepend() {
echo "" > ${S}/.config
@@ -106,5 +123,14 @@ do_compile_append() {
fi
}
+do_devicetree_image() {
+ if test -n "${KERNEL_DEVICETREE}" ; then
+ dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE}
+
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+ ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+ fi
+}
+
+addtask devicetree_image after do_deploy before do_package
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
============================================================
--- packages/linux/linux_2.6.23+2.6.24-rc5.bb 8cef3230be1ba924b6e2c80492f1092a17566910
+++ packages/linux/linux_2.6.23+2.6.24-rc5.bb 801134850169bd093cb2c9401f2e93bbd3acc903
@@ -64,15 +64,5 @@ python do_compulab_image() {
os.symlink(img_file, link_file)
}
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
+addtask compulab_image after do_deploy before do_package
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
-addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
============================================================
--- packages/linux/linux_2.6.23.bb 2440043a73616ef8837486eec4d51aa891d62868
+++ packages/linux/linux_2.6.23.bb 6991c88082897d8ca8c8f3777423bdb092b34a0b
@@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_avr32 = "1"
DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
DEFAULT_PREFERENCE_avr32 = "1"
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
-
PR = "r12"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
@@ -52,10 +49,6 @@ CMDLINE_cm-x270 = "console=${CMX270_CONS
CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
FILES_kernel-image_cm-x270 = ""
python do_compulab_image() {
@@ -93,16 +86,6 @@ python do_compulab_image() {
os.symlink(img_file, link_file)
}
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
============================================================
--- packages/linux/linux_2.6.24.bb 4eabbe972f1ffeca4ea26e4d897079e1542a5624
+++ packages/linux/linux_2.6.24.bb 1698797d4e832dd0ac53b480d89c620c02d4add1
@@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_ts72xx = "1"
DEFAULT_PREFERENCE_at32stk1000 = "1"
DEFAULT_PREFERENCE_ts72xx = "1"
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
PR = "r11"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
@@ -84,8 +82,6 @@ FILES_kernel-image_gesbc-9302 = ""
FILES_kernel-image_gesbc-9302 = ""
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
python do_compulab_image() {
import os
import os.path
@@ -122,16 +118,5 @@ python do_compulab_image() {
}
-do_devicetree_image() {
- if test -n "${DEVICETREE}" ; then
- dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- fi
-}
-
addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
============================================================
--- %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r774a9654f13013fc4f169930d4cfec26a95b97e5 -r521b7fa5d0b9792727ae9419ddc71ebfa2650202
#
#
#
# rename "packages/libpixman/libpixman_0.9.6.bb"
# to "packages/libpixman/libpixman_0.10.0.bb"
#
# add_file "packages/libpixman/libpixman_0.9.6.bb"
# content [6058783591b5e89abad921c75fba92e49effa18c]
#
============================================================
--- packages/libpixman/libpixman_0.9.6.bb 6058783591b5e89abad921c75fba92e49effa18c
+++ packages/libpixman/libpixman_0.9.6.bb 6058783591b5e89abad921c75fba92e49effa18c
@@ -0,0 +1,13 @@
+SECTION = "libs"
+PRIORITY = "optional"
+DESCRIPTION = "Low-level pixel manipulation library."
+LICENSE = "X11"
+SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz"
+S = "${WORKDIR}/pixman-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
More information about the Openembedded-commits
mailing list