[oe-commits] org.oe.dev merge of 'bdbc9f1de56a38029ef1396ead1cd220bf2c07b2'

thesing commit oe at amethyst.openembedded.net
Fri Jul 25 02:27:46 UTC 2008


merge of 'bdbc9f1de56a38029ef1396ead1cd220bf2c07b2'
     and 'f960843459326876ef399375d5affaacc45d0a46'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: a7913fd57ede4eb437b7a91d2c525334944c322f
ViewMTN: http://monotone.openembedded.org/revision/info/a7913fd57ede4eb437b7a91d2c525334944c322f
Files:
1
packages/libsdl/libsdl-image-1.2.3
packages/libsdl/libsdl-net-1.2.7
packages/mono/mono-1.9.1
packages/mythtv/files/armv5te
packages/mythtv/files/armv6
packages/mythtv/files/armv7a
packages/mythtv/mythtv-0.21
packages/python/python-setuptools
contrib/angstrom/source-mirror.txt
packages/libsdl/libsdl-image-1.2.3/autotools.patch
packages/libsdl/libsdl-net-1.2.7/libtool2.patch
packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff
packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
packages/mono/files/libgc_cppflags.patch
packages/mono/mono-mcs-intermediate_1.9.1.bb
packages/mono/mono-native_1.9.1.bb
packages/mono/mono_1.9.1-files.inc
packages/mono/mono_1.9.1.bb
packages/mono/mono_1.9.1.inc
packages/mythtv/files/armv5te/configh
packages/mythtv/files/armv5te/configmak
packages/mythtv/files/armv6/configh
packages/mythtv/files/armv6/configmak
packages/mythtv/files/armv7a/configh
packages/mythtv/files/armv7a/configmak
packages/mythtv/files/configh
packages/mythtv/files/configmak
packages/mythtv/mythtv-0.21/configure.patch
packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff
packages/neuros-public/neuros-mainmenu_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/nfs-utils/nfs-utils_1.1.2.bb
packages/python/python-setuptools/fix-log-usage.patch
classes/qmake.bbclass
conf/distro/angstrom-2008.1.conf
conf/machine/neuros-osd2.conf
packages/dsplink/codec-engine_2.10.bb
packages/h2200-bootloader/h2200-bootloader.bb
packages/libsdl/libsdl-image_1.2.3.bb
packages/libsdl/libsdl-net_1.2.7.bb
packages/libsdl/libsdl-ttf_2.0.3.bb
packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
packages/linux/linux-omap2_git.bb
packages/mono/README
packages/mythtv/mythtv.inc
packages/mythtv/mythtv_0.18.1.bb
packages/mythtv/mythtv_0.20.bb
packages/mythtv/mythtv_0.21.bb
packages/mythtv/mythtv_svn.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/python/python-setuptools-native_0.6c8.bb
packages/python/python-setuptools_0.6c8.bb
packages/tcp-wrappers/tcp-wrappers_7.6.bb
packages/vlc/vlc-davinci_0.8.6h.bb
packages/initrdscripts/initramfs-kexec_1.0.bb
Diffs:

#
# mt diff -rbdbc9f1de56a38029ef1396ead1cd220bf2c07b2 -ra7913fd57ede4eb437b7a91d2c525334944c322f
#
#
#
# add_dir "packages/libsdl/libsdl-image-1.2.3"
# 
# add_dir "packages/libsdl/libsdl-net-1.2.7"
# 
# add_dir "packages/mono/mono-1.9.1"
# 
# add_dir "packages/mythtv/files/armv5te"
# 
# add_dir "packages/mythtv/files/armv6"
# 
# add_dir "packages/mythtv/files/armv7a"
# 
# add_dir "packages/mythtv/mythtv-0.21"
# 
# add_dir "packages/python/python-setuptools"
# 
# add_file "contrib/angstrom/source-mirror.txt"
#  content [2e9ab07fc28af71188db82b6db0ad97fdacc72fe]
# 
# add_file "packages/libsdl/libsdl-image-1.2.3/autotools.patch"
#  content [e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3]
# 
# add_file "packages/libsdl/libsdl-net-1.2.7/libtool2.patch"
#  content [7f670962471074322af84e6361c3955b49a102f3]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff"
#  content [cca08af46e3afb4fa5a317c7683b8809e54707a0]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff"
#  content [57dfde38a6120c2956bfd101624a34a3963f8b00]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff"
#  content [0ef415fc9374c8cd2d596f391dbd90b7e6578930]
# 
# add_file "packages/lirc/lirc-modules_0.8.3+cvs20080713.bb"
#  content [89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec]
# 
# add_file "packages/mono/files/libgc_cppflags.patch"
#  content [00ddb4b73388e59b32b7a48f1dcd97a3054c18c8]
# 
# add_file "packages/mono/mono-mcs-intermediate_1.9.1.bb"
#  content [4e1f201a3ac5d3b4ff36d80c490dd7769ffdd304]
# 
# add_file "packages/mono/mono-native_1.9.1.bb"
#  content [c198192b096c988088e98426b67d28da3e6d71aa]
# 
# add_file "packages/mono/mono_1.9.1-files.inc"
#  content [e8aa5fcf2f7be1f3cfa316a7678047d127db70eb]
# 
# add_file "packages/mono/mono_1.9.1.bb"
#  content [81a45705a3bcd1681de26643f35d68d8076e7a42]
# 
# add_file "packages/mono/mono_1.9.1.inc"
#  content [8602072beea0f9ffab0ec94434f26dc4a40f10d1]
# 
# add_file "packages/mythtv/files/armv5te/configh"
#  content [a1db618df92dcc46ce8cbf9c979abf73197ea954]
# 
# add_file "packages/mythtv/files/armv5te/configmak"
#  content [2d37c9ec408fe8cf1e875293db6f3825bd74b5be]
# 
# add_file "packages/mythtv/files/armv6/configh"
#  content [3eea7cc66d82409b657a8f007332b546e81c53e4]
# 
# add_file "packages/mythtv/files/armv6/configmak"
#  content [91672d0d927bf7c8850ef66ce04730446a989d21]
# 
# add_file "packages/mythtv/files/armv7a/configh"
#  content [c0162436c40dac27f4962f26274bdd1627ae4215]
# 
# add_file "packages/mythtv/files/armv7a/configmak"
#  content [3d7ce3bc7c569cfe64eb8b44bba400381535f3dc]
# 
# add_file "packages/mythtv/files/configh"
#  content [5391daaca1ed71479d23273c605e1c78636d53ad]
# 
# add_file "packages/mythtv/files/configmak"
#  content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# 
# add_file "packages/mythtv/mythtv-0.21/configure.patch"
#  content [5bfba3207e4397a1084efecbbf093d613cc0e5eb]
# 
# add_file "packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff"
#  content [6962e2cf828b611a65198a1c990da9897fb4d478]
# 
# add_file "packages/neuros-public/neuros-mainmenu_git.bb"
#  content [556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa]
# 
# add_file "packages/neuros-public/neuros-nwm_git.bb"
#  content [8066ae3bdfcaa465ac10245698627f7a5653631c]
# 
# add_file "packages/nfs-utils/nfs-utils_1.1.2.bb"
#  content [c8fc676bb8563f810f362e205ae46c3b75388b51]
# 
# add_file "packages/python/python-setuptools/fix-log-usage.patch"
#  content [1ee527f30af93cafced84bcc0d71b52bf1c1f1fd]
# 
# patch "classes/qmake.bbclass"
#  from [4fb295886f71d537f0bdce9a0c0548d276e993e9]
#    to [a20a751e59164b6439563f4371d524846ffa0b5b]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [f64ebcf55e85b504d3be169befac3c7981aa74d9]
#    to [9a6f55539463ce42e6876f571531293184af4d8d]
# 
# patch "conf/machine/neuros-osd2.conf"
#  from [e53737e49eb8880c1643d31fbfb73cc769ec96b2]
#    to [fc797fb644aa9859c74f2d01e928e5409baf776b]
# 
# patch "packages/dsplink/codec-engine_2.10.bb"
#  from [d83292d24c597cfd09dbf4e868d8c748469883cc]
#    to [3aa4a5c65d7f50eb4aa7926b5c458280ec0ac1e9]
# 
# patch "packages/h2200-bootloader/h2200-bootloader.bb"
#  from [d015a17dbeb17e4fef0f6d6df88a9ca9620cc88f]
#    to [bcfd2dc1c12552564034f4d93f91e182d0936750]
# 
# patch "packages/libsdl/libsdl-image_1.2.3.bb"
#  from [5a0d595f2ccbc6a735854738caa59a51ac3630c0]
#    to [f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0]
# 
# patch "packages/libsdl/libsdl-net_1.2.7.bb"
#  from [3ef6b382d1473344c9d55d2ebbd844d176758bd6]
#    to [3fdc54c4a3e7db07f2c72d7d3d7f4348320a6357]
# 
# patch "packages/libsdl/libsdl-ttf_2.0.3.bb"
#  from [8ca2b92300d01da12e40b4ddfa3eb9b9dd5ab98d]
#    to [ea5df0018b0c4a0b3f64c39d9957fc19affe5561]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff"
#  from [05766144d6796d91cb3a002e2a3c75ce6a1b1d7d]
#    to [0e87d3813fc787fe923b5d34a89181009743cc11]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff"
#  from [016a4086941bdeb321b7ce106b8f205a88b4e6af]
#    to [639a7c61d5b83da14414233125946adbfd4ccb1d]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [43ac6aa586b248d87d01286575371b1800bb3d2a]
#    to [ef14668a9a1c7d97225d194c81aa52ace025f767]
# 
# patch "packages/mono/README"
#  from [ce24307d6afe8343f5db95c14efcac462e36c160]
#    to [e957b1c88e0021bec7fb80690c2d0ee9085eff93]
# 
# patch "packages/mythtv/mythtv.inc"
#  from [bd289f60d1d68db7a6efc671001e68bcc3caee57]
#    to [791a926b70e0610514c5daa741d5fe3cc8bbbd30]
# 
# patch "packages/mythtv/mythtv_0.18.1.bb"
#  from [9be2c80d0a535cb66ddb00c646649dbc5390ab7f]
#    to [92f6955a2b8ead1580c9a5aa948cf2dafb2e0388]
# 
# patch "packages/mythtv/mythtv_0.20.bb"
#  from [f4c497560d89ece714fd55761cc10b1fd8598565]
#    to [679bb68c24acd0032095de29d447f19019f397a9]
# 
# patch "packages/mythtv/mythtv_0.21.bb"
#  from [f29d4a96714e9f178504e26dc9f419a4b3f33db5]
#    to [590a51ee6de14a40660a5ab607d88ecb36aaa2ff]
# 
# patch "packages/mythtv/mythtv_svn.bb"
#  from [c099b322a994478a2804d178c62e390bd2465c4d]
#    to [a62aba89caeea442eddd4f8d81c674f222137675]
# 
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
#  from [99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8]
#    to [066f779d14370cd80cffd7fd784d04df7990a255]
# 
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
#  from [a8b5931e6c77fb22d956e58b1f601344a24ad80b]
#    to [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
# 
# patch "packages/python/python-setuptools-native_0.6c8.bb"
#  from [98f58e21bf03997cb61c8459da61b888c73364f9]
#    to [f5d6011427a630faa2fa13103a2503e98045d9ea]
# 
# patch "packages/python/python-setuptools_0.6c8.bb"
#  from [122ed3dd626cef08ab8b57defb23846772fdaa38]
#    to [ed9de0fbcfd567e9243041f0ccaa8e7893a9c7f7]
# 
# patch "packages/tcp-wrappers/tcp-wrappers_7.6.bb"
#  from [05091d6ff40fb433090ad87a4d3a8c4568821b7c]
#    to [ae842e46020f5c84a42cf753a5f0bfa53a00812f]
# 
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
#  from [89eeb1dfedcbed204a397ea4358d8fb53c581789]
#    to [311b6631d2c164ed483e269854b4da6bc3236de6]
#
============================================================
--- contrib/angstrom/source-mirror.txt	2e9ab07fc28af71188db82b6db0ad97fdacc72fe
+++ contrib/angstrom/source-mirror.txt	2e9ab07fc28af71188db82b6db0ad97fdacc72fe
@@ -0,0 +1,14 @@
+#To populate the source mirror the autobuilder uses the following command:
+
+rsync ~/OE/downloads/ angstrom at linuxtogo.org:~/website/unstable/sources/ -av \
+	--exclude "*.md5" \
+	--exclude "svn" \
+	--exclude "cvs"  \
+	--exclude "git" \
+	--exclude "umac.ko" \
+	--exclude "IPL_ixp400NpeLibrary-2_3_2.zip" \
+	--exclude "*.lock" \
+	--exclude "codec_*" \
+	--exclude "dsplink*" \
+	--progress
+
============================================================
--- packages/libsdl/libsdl-image-1.2.3/autotools.patch	e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3
+++ packages/libsdl/libsdl-image-1.2.3/autotools.patch	e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3
@@ -0,0 +1,805 @@
+Index: SDL_image-1.2.3/acinclude.m4
+===================================================================
+--- SDL_image-1.2.3.orig/acinclude.m4	2001-11-02 21:39:10.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,608 +0,0 @@
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
+-  fi
+-
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(SDL_CFLAGS)
+-  AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+-])
+-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
+-
+-# serial 40 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-
+-# Save cache, so that ltconfig can load it
+-AC_CACHE_SAVE
+-
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+-|| AC_MSG_E%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rf960843459326876ef399375d5affaacc45d0a46 -ra7913fd57ede4eb437b7a91d2c525334944c322f
#
#
#
# patch "packages/initrdscripts/initramfs-kexec_1.0.bb"
#  from [477745f4ed2bfacec7191d1080a2179b9f2c159c]
#    to [ed3089169b7810d5cc1adb782cf57a03b84bf1b9]
#
============================================================
--- packages/initrdscripts/initramfs-kexec_1.0.bb	477745f4ed2bfacec7191d1080a2179b9f2c159c
+++ packages/initrdscripts/initramfs-kexec_1.0.bb	ed3089169b7810d5cc1adb782cf57a03b84bf1b9
@@ -1,5 +1,5 @@ DESCRIPTON = "A init script that mounts 
 DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r4"
+PR = "r5"
 
 do_compile() {
         cat > init.sh << EOF
@@ -21,5 +21,5 @@ FILES_${PN} = "/init /proc /mnt"
 
 FILES_${PN} = "/init /proc /mnt"
 
+ROOTDEV = "/dev/mmcblk0p1"
+ROOTFS = "ext2"
-ROOTDEV = "mtd2"
-ROOTFS = "jffs2"






More information about the Openembedded-commits mailing list