[oe-commits] org.oe.dev merge of '1d278c3b71375a6041cbf9533116bfe704ac580f'
xora commit
openembedded-commits at lists.openembedded.org
Wed Oct 10 09:32:23 UTC 2007
merge of '1d278c3b71375a6041cbf9533116bfe704ac580f'
and '8cb6ae30ccad06810ab648cf79c4f241eb0a6d4f'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: dbb53fe45696a4f12d4e96c449c65f691e0e8346
ViewMTN: http://monotone.openembedded.org/revision/info/dbb53fe45696a4f12d4e96c449c65f691e0e8346
Files:
1
conf/bitbake.conf
conf/machine/alix.conf
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
conf/machine/bd-neon.conf
conf/machine/fic-gta02.conf
packages/mtd/mtd-utils-native.inc
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/python/python-pygobject-native_2.12.3.bb
Diffs:
#
# mt diff -r1d278c3b71375a6041cbf9533116bfe704ac580f -rdbb53fe45696a4f12d4e96c449c65f691e0e8346
#
#
#
# patch "conf/bitbake.conf"
# from [51abbfe5d5cdfa25444a755852f26e72fd9b6964]
# to [b85561e831e643a7d8abd91fd97e935e8b1285e6]
#
# patch "conf/machine/alix.conf"
# from [53d221f82557e515e40af9234547d38664a2dff9]
# to [90e038b4d86ef5e8c9da5f1dd54113de80f39dee]
#
# patch "conf/machine/at91sam9260ek.conf"
# from [b2ddde0c3e0cef0cf1b8e532844b6ef3fe88dc8d]
# to [38a8c8ebda8664ef620ae8fafbb355c20430263e]
#
# patch "conf/machine/at91sam9261ek.conf"
# from [204547873976da00125a4cbc9c924be5401f0a02]
# to [5fe4817f77fa73006d1e4c63a597bcf912350daf]
#
# patch "conf/machine/bd-neon.conf"
# from [8163d0993343ccd839b0f5feeae78282aea520b0]
# to [56e19dd3d98c36386762f59131fe8f87fb92ee0d]
#
# patch "conf/machine/fic-gta02.conf"
# from [03635ef8706b0a62df25a7e8295733d57bbdf8e6]
# to [58d451ef05171ddd801a8f0b60c8a31bfd0c4b56]
#
# patch "packages/mtd/mtd-utils-native.inc"
# from [0309b110bda9ca2e08821d9b012301798020d40f]
# to [bb4d53a8d3252ecdb226d54e867ad04c6414b94c]
#
============================================================
--- conf/bitbake.conf 51abbfe5d5cdfa25444a755852f26e72fd9b6964
+++ conf/bitbake.conf b85561e831e643a7d8abd91fd97e935e8b1285e6
@@ -210,7 +210,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --r
IMAGE_CMD = ""
IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-IMAGE_CMD_yaffs2 = "mkyaffs2image ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_yaffs2 = "mkyaffs2image 1 ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2 ${EXTRA_IMAGECMD}"
IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
============================================================
--- conf/machine/alix.conf 53d221f82557e515e40af9234547d38664a2dff9
+++ conf/machine/alix.conf 90e038b4d86ef5e8c9da5f1dd54113de80f39dee
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Alix
-#@DESCRIPTION: Machine configuration for PC Engines Alix1c board
+#@DESCRIPTION: Machine.inciguration for PC Engines Alix1c board
#
# http://pcengines.ch/alix1c.htm
@@ -17,7 +17,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext
MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
-require conf/machine/include/tune-geodelx.conf
+require.inc/machine/include/tune-geodelx.inc
IMAGE_FSTYPES += "tar.gz"
============================================================
--- conf/machine/at91sam9260ek.conf b2ddde0c3e0cef0cf1b8e532844b6ef3fe88dc8d
+++ conf/machine/at91sam9260ek.conf 38a8c8ebda8664ef620ae8fafbb355c20430263e
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+KERNEL_IMAGETYPE = "uImage"
+
#don't try to access tty1
USE_VT = "0"
@@ -17,4 +19,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-e
SERIAL_CONSOLE = "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+require.inc/machine/include/tune-arm926ejs.inc
-require conf/machine/include/tune-arm926ejs.conf
============================================================
--- conf/machine/at91sam9261ek.conf 204547873976da00125a4cbc9c924be5401f0a02
+++ conf/machine/at91sam9261ek.conf 5fe4817f77fa73006d1e4c63a597bcf912350daf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@Name: Atmel AT91SAM9261EK Development Platform
-#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
+#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+KERNEL_IMAGETYPE = "uImage"
+
#don't try to access tty1
USE_VT = "0"
@@ -17,4 +19,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-e
SERIAL_CONSOLE = "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+require.inc/machine/include/tune-arm926ejs.inc
-require conf/machine/include/tune-arm926ejs.conf
============================================================
--- conf/machine/bd-neon.conf 8163d0993343ccd839b0f5feeae78282aea520b0
+++ conf/machine/bd-neon.conf 56e19dd3d98c36386762f59131fe8f87fb92ee0d
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: Boundary Devices NEON
-#@DESCRIPTION: Machine configuration for the Boundary Devices NEON board
+#@DESCRIPTION: Machine.inciguration for the Boundary Devices NEON board
#
# Hardware-based properties
@@ -9,10 +9,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require.inc/machine/include/tune-xscale.inc
# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.conf
+#require.inc/machine/include/tune-iwmmxt.inc
ROOT_FLASH_SIZE = "60"
VOLATILE_STORAGE_SIZE = "128"
============================================================
--- conf/machine/fic-gta02.conf 03635ef8706b0a62df25a7e8295733d57bbdf8e6
+++ conf/machine/fic-gta02.conf 58d451ef05171ddd801a8f0b60c8a31bfd0c4b56
@@ -44,3 +44,6 @@ include conf/machine/include/tune-arm920
# tune for S3C24x0
include conf/machine/include/tune-arm920t.inc
+
+# build YAFFS2
+IMAGE_FSTYPES =+ "yaffs2"
============================================================
--- packages/mtd/mtd-utils-native.inc 0309b110bda9ca2e08821d9b012301798020d40f
+++ packages/mtd/mtd-utils-native.inc bb4d53a8d3252ecdb226d54e867ad04c6414b94c
@@ -1,10 +1,4 @@ FILESDIR = "${@os.path.dirname(bb.data.g
inherit native
DEPENDS = "zlib-native lzo-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
-do_stage () {
- for binary in ${mtd_utils}; do
- install -m 0755 $binary ${STAGING_BINDIR}
- done
-}
-
#
# mt diff -r8cb6ae30ccad06810ab648cf79c4f241eb0a6d4f -rdbb53fe45696a4f12d4e96c449c65f691e0e8346
#
#
#
# delete "packages/python/python-pygobject-native_2.12.2.bb"
#
# delete "packages/python/python-pygobject_2.12.2.bb"
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [3c5317edbfb2de05bfdcc53497f5a76d49e833db]
# to [d45c132200ab0a148cc9c2d04e54ecf0bcf67549]
#
# patch "packages/python/python-pygobject-native_2.12.3.bb"
# from [b12c35aa95676b05bbac981e68101d677cf0edcf]
# to [e881bce25bd043f3122882e8e1b3b0605b632c1c]
#
============================================================
--- packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb 3c5317edbfb2de05bfdcc53497f5a76d49e833db
+++ packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb d45c132200ab0a148cc9c2d04e54ecf0bcf67549
@@ -1,6 +1,6 @@ inherit native
require gtk+_${PV}.bb
inherit native
-DEPENDS = "jpeg-native libpng-native"
+DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native"
S = "${WORKDIR}/gtk+-${PV}"
FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
SRC_URI += "file://reduce-dependencies.patch;patch=1"
============================================================
--- packages/python/python-pygobject-native_2.12.3.bb b12c35aa95676b05bbac981e68101d677cf0edcf
+++ packages/python/python-pygobject-native_2.12.3.bb e881bce25bd043f3122882e8e1b3b0605b632c1c
@@ -1,6 +1,6 @@ require python-pygobject_${PV}.bb
require python-pygobject_${PV}.bb
-DEPENDS = "python-native"
+DEPENDS = "python-native glib-2.0-native"
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 "
More information about the Openembedded-commits
mailing list