[oe-commits] org.oe.dev merge of '1cdc457f64f3451940bcf06c52bbc5dd90e86a1e'
crofton commit
openembedded-commits at lists.openembedded.org
Fri Aug 3 17:20:41 UTC 2007
merge of '1cdc457f64f3451940bcf06c52bbc5dd90e86a1e'
and '6897ab6243e36c667763f309198c961dba118378'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 90fdf0ac19d7e035c60649e9885973e7f8d0a281
ViewMTN: http://monotone.openembedded.org/revision.psp?id=90fdf0ac19d7e035c60649e9885973e7f8d0a281
Files:
1
packages/libtool/libtool-1.5.24
packages/libtool/libtool-1.5.24/autotools.patch
packages/libtool/libtool-1.5.24/install-path-check.patch
packages/libtool/libtool-1.5.24/libdir-la.patch
packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch
packages/libtool/libtool-1.5.24/prefix.patch
packages/libtool/libtool-1.5.24/tag.patch
packages/libtool/libtool-1.5.24/tag1.patch
packages/libtool/libtool-1.5.24/uclibc.patch
packages/libtool/libtool-cross_1.5.24.bb
packages/libtool/libtool-native_1.5.24.bb
packages/libtool/libtool_1.5.24.bb
packages/psplash/files/psplash-bar-img.h
classes/patch.bbclass
Diffs:
#
# mt diff -r1cdc457f64f3451940bcf06c52bbc5dd90e86a1e -r90fdf0ac19d7e035c60649e9885973e7f8d0a281
#
#
#
# add_dir "packages/libtool/libtool-1.5.24"
#
# add_file "packages/libtool/libtool-1.5.24/autotools.patch"
# content [0bdcb8d07a1b7084551fcd631089b69e4e22ce7b]
#
# add_file "packages/libtool/libtool-1.5.24/install-path-check.patch"
# content [4089d7b0164ca9d91e007bbf673998c4f9895e78]
#
# add_file "packages/libtool/libtool-1.5.24/libdir-la.patch"
# content [ee21cc70eb11182a9dfd74e74ee16f49f597480b]
#
# add_file "packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch"
# content [5d0a3a8d792d3cb959e1011de6ac1faf5badc74b]
#
# add_file "packages/libtool/libtool-1.5.24/prefix.patch"
# content [53c76f2e8648b5c01ff70412733188edc14b2348]
#
# add_file "packages/libtool/libtool-1.5.24/tag.patch"
# content [01bffeea01b729891b9c2f28312779438f264007]
#
# add_file "packages/libtool/libtool-1.5.24/tag1.patch"
# content [1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b]
#
# add_file "packages/libtool/libtool-1.5.24/uclibc.patch"
# content [619de2dd82aee33cef8c4c31831c88e8beac4688]
#
# add_file "packages/libtool/libtool-cross_1.5.24.bb"
# content [34200c17a03fc06dac7b8aafb40ed9f470813ac1]
#
# add_file "packages/libtool/libtool-native_1.5.24.bb"
# content [ce5d46716493d32c4426e47b7af6630ecd852160]
#
# add_file "packages/libtool/libtool_1.5.24.bb"
# content [03734fc19f12b14137a60a7931de6638b49fdbae]
#
============================================================
--- packages/libtool/libtool-1.5.24/autotools.patch 0bdcb8d07a1b7084551fcd631089b69e4e22ce7b
+++ packages/libtool/libtool-1.5.24/autotools.patch 0bdcb8d07a1b7084551fcd631089b69e4e22ce7b
@@ -0,0 +1,127 @@
+diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac
+--- libtool-1.5/cdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/cdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([cdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([main.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/demo/configure.ac libtool-1.5.ac/demo/configure.ac
+--- libtool-1.5/demo/configure.ac 2002-03-02 22:19:55.000000000 -0500
++++ libtool-1.5.ac/demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([demo], [1.0], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([hello.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/demo/Makefile.am libtool-1.5.ac/demo/Makefile.am
+--- libtool-1.5/demo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
++++ libtool-1.5.ac/demo/Makefile.am 2004-05-05 17:17:34.000000000 -0400
+@@ -121,17 +121,16 @@
+
+ # This is one of the essential tests for deplibs_check_method=pass_all.
+ # If this one passes with pass_all, it is likely that pass_all works
+-EXTRA_LIBRARIES = libhell0.a
+-libhell0_a_SOURCES = hello.c foo.c
+-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
++EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
++libhell0_la_SOURCES = hello.c foo.c
+ libhell1_la_SOURCES = hell1.c
+ libhell1_la_LIBADD = -L. -lhell0
+ libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell1_la_DEPENDENCIES = libhell0.a
++libhell1_la_DEPENDENCIES = libhell0.la
+ libhell2_la_SOURCES = hell2.c
+ libhell2_la_LIBADD = -L. -lhell0
+ libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell2_la_DEPENDENCIES = libhell0.a
++libhell2_la_DEPENDENCIES = libhell0.la
+ EXTRA_PROGRAMS = hell0
+ hell0_SOURCES = main.c
+ hell0_LDADD = libhell1.la libhell2.la $(LIBM)
+diff -urNd -urNd libtool-1.5/depdemo/configure.ac libtool-1.5.ac/depdemo/configure.ac
+--- libtool-1.5/depdemo/configure.ac 2002-10-22 15:29:28.000000000 -0400
++++ libtool-1.5.ac/depdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([depdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([main.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/f77demo/configure.ac libtool-1.5.ac/f77demo/configure.ac
+--- libtool-1.5/f77demo/configure.ac 2003-03-22 01:34:27.000000000 -0500
++++ libtool-1.5.ac/f77demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -23,6 +23,7 @@
+ ## ------------------------ ##
+ AC_INIT([f77demo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([foof.f])dnl
++AC_CONFIG_AUX_DIR([..])
+
+ ## ------------------------ ##
+ ## Automake Initialisation. ##
+diff -urNd -urNd libtool-1.5/mdemo/configure.ac libtool-1.5.ac/mdemo/configure.ac
+--- libtool-1.5/mdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/mdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([mdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([main.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/pdemo/configure.ac libtool-1.5.ac/pdemo/configure.ac
+--- libtool-1.5/pdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/pdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([pdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([longer_file_name_hello.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/pdemo/Makefile.am libtool-1.5.ac/pdemo/Makefile.am
+--- libtool-1.5/pdemo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
++++ libtool-1.5.ac/pdemo/Makefile.am 2004-05-05 17:17:59.000000000 -0400
+@@ -121,17 +121,16 @@
+
+ # This is one of the essential tests for deplibs_check_method=pass_all.
+ # If this one passes with pass_all, it is likely that pass_all works
+-EXTRA_LIBRARIES = libhell0.a
+-libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
+-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
++libhell0_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
++EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
+ libhell1_la_SOURCES = longer_file_name_hell1.c
+ libhell1_la_LIBADD = -L. -lhell0
+ libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell1_la_DEPENDENCIES = libhell0.a
++libhell1_la_DEPENDENCIES = libhell0.la
+ libhell2_la_SOURCES = longer_file_name_hell2.c
+ libhell2_la_LIBADD = -L. -lhell0
+ libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell2_la_DEPENDENCIES = libhell0.a
++libhell2_la_DEPENDENCIES = libhell0.la
+ EXTRA_PROGRAMS = hell0
+ hell0_SOURCES = longer_file_name_main.c
+ hell0_LDADD = libhell1.la libhell2.la $(LIBM)
+diff -urNd -urNd libtool-1.5/tagdemo/configure.ac libtool-1.5.ac/tagdemo/configure.ac
+--- libtool-1.5/tagdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/tagdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([tagdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([foo.cpp])
++AC_CONFIG_AUX_DIR([..])
+
+ AC_CANONICAL_TARGET
+
============================================================
--- packages/libtool/libtool-1.5.24/install-path-check.patch 4089d7b0164ca9d91e007bbf673998c4f9895e78
+++ packages/libtool/libtool-1.5.24/install-path-check.patch 4089d7b0164ca9d91e007bbf673998c4f9895e78
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5.6/ltmain.in~install-path-check 2004-05-14 22:56:19.000000000 -0500
++++ libtool-1.5.6/ltmain.in 2004-05-14 22:57:48.000000000 -0500
+@@ -5503,10 +5503,13 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- if test "$inst_prefix_dir" = "$destdir"; then
+- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit $EXIT_FAILURE
+- fi
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # if test "$inst_prefix_dir" = "$destdir"; then
++ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++ # exit $EXIT_FAILURE
++ # fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
============================================================
--- packages/libtool/libtool-1.5.24/libdir-la.patch ee21cc70eb11182a9dfd74e74ee16f49f597480b
+++ packages/libtool/libtool-1.5.24/libdir-la.patch ee21cc70eb11182a9dfd74e74ee16f49f597480b
@@ -0,0 +1,52 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600
++++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500
+@@ -2147,8 +2147,14 @@
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ else
+ dir="$ladir/$objdir"
+@@ -2615,6 +2621,16 @@
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ path="$absdir/$objdir"
++# This interferes with crosscompilation. -CL
++# else
++# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++# if test -z "$libdir"; then
++# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++# exit 1
++# fi
++# if test "$absdir" != "$libdir"; then
++# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++# fi
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+@@ -5165,6 +5181,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
============================================================
--- packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch 5d0a3a8d792d3cb959e1011de6ac1faf5badc74b
+++ packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch 5d0a3a8d792d3cb959e1011de6ac1faf5badc74b
@@ -0,0 +1,32 @@
+Well, brute force to disable rpath.
+
+Only
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++#hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+should be necessary....
+
+Index: libtool-1.5.10/libtool.m4
+===================================================================
+--- libtool-1.5.10.orig/libtool.m4 2007-05-27 23:31:51.000000000 +0200
++++ libtool-1.5.10/libtool.m4 2007-05-27 23:50:26.000000000 +0200
+@@ -4244,16 +4244,16 @@
+ hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs=no
+
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++hardcode_libdir_flag_spec=
+
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++hardcode_libdir_flag_spec_ld=
+
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
============================================================
--- packages/libtool/libtool-1.5.24/prefix.patch 53c76f2e8648b5c01ff70412733188edc14b2348
+++ packages/libtool/libtool-1.5.24/prefix.patch 53c76f2e8648b5c01ff70412733188edc14b2348
@@ -0,0 +1,44 @@
+diff -aur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22/libtool.m4
+--- libtool-1.5.22.orig/libtool.m4 2005-12-18 16:53:17.000000000 -0500
++++ libtool-1.5.22/libtool.m4 2007-05-05 15:47:41.000000000 -0400
+@@ -67,7 +67,8 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/$host_alias-libtool"
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+@@ -134,7 +135,7 @@
+ rm="rm -f"
+
+ # Global variables:
+-default_ofile=libtool
++default_ofile=${host_alias}-libtool
+ can_build_shared=yes
+
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+Only in libtool-1.5.22: libtool.m4.orig
+diff -aur libtool-1.5.22.orig/Makefile.am libtool-1.5.22/Makefile.am
+--- libtool-1.5.22.orig/Makefile.am 2005-08-12 13:21:09.000000000 -0400
++++ libtool-1.5.22/Makefile.am 2007-05-05 15:49:25.000000000 -0400
+@@ -30,7 +30,7 @@
+ aclocal_DATA = $(aclocal_macros)
+
+ # The standalone libtool script, and the libtool distributor.
+-bin_SCRIPTS = libtool libtoolize
++bin_SCRIPTS = $(host_alias)-libtool libtoolize
+
+ ## These are installed as a subdirectory of pkgdatadir so that
+ ## libtoolize --ltdl can find them later:
+@@ -55,7 +55,7 @@
+ libltdl/configure \
+ libltdl/config-h.in
+
+-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
++$(host_alias)-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
+ $(SHELL) $(top_builddir)/config.status --recheck
+ chmod +x $@
+
============================================================
--- packages/libtool/libtool-1.5.24/tag.patch 01bffeea01b729891b9c2f28312779438f264007
+++ packages/libtool/libtool-1.5.24/tag.patch 01bffeea01b729891b9c2f28312779438f264007
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
++++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
+@@ -226,8 +226,9 @@
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++ $echo "$modename: defaulting to \`CC'"
++ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
============================================================
--- packages/libtool/libtool-1.5.24/tag1.patch 1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b
+++ packages/libtool/libtool-1.5.24/tag1.patch 1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b
@@ -0,0 +1,13 @@
+Index: libtool-1.5.10/libltdl/ltmain.sh
+===================================================================
+--- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100
++++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100
+@@ -232,7 +232,7 @@
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+ $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
============================================================
--- packages/libtool/libtool-1.5.24/uclibc.patch 619de2dd82aee33cef8c4c31831c88e8beac4688
+++ packages/libtool/libtool-1.5.24/uclibc.patch 619de2dd82aee33cef8c4c31831c88e8beac4688
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libtool-1.5.8/libtool.m4~uclibc
++++ libtool-1.5.8/libtool.m4
+@@ -2221,6 +2221,11 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++linux-uclibc*)
++ lt_cv_deplibs_check_method=pass_all
++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
============================================================
--%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6897ab6243e36c667763f309198c961dba118378 -r90fdf0ac19d7e035c60649e9885973e7f8d0a281
#
#
#
# add_file "packages/psplash/files/psplash-bar-img.h"
# content [083962698ec21c59fddf83ad5c271a2e5d95bd63]
#
# patch "classes/patch.bbclass"
# from [13f060e11ac73613512bdea10a347394f120fba9]
# to [eedc7c6dfbe33a021023d2efe764b60cca95d6da]
#
============================================================
--- packages/psplash/files/psplash-bar-img.h 083962698ec21c59fddf83ad5c271a2e5d95bd63
+++ packages/psplash/files/psplash-bar-img.h 083962698ec21c59fddf83ad5c271a2e5d95bd63
@@ -0,0 +1,47 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#define BAR_IMG_ROWSTRIDE (920)
+#define BAR_IMG_WIDTH (230)
+#define BAR_IMG_HEIGHT (28)
+#define BAR_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define BAR_IMG_RLE_PIXEL_DATA ((uint8*) \
+ "\203\354\354\341\377\4\326\326\315\377\236\236\233\377\200\200\201\377" \
+ "nnq\377\377mmp\377\331mmp\377\4nnq\377\200\200\201\377\236\236\233\377" \
+ "\326\326\315\377\205\354\354\341\377\2\260\260\253\377oor\377\377mmp" \
+ "\377\337mmp\377\2oor\377\260\260\253\377\203\354\354\341\377\1\262\262" \
+ "\256\377\377mmp\377\343mmp\377\4\262\262\256\377\354\354\341\377\332" \
+ "\332\321\377pps\377\377mmp\377\343mmp\377\3pps\377\332\332\321\377\244" \
+ "\244\241\377\204mmp\377\1\205\205\205\377\377\354\354\341\377\333\354" \
+ "\354\341\377\1\205\205\205\377\204mmp\377\2\244\244\241\377\210\210\210" \
+ "\377\203mmp\377\2\203\203\203\377\351\351\336\377\377\354\354\341\377" \
+ "\333\354\354\341\377\2\351\351\336\377\203\203\203\377\203mmp\377\2\210" \
+ "\210\210\377qqs\377\203mmp\377\1\255\255\251\377\377\354\354\341\377" \
+ "\335\354\354\341\377\1\255\255\251\377\203mmp\377\1qqs\377\204mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\210mmp\377" \
+ "\1\270\270\262\377\377\354\354\341\377\336\354\354\341\377\204mmp\377" \
+ "\1qqs\377\203mmp\377\1\255\255\251\377\377\354\354\341\377\335\354\354" \
+ "\341\377\1\255\255\251\377\203mmp\377\2qqs\377\210\210\210\377\203mm" \
+ "p\377\2\203\203\203\377\351\351\336\377\377\354\354\341\377\333\354\354" \
+ "\341\377\2\351\351\336\377\203\203\203\377\203mmp\377\2\210\210\210\377" \
+ "\244\244\241\377\204mmp\377\1\205\205\205\377\377\354\354\341\377\333" \
+ "\354\354\341\377\1\205\205\205\377\204mmp\377\3\244\244\241\377\332\332" \
+ "\321\377pps\377\377mmp\377\343mmp\377\4pps\377\332\332\321\377\354\354" \
+ "\341\377\262\262\256\377\377mmp\377\343mmp\377\1\262\262\256\377\203" \
+ "\354\354\341\377\2\260\260\253\377oor\377\377mmp\377\337mmp\377\2oor" \
+ "\377\260\260\253\377\205\354\354\341\377\4\326\326\315\377\236\236\233" \
+ "\377\200\200\201\377nnq\377\377mmp\377\331mmp\377\4nnq\377\200\200\201" \
+ "\377\236\236\233\377\326\326\315\377\203\354\354\341\377")
+
+
============================================================
--- classes/patch.bbclass 13f060e11ac73613512bdea10a347394f120fba9
+++ classes/patch.bbclass eedc7c6dfbe33a021023d2efe764b60cca95d6da
@@ -1,5 +1,8 @@
# Copyright (C) 2006 OpenedHand LTD
+# Point to an empty file so any user's custom settings don't break things
+QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
+
def patch_init(d):
import os, sys
@@ -180,9 +183,10 @@ def patch_init(d):
class QuiltTree(PatchSet):
def _runcmd(self, args, run = True):
+ quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1)
if not run:
- return ["quilt"] + args
- runcmd(["quilt"] + args, self.dir)
+ return ["quilt"] + ["--quiltrc"] + [quiltrc] + args
+ runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
def _quiltpatchpath(self, file):
return os.path.join(self.dir, "patches", os.path.basename(file))
More information about the Openembedded-commits
mailing list