[oe-commits] org.oe.dev merge of '298797d86056bd55b8e0191685cb8ae42de55f7d'

mickeyl commit openembedded-commits at lists.openembedded.org
Wed Feb 6 16:49:02 UTC 2008


merge of '298797d86056bd55b8e0191685cb8ae42de55f7d'
     and 'e3a17e2ff263cac6d4b035034dc79a0e05fc548d'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9549dfd1394792797ed243c1084dd74eb06e0a07
ViewMTN: http://monotone.openembedded.org/revision/info/9549dfd1394792797ed243c1084dd74eb06e0a07
Files:
1
packages/libglade/libglade-2.0.1
packages/libglade/libglade-2.0.1/glade-cruft.patch
packages/libglade/libglade-2.4.0
packages/libglade/libglade-2.4.0/glade-cruft.patch
packages/libglade/libglade-2.4.0/no-xml2.patch
packages/libglade/libglade-2.4.2
packages/libglade/libglade-2.4.2/glade-cruft.patch
packages/libglade/libglade-2.4.2/no-xml2.patch
packages/libglade/libglade-2.5.1
packages/libglade/libglade-2.5.1/glade-cruft.patch
packages/libglade/libglade-2.5.1/no-xml2.patch
packages/libglade/libglade-2.0.1/gtk-2.0.m4
packages/libglade/files/gtk-2.0.m4
packages/libglade/libglade-2.5.1/no-deprecation.patch
packages/libglade/files/no-deprecation.patch
packages/libglade/libglade-2.6.2
packages/libglade/files
packages/libglade/libglade_2.6.2.bb
packages/libglade/libglade.inc
packages/postgresql/postgresql_8.2.4.bb
packages/postgresql/postgresql.inc
contrib/image-convert
contrib/image-convert/README
contrib/image-convert/cpio2tar
contrib/image-convert/tar2ext2
contrib/image-convert/tar2ext2.mount
contrib/image-convert/tar2jffs
packages/initrdscripts/files/90-check-modules.sh
packages/initrdscripts/initramfs-module-check-modules_1.0.bb
packages/images/initramfs-bootmenu-image.bb
packages/libglade/libglade_2.0.1.bb
packages/libglade/libglade_2.4.0.bb
packages/libglade/libglade_2.4.2.bb
packages/libglade/libglade_2.5.1.bb
packages/postgresql/postgresql_8.1.4.bb
packages/postgresql/postgresql_8.1.8.bb
mtn:execute
true
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r298797d86056bd55b8e0191685cb8ae42de55f7d -r9549dfd1394792797ed243c1084dd74eb06e0a07
#
# 
# 
# delete "packages/libglade/libglade-2.0.1"
# 
# delete "packages/libglade/libglade-2.0.1/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.0"
# 
# delete "packages/libglade/libglade-2.4.0/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.0/no-xml2.patch"
# 
# delete "packages/libglade/libglade-2.4.2"
# 
# delete "packages/libglade/libglade-2.4.2/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.4.2/no-xml2.patch"
# 
# delete "packages/libglade/libglade-2.5.1"
# 
# delete "packages/libglade/libglade-2.5.1/glade-cruft.patch"
# 
# delete "packages/libglade/libglade-2.5.1/no-xml2.patch"
# 
# rename "packages/libglade/libglade-2.0.1/gtk-2.0.m4"
#     to "packages/libglade/files/gtk-2.0.m4"
# 
# rename "packages/libglade/libglade-2.5.1/no-deprecation.patch"
#     to "packages/libglade/files/no-deprecation.patch"
# 
# rename "packages/libglade/libglade-2.6.2"
#     to "packages/libglade/files"
# 
# rename "packages/libglade/libglade_2.6.2.bb"
#     to "packages/libglade/libglade.inc"
# 
# rename "packages/postgresql/postgresql_8.2.4.bb"
#     to "packages/postgresql/postgresql.inc"
# 
# add_dir "contrib/image-convert"
# 
# add_file "contrib/image-convert/README"
#  content [6a51a30551e511575545a5fd8f73323e24a5a25e]
# 
# add_file "contrib/image-convert/cpio2tar"
#  content [e07f0f5d36511dd5de463b7f681d718aa5a217a0]
# 
# add_file "contrib/image-convert/tar2ext2"
#  content [d85040f059d884124f04ced0190c90dd4f07e0aa]
# 
# add_file "contrib/image-convert/tar2ext2.mount"
#  content [f3a784276701f55e27d354d61098277d73ad6103]
# 
# add_file "contrib/image-convert/tar2jffs"
#  content [351ffdf2f7346259f133eeed2e6477c83e34d59a]
# 
# add_file "packages/initrdscripts/files/90-check-modules.sh"
#  content [e60f755f3b8a6d72a799b68ff1a7291714bce727]
# 
# add_file "packages/initrdscripts/initramfs-module-check-modules_1.0.bb"
#  content [fbcef5b65fba763e3f80cb8690e058b469db5f03]
# 
# add_file "packages/libglade/libglade_2.6.2.bb"
#  content [260a55eda5df2583b5a81605299e62f43424f7c7]
# 
# add_file "packages/postgresql/postgresql_8.2.4.bb"
#  content [41ca5b2fb5d019ac39217a5c0179b31e6f22ec24]
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [8f1db3a032593d55326052d8031210f27d4194a9]
#    to [c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8]
# 
# patch "packages/libglade/libglade.inc"
#  from [d94670ece5e8b9e8e3e0ba00b7744b565be182af]
#    to [436c12a98f08dbbdf23435a5f7427334a373b13b]
# 
# patch "packages/libglade/libglade_2.0.1.bb"
#  from [5b9997972462185f7650879d29314cf970269214]
#    to [4f7237e7991a74e49681d098a30a11727f4f6eda]
# 
# patch "packages/libglade/libglade_2.4.0.bb"
#  from [1522a52bfc4e1fd114cbcbdf0dcc668d5d2ae51d]
#    to [4e7c0d5e52113288c7c519a8b542e7638929bc46]
# 
# patch "packages/libglade/libglade_2.4.2.bb"
#  from [77537a247a98aa71ce5b3b06eb9ab78407ee23a3]
#    to [883f2c0f0b8d2ec182afa3f3cd1b08c0c0d80257]
# 
# patch "packages/libglade/libglade_2.5.1.bb"
#  from [ea9815d992df837e1c5913b615a6ea5130f2d9e5]
#    to [71f7284eedd6ea02babe87719f55b96727f9cb09]
# 
# patch "packages/postgresql/postgresql.inc"
#  from [969bc54ca34868f98644e9c9079ec2525cc08bbc]
#    to [e37431b7065b95ed185a1fa0cc6c30c0d2898034]
# 
# patch "packages/postgresql/postgresql_8.1.4.bb"
#  from [98fe892b8cf4a6013e48a0e9e68aca394fbe2e47]
#    to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
# 
# patch "packages/postgresql/postgresql_8.1.8.bb"
#  from [3457236ec656fc67c87d390af818ef6b2f5b9f75]
#    to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
# 
#   set "contrib/image-convert/cpio2tar"
#  attr "mtn:execute"
# value "true"
# 
#   set "contrib/image-convert/tar2ext2"
#  attr "mtn:execute"
# value "true"
# 
#   set "contrib/image-convert/tar2ext2.mount"
#  attr "mtn:execute"
# value "true"
# 
#   set "contrib/image-convert/tar2jffs"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- contrib/image-convert/README	6a51a30551e511575545a5fd8f73323e24a5a25e
+++ contrib/image-convert/README	6a51a30551e511575545a5fd8f73323e24a5a25e
@@ -0,0 +1,5 @@
+This directory contains scripts to convert (root) filesystem images from one
+format to another. While OpenEmbedded has extensive support for generating
+images in various formats, sometimes it may be useful/needed to convert
+already existing image.
+
============================================================
--- contrib/image-convert/cpio2tar	e07f0f5d36511dd5de463b7f681d718aa5a217a0
+++ contrib/image-convert/cpio2tar	e07f0f5d36511dd5de463b7f681d718aa5a217a0
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+cd scratch; gzip -d -c ../$1 | cpio -i --make-directories; \
+cd ..; \
+tar -cj -C scratch -f $(basename $1 .cpio.gz).tar.bz2 ."
============================================================
--- contrib/image-convert/tar2ext2	d85040f059d884124f04ced0190c90dd4f07e0aa
+++ contrib/image-convert/tar2ext2	d85040f059d884124f04ced0190c90dd4f07e0aa
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <tarball> <ext2 size>"
+    exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+dir=$(dirname $1)
+
+if [ "$ext" == "tar.bz2" ]; then
+    uncompress=j
+else
+    uncompress=z
+fi
+
+rm -rf mnt
+mkdir -p mnt
+
+fakeroot bash -c "\
+tar -x$uncompress -f $1 -C mnt; \
+genext2fs -d mnt -b $(($2 * 1024)) $dir/$base.img; \
+rm -rf mnt; \
+"
============================================================
--- contrib/image-convert/tar2ext2.mount	f3a784276701f55e27d354d61098277d73ad6103
+++ contrib/image-convert/tar2ext2.mount	f3a784276701f55e27d354d61098277d73ad6103
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <tarball> <ext2 size>"
+    exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+base=$(basename $1 .$ext)
+if [ "$ext" == "tar.bz2" ]; then
+    uncompress=j
+else
+    uncompress=z
+fi
+
+dd if=/dev/zero of=$base.img bs=1M count=$2
+mkfs.ext2 -F -m1 $base.img
+
+mkdir -p mnt
+mount -o loop $base.img mnt
+
+tar -x$uncompress -f $1 -C mnt
+
+umount mnt
+rm -rf mnt
============================================================
--- contrib/image-convert/tar2jffs	351ffdf2f7346259f133eeed2e6477c83e34d59a
+++ contrib/image-convert/tar2jffs	351ffdf2f7346259f133eeed2e6477c83e34d59a
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/
+
+${STAGING}fakeroot bash -c " \
+rm -rf scratch; mkdir scratch; \
+tar -xj -f $1 -C scratch; \
+${STAGING}mkfs.jffs2 -x lzo --root=scratch --faketime --output=$(dirname $1)/$(basename $1 .tar.bz2).jffs2"
============================================================
--- packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
+++ packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Check that modules for the current kernel exist, error out otherwise
+
+uname=`cat /proc/version`
+ver=`expr "x$uname" : 'xLinux version \([^ ]\+\) '`
+
+if [ -n "$BOOT_ROOT" -a ! -d "$BOOT_ROOT/lib/modules/$ver" ]; then
+    echo -e "\033[1m===================="
+    echo "ERROR!"
+    echo "There are no modules for this kernel"
+    echo "version ($ver) in the root file "
+    echo "system, which will lead to boot failure or"
+    echo "broken functionally. If you performed"
+    echo "a kernel upgrade, make sure that version"
+    echo "installed in root filesystem matches"
+    echo "version used in bootloader."
+    echo -e "====================\033[0m"
+    echo
+
+    echo "System halted"
+    while true; do
+	sleep 10000
+    done
+fi
============================================================
--- packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
+++ packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
@@ -0,0 +1,12 @@
+SRC_URI = "file://90-check-modules.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs"
+RDEPENDS = "initramfs-uniboot"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/90-check-modules.sh ${D}/initrd.d/
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /initrd.d/* "
============================================================
--- packages/libglade/libglade_2.6.2.bb	260a55eda5df2583b5a81605299e62f43424f7c7
+++ packages/libglade/libglade_2.6.2.bb	260a55eda5df2583b5a81605299e62f43424f7c7
@@ -0,0 +1,11 @@
+require libglade.inc
+
+PR = "r2"
+
+inherit gnome
+
+SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
+
+EXTRA_OECONF += "--without-libxml2"
+
+LDFLAGS += "-lz"
============================================================
--- packages/postgresql/postgresql_8.2.4.bb	41ca5b2fb5d019ac39217a5c0179b31e6f22ec24
+++ packages/postgresql/postgresql_8.2.4.bb	41ca5b2fb5d019ac39217a5c0179b31e6f22ec24
@@ -0,0 +1,7 @@
+require postgresql.inc
+
+PR = "r1"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \
+           file://no-ecpg-test.patch;patch=1"
============================================================
--- packages/images/initramfs-bootmenu-image.bb	8f1db3a032593d55326052d8031210f27d4194a9
+++ packages/images/initramfs-bootmenu-image.bb	c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8
@@ -1,6 +1,6 @@
 # Sample initramfs image
 
-IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules"
 IMAGE_LINGUAS = ""
 
 # Remove any kernel-image that the kernel-module-* packages may have pulled in.
============================================================
--- packages/libglade/libglade_2.6.2.bb	d94670ece5e8b9e8e3e0ba00b7744b565be182af
+++ packages/libglade/libglade.inc	436c12a98f08dbbdf23435a5f7427334a373b13b
@@ -1,25 +1,12 @@
-LICENSE = "LGPL"
 DESCRIPTION = "Runtime support for GTK interface builder"
+HOMEPAGE = "http://glade.gnome.org/"
 SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "LGPL"
 DEPENDS = "gtk+ gtk-doc"
 
-inherit autotools pkgconfig gnome
+inherit autotools pkgconfig
 
-PR = "r1"
-
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
-
-EXTRA_OECONF += "--without-libxml2"
-
-LDFLAGS += "-lz"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
 headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
 
 do_stage () {
@@ -30,3 +17,9 @@ do_stage () {
 		install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
 	done
 }
+
+PACKAGES += " ${PN}-data"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
+FILES_${PN}-dev += "${bindir}/libglade-convert"
+#RDEPENDS_${PN} = "${PN}-data"
============================================================
--- packages/libglade/libglade_2.0.1.bb	5b9997972462185f7650879d29314cf970269214
+++ packages/libglade/libglade_2.0.1.bb	4f7237e7991a74e49681d098a30a11727f4f6eda
@@ -1,27 +1,13 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libxml2 gtk+"
+require libglade.inc
 
+PR = "r1"
+DEPENDS += "libxml2"
+
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar.bz2 \
            file://glade-cruft.patch;patch=1;pnum=0 \
            file://gtk-2.0.m4"
 
-inherit autotools pkgconfig
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
 do_configure_prepend() {
 	install -d m4
 	install ${WORKDIR}/gtk-2.0.m4 m4/
 }
-
-do_stage () {
-	oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
-	for i in ${headers}; do
-		install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
-	done
-}
============================================================
--- packages/libglade/libglade_2.4.0.bb	1522a52bfc4e1fd114cbcbdf0dcc668d5d2ae51d
+++ packages/libglade/libglade_2.4.0.bb	4e7c0d5e52113288c7c519a8b542e7638929bc46
@@ -1,30 +1,9 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ gtk-doc"
+require libglade.inc
 
-inherit autotools pkgconfig gnome
+PR = "r3"
 
-PR = "r2"
+inherit gnome
 
 SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
-do_stage () {
-	oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
-	for i in ${headers}; do
-		install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
-	done
-}
============================================================
--- packages/libglade/libglade_2.4.2.bb	77537a247a98aa71ce5b3b06eb9ab78407ee23a3
+++ packages/libglade/libglade_2.4.2.bb	883f2c0f0b8d2ec182afa3f3cd1b08c0c0d80257
@@ -1,32 +1,11 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ gtk-doc"
+require libglade.inc
 
-inherit autotools pkgconfig gnome
+PR = "r1"
 
-PR = "r0"
+inherit gnome
 
 SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
 
 LDFLAGS += "-lz"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
-do_stage () {
-	oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
-	for i in ${headers}; do
-		install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
-	done
-}
============================================================
--- packages/libglade/libglade_2.5.1.bb	ea9815d992df837e1c5913b615a6ea5130f2d9e5
+++ packages/libglade/libglade_2.5.1.bb	71f7284eedd6ea02babe87719f55b96727f9cb09
@@ -1,12 +1,8 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Runtime support for GTK interface builder"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gtk+ gtk-doc"
+require libglade.inc
 
-inherit autotools pkgconfig gnome
+PR = "r2"
 
-PR = "r1"
+inherit gnome
 
 SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1 \
 	    file://no-deprecation.patch;patch=1"
@@ -14,20 +10,3 @@ LDFLAGS += "-lz"
 EXTRA_OECONF += "--without-libxml2"
 
 LDFLAGS += "-lz"
-
-PACKAGES += " ${PN}-data"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
-FILES_${PN}-dev += "${bindir}/libglade-convert"
-#RDEPENDS_${PN} = "${PN}-data"
-
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
-do_stage () {
-	oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
-	for i in ${headers}; do
-		install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
-	done
-}
============================================================
--- packages/postgresql/postgresql_8.2.4.bb	969bc54ca34868f98644e9c9079ec2525cc08bbc
+++ packages/postgresql/postgresql.inc	e37431b7065b95ed185a1fa0cc6c30c0d2898034
@@ -5,16 +5,12 @@ DEPENDS = "zlib readline"
 
 #WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
 
-SRC_URI = "ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v${PV}/${P}.tar.bz2 \
-	file://no-ecpg-test.patch;patch=1"
+SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
 
-
 inherit autotools pkgconfig
 
-FILES_${PN}-doc += "${prefix}/doc/"
-
 do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
+         cp /usr/sbin/zic ${S}/src/timezone/
 }
 
+FILES_${PN}-doc += "${prefix}/doc/"
-DEFAU%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re3a17e2ff263cac6d4b035034dc79a0e05fc548d -r9549dfd1394792797ed243c1084dd74eb06e0a07
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [fb575d442b03b48609b0ce08a42fbfd9b34c140b]
#    to [5ee65f7cf7e09a0829aa4594da6e1facf3aaf7bd]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	fb575d442b03b48609b0ce08a42fbfd9b34c140b
+++ conf/distro/include/sane-srcrevs.inc	5ee65f7cf7e09a0829aa4594da6e1facf3aaf7bd
@@ -26,7 +26,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "42"
+SRCREV_pn-gsm0710muxd ?= "70"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -124,7 +124,7 @@ SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-fso-pyproto = "49"
+SRCREV_pn-python-fso-pyproto = "70"
 SRCREV_pn-python-gsmd = "127"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"






More information about the Openembedded-commits mailing list