[oe-commits] org.oe.dev merge of 'ccec70abe8a98a77de4b5435a375269cdd6a1879'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Nov 8 09:06:01 UTC 2007
merge of 'ccec70abe8a98a77de4b5435a375269cdd6a1879'
and 'cf6acfd742dff1aeba853a7c85797150c678b88a'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3cced2b64f528931352db3ed56bb25748413c4ac
ViewMTN: http://monotone.openembedded.org/revision/info/3cced2b64f528931352db3ed56bb25748413c4ac
Files:
1
packages/gpephone/libgemwidget/disable-tests.patch
packages/gpephone/libgemwidget_1.0.bb
conf/machine/em-x270.conf
Diffs:
#
# mt diff -rccec70abe8a98a77de4b5435a375269cdd6a1879 -r3cced2b64f528931352db3ed56bb25748413c4ac
#
#
#
# add_file "packages/gpephone/libgemwidget/disable-tests.patch"
# content [daf3d0a13202a894c2208e98ff4c93bbb1bd414f]
#
# add_file "packages/gpephone/libgemwidget_1.0.bb"
# content [00affe0fd0344c1c90d39d1466531dc2a2944941]
#
============================================================
--- packages/gpephone/libgemwidget/disable-tests.patch daf3d0a13202a894c2208e98ff4c93bbb1bd414f
+++ packages/gpephone/libgemwidget/disable-tests.patch daf3d0a13202a894c2208e98ff4c93bbb1bd414f
@@ -0,0 +1,8 @@
+--- libgemwidget-1.0/Makefile.am~ 2007-11-08 00:12:10.000000000 +0100
++++ libgemwidget-1.0/Makefile.am 2007-11-08 00:12:10.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = src include pixmaps test po
++SUBDIRS = src include pixmaps po
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libgemwidget.pc
============================================================
--- packages/gpephone/libgemwidget_1.0.bb 00affe0fd0344c1c90d39d1466531dc2a2944941
+++ packages/gpephone/libgemwidget_1.0.bb 00affe0fd0344c1c90d39d1466531dc2a2944941
@@ -0,0 +1,17 @@
+LICENSE = "LiPS"
+DESCRIPTION = "Extended widget library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+SRC_URI += " file://disable-tests.patch;patch=1"
+
+FILES_${PN} += "${datadir}/gem"
+
+do_stage () {
+ autotools_stage_all
+}
#
# mt diff -rcf6acfd742dff1aeba853a7c85797150c678b88a -r3cced2b64f528931352db3ed56bb25748413c4ac
#
#
#
# patch "conf/machine/em-x270.conf"
# from [5345e7b2b7ee8722993816968ec1019cd30e3669]
# to [5161d9a40fa0ff65ff1078f16f0702198aa872bc]
#
============================================================
--- conf/machine/em-x270.conf 5345e7b2b7ee8722993816968ec1019cd30e3669
+++ conf/machine/em-x270.conf 5161d9a40fa0ff65ff1078f16f0702198aa872bc
@@ -21,10 +21,10 @@ IMAGE_CMD_jffs2 = " \
ROOT_FLASH_SIZE = "128"
IMAGE_CMD_jffs2 = " \
-/usr/sbin/mkfs.jffs2 --root=${IMAGE_ROOTFS} \
- --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
- --eraseblock=0x20000 --pad --faketime -n; \
-/usr/sbin/sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ mkfs.jffs2 --root=${IMAGE_ROOTFS} \
+ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ --eraseblock=0x20000 --pad --faketime -n; \
+ sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-e 0x20000 -p; \
cd ${DEPLOY_DIR_IMAGE}; \
More information about the Openembedded-commits
mailing list