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

dirk commit oe at amethyst.openembedded.net
Tue Jun 17 08:29:18 UTC 2008


merge of 'ca63fe7da843b99d6a109e39aea7a28865c9f2a3'
     and 'd162dc983ded73541698d0c356a5af38c08d5229'

Author: dirk at openembedded.org
Branch: org.openembedded.dev
Revision: d75ab10b249c06d8a23f7fd6dcc2970d3e9d8fab
ViewMTN: http://monotone.openembedded.org/revision/info/d75ab10b249c06d8a23f7fd6dcc2970d3e9d8fab
Files:
1
packages/mozilla/firefox-2.0.0.14+3.0rc1
packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch
packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch
packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch
packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig
packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff
packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch
packages/mozilla/firefox_2.0.0.14+3.0rc1.bb
conf/distro/include/preferred-om-2008-versions.inc
conf/machine/hx4700.conf
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
packages/freesmartphone/gsmd2_git.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/meta/slugos-packages.bb
packages/pciutils/pciutils-2.2.4/configure.patch
packages/pciutils/pciutils_2.2.4.bb
Diffs:

#
# mt diff -rca63fe7da843b99d6a109e39aea7a28865c9f2a3 -rd75ab10b249c06d8a23f7fd6dcc2970d3e9d8fab
#
#
#
# add_dir "packages/mozilla/firefox-2.0.0.14+3.0rc1"
# 
# add_file "packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch"
#  content [7e3ea2cc037b123abe16e35f47225a936c98b116]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff"
#  content [ca66de6dd5f344c90faf7a1045dba40a983a484b]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff"
#  content [75dfa1a3d08f6cb2e15700e545c4de3241749310]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff"
#  content [d02e7df78e1b867a86ee7c2216154e23d8dbe579]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff"
#  content [2c3592d765ce9d739279c8a09dcd572114bc9a1a]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch"
#  content [8f2732cf8a7aff7b068849db230a84c7aba2cd44]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch"
#  content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig"
#  content [f83ff32cfbbf829044318c7e97590355bcb0c2f5]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff"
#  content [f6efa175fe403ea2a5973cb6b7eccee9457d63b2]
# 
# add_file "packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch"
#  content [d414420652c62ebdb6b1d7c5967ad1366aa98d84]
# 
# add_file "packages/mozilla/firefox_2.0.0.14+3.0rc1.bb"
#  content [bf62db140979e7b94274730d22fe8418c70f6c11]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [94d02ccc8116860a8fd6d6ae6bba2978ced283fa]
#    to [31082540c36a559d8a98fd280d83efab99ea9661]
# 
# patch "conf/machine/hx4700.conf"
#  from [537fcae072d2c76e87e7f1e735e333ccae1bb34a]
#    to [6c63f74c98cc02dd49fcfc70e3cc0a45316fc6ce]
# 
# patch "conf/machine/om-gta01.conf"
#  from [cc17dd2af3bf99c8765951f82b0c4e16e41b3d43]
#    to [8bb36def5ae31dc19a1eff1f14caf9bc51906d8f]
# 
# patch "conf/machine/om-gta02.conf"
#  from [11ccb7175df71581f7b6aa92b0065dcae04d5151]
#    to [1320182b35aa623d42f9cb99022c0533b54d5996]
# 
# patch "packages/freesmartphone/gsmd2_git.bb"
#  from [eb494ab0a34eb1eb05405be07913484edac19752]
#    to [02f55bd7839997d6afe7032a9c3f8fb0ce1a89d1]
# 
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
#  from [07df3ff65c44bb77ace88de2929a1527ec1cead3]
#    to [c403e04d11ced9d66b77bf4e3d4802cca1f2af17]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [8f81515c5aaa1108e646cbe57f516ab69335d272]
#    to [2f8c4e64ac1b8718d9cdd3aa675d0a23ed8e8674]
#
============================================================
--- packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch	7e3ea2cc037b123abe16e35f47225a936c98b116
+++ packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch	7e3ea2cc037b123abe16e35f47225a936c98b116
@@ -0,0 +1,11 @@
+--- ipkg-utils/arfile.py.orig	2008-06-11 21:07:01.000000000 -0500
++++ ipkg-utils/arfile.py	2008-06-14 19:56:04.000000000 -0500
+@@ -86,6 +86,8 @@
+                 return FileSection(self.f, self.f.tell(), size)
+ 
+             # Skip data and loop
++            if size % 2:
++                size = size + 1
+             data = self.f.seek(size, 1)
+ #            print hex(f.tell())
+ 
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff	ca66de6dd5f344c90faf7a1045dba40a983a484b
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/010_FPU_IS_ARM_FPA_xslt.diff	ca66de6dd5f344c90faf7a1045dba40a983a484b
@@ -0,0 +1,56 @@
+# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler
+#
+--- mozilla/content/xslt/public/txDouble.h.orig	2006-07-13 17:21:52.000000000 +0300
++++ mozilla/content/xslt/public/txDouble.h	2007-10-25 15:01:25.000000000 +0300
+@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask
+ /**
+  * Stefan Hanske <sh990154 at mail.uni-greifswald.de> reports:
+  *  ARM is a little endian architecture but 64 bit double words are stored
+  * differently: the 32 bit words are in little endian byte order, the two words
+  * are stored in big endian`s way.
+  */
+ 
+ #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+-#define CPU_IS_ARM
++#if !defined(__VFP_FP__)
++#define FPU_IS_ARM_FPA
++#endif
+ #endif
+ 
+ #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+ /**
+  * This version of the macros is safe for the alias optimizations
+  * that gcc does, but uses gcc-specific extensions.
+  */
+ 
+ typedef union txdpun {
+     PRFloat64 d;
+     struct {
+-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+         PRUint32 lo, hi;
+ #else
+         PRUint32 hi, lo;
+ #endif
+     } s;
+ } txdpun;
+ 
+ #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
+ #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
+ 
+ #else // __GNUC__
+ 
+ /* We don't know of any non-gcc compilers that perform alias optimization,
+  * so this code should work.
+  */
+ 
+-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+ #define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[1])
+ #define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[0])
+ #else
+ #define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[0])
+ #define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[1])
+ #endif
+ 
+ #endif // __GNUC__
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff	75dfa1a3d08f6cb2e15700e545c4de3241749310
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug339782.additional.fix.diff	75dfa1a3d08f6cb2e15700e545c4de3241749310
@@ -0,0 +1,39 @@
+# XPTC_InvokeByIndex crashes
+# Bug 339782  [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery)
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+@@ -51,22 +51,32 @@
+ #ifdef __ARM_EABI__
+ #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
+ #define VAR_STACK_SIZE_64 3
+ #else
+ #define DOUBLEWORD_ALIGN(p) (p)
+ #define VAR_STACK_SIZE_64 2
+ #endif
+ 
++#ifdef __ARM_EABI__
++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8))
++#else
++#define DOUBLEWORD_ALIGN(p) (p)
++#endif
++
+ // Remember that these 'words' are 32bit DWORDS
+ 
+ static PRUint32
+ invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+ {
+     PRUint32 result = 0;
++
++    /* Note that we give a "worst case" estimate of how much stack _might_ be
++     * needed, rather than the real count - this should be safe */
++
+     for(PRUint32 i = 0; i < paramCount; i++, s++)
+     {
+         if(s->IsPtrData())
+         {
+             result++;
+             continue;
+         }
+         switch(s->type)
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff	d02e7df78e1b867a86ee7c2216154e23d8dbe579
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug385583.nspr.jmp_buf.eabi.diff	d02e7df78e1b867a86ee7c2216154e23d8dbe579
@@ -0,0 +1,33 @@
+diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h
+--- mozilla/nsprpub/pr/include/md/_linux.h.orig	2007-11-28 14:16:03.000000000 -0500
++++ mozilla/nsprpub/pr/include/md/_linux.h	2007-11-28 14:12:09.000000000 -0500
+@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "Linux/MIPS pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+ 
+-#elif defined(__arm__)
+-/* ARM/Linux */
++#elif defined(__arm__) && !defined(__ARM_EABI__)
++/* ARM/Linux (old-ABI) */
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
+ #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val))
+@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void);
+ #error "ARM/Linux pre-glibc2 not supported yet"
+ #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
+ 
++#elif defined(__arm__) && defined(__ARM_EABI__)
++/* ARM/Linux (EABI) */
++#if defined(__GLIBC__) && __GLIBC__ >= 2
++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
++#define _MD_SP_TYPE __ptr_t
++#else
++#error "ARM/Linux pre-glibc2 not supported yet"
++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
++
+ #else
+ 
+ #error "Unknown CPU architecture"
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff	2c3592d765ce9d739279c8a09dcd572114bc9a1a
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/Bug405992.atomic.nspr.diff	2c3592d765ce9d739279c8a09dcd572114bc9a1a
@@ -0,0 +1,48 @@
+#    Add atomic operations for ARM.
+diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h
+index 5b794c5..cb8d58e 100644
+--- a/nsprpub/pr/include/md/_linux.h
++++ b/nsprpub/pr/include/md/_linux.h
+@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ })
+ #endif
+ 
++#if defined(__arm__)
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++
++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0)
++
++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1)
++#define _MD_ATOMIC_ADD(ptr, n)                  \
++    ({                                          \
++        PRInt32 ov, nv;                         \
++        volatile PRInt32 *vp = (ptr);           \
++                                                \
++        do {                                    \
++            ov = *vp;                           \
++            nv = ov + (n);                      \
++        }                                       \
++        while (__kernel_cmpxchg(ov, nv, vp));   \
++                                                \
++        nv;                                     \
++    })
++#define _MD_ATOMIC_SET(ptr, nv)                 \
++    ({                                          \
++        PRInt32 ov;                             \
++        volatile PRInt32 *vp = (ptr);           \
++                                                \
++        do {                                    \
++            ov = *vp;                           \
++        }                                       \
++        while (__kernel_cmpxchg(ov, (nv), vp)); \
++                                                \
++        ov;                                     \
++    })
++#endif
++
+ #define USE_SETJMP
+ #if defined(__GLIBC__) && __GLIBC__ >= 2
+ #define _PR_POLL_AVAILABLE
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch	8f2732cf8a7aff7b068849db230a84c7aba2cd44
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/jsautocfg-dontoverwrite.patch	8f2732cf8a7aff7b068849db230a84c7aba2cd44
@@ -0,0 +1,23 @@
+--- mozilla/js/src/Makefile.in.orig	2006-12-12 11:46:02.000000000 +0000
++++ mozilla/js/src/Makefile.in	2006-12-12 11:46:27.000000000 +0000
+@@ -319,20 +319,8 @@
+ 
+ jsopcode.h jsopcode.c: jsopcode.tbl
+ 
+-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
+ jsautocfg.h:
+ 	touch $@
+-else
+-ifeq ($(OS_ARCH),WINCE)
+-jsautocfg.h:
+-	touch $@
+-else
+-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
+-	@rm -f $@ jsautocfg.tmp
+-	./jscpucfg > jsautocfg.tmp
+-	mv jsautocfg.tmp $@
+-endif
+-endif
+ 
+ # jscpucfg is a strange target
+ # Needs to be built with the host compiler but needs to include
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch	7863efd4c4cce2aacd3fca003a8f96089e3189bf
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/linkage-problem.patch	7863efd4c4cce2aacd3fca003a8f96089e3189bf
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~	2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in	2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++		    $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig	f83ff32cfbbf829044318c7e97590355bcb0c2f5
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/mozconfig	f83ff32cfbbf829044318c7e97590355bcb0c2f5
@@ -0,0 +1,61 @@
+. $topsrcdir/browser/config/mozconfig
+
+# use GTK+-2 widget set with XFT font rendering
+#ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+
+# enable minimal profile support
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking
+ac_add_options --enable-single-profile
+
+ac_add_options --with-system-zlib
+ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+
+ac_add_options --disable-accessibility
+ac_add_options --disable-composer
+#ac_add_options --enable-plaintext-editor-only
+ac_add_options --disable-mailnews
+ac_add_options --disable-ldap	
+#ac_add_options --disable-postscript
+ac_add_options --disable-mathml
+ac_add_options --disable-jsd
+ac_add_options --disable-installer
+ac_add_options --disable-xprint
+ac_add_options --disable-necko-disk-cache
+
+# configure necko to allocate smaller network buffers
+ac_add_options --enable-necko-small-buffers
+
+# disable debug logging and tests
+#ac_add_options --disable-dtd-debug
+ac_add_options --disable-logging
+ac_add_options --enable-debug=-ggdb
+ac_add_options --disable-gtktest
+ac_add_options --disable-tests
+ac_add_options --disable-printing
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+
+# build crypto module (PSM + NSS)
+ac_add_options --enable-crypto
+
+# build minimal set of protocol handlers
+ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource
+
+# build minimal set of image decoders
+ac_add_options --enable-image-decoders=png,gif,jpeg
+
+#ac_add_options --enable-reorder
+#ac_add_options --enable-elf-dynstr-gc
+
+# enable static build
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+ac_add_options --enable-optimize=-O1
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
+
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff	f6efa175fe403ea2a5973cb6b7eccee9457d63b2
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/random_to_urandom.diff	f6efa175fe403ea2a5973cb6b7eccee9457d63b2
@@ -0,0 +1,26 @@
+# Component manager should not use /dev/random for generation ranodm numbers
+# It cause hangs on embedding platforms,which does not have enough devices for generation required entropy
+# Bug somewhere exists but it is very old
+Index: nsprpub/pr/src/md/unix/uxrng.c
+===================================================================
+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig
++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
+@@ -144,17 +144,17 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+ static int      fdDevRandom;
+ static PRCallOnceType coOpenDevRandom;
+ 
+ static PRStatus OpenDevRandom( void )
+ {
+-    fdDevRandom = open( "/dev/random", O_RDONLY );
++    fdDevRandom = open( "/dev/urandom", O_RDONLY );
+     return((-1 == fdDevRandom)? PR_FAILURE : PR_SUCCESS );
+ } /* end OpenDevRandom() */
+ 
+ static size_t GetDevRandom( void *buf, size_t size )
+ {
+     int bytesIn;
+     int rc;
+ 
============================================================
--- packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch	d414420652c62ebdb6b1d7c5967ad1366aa98d84
+++ packages/mozilla/firefox-2.0.0.14+3.0rc1/security-cross.patch	d414420652%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rd162dc983ded73541698d0c356a5af38c08d5229 -rd75ab10b249c06d8a23f7fd6dcc2970d3e9d8fab
#
#
#
# patch "packages/pciutils/pciutils-2.2.4/configure.patch"
#  from [aa73b31a034d658dd86fbc5502fb8e47c1448f4c]
#    to [f1bc5e3c06c4d899283842790d5370397133be9d]
# 
# patch "packages/pciutils/pciutils_2.2.4.bb"
#  from [86d87aa633c415ab2ef8e0ec59eb7d7008fb0f90]
#    to [570c4d2e7e8cc7ad779ce37908f03169ebf28339]
#
============================================================
--- packages/pciutils/pciutils-2.2.4/configure.patch	aa73b31a034d658dd86fbc5502fb8e47c1448f4c
+++ packages/pciutils/pciutils-2.2.4/configure.patch	f1bc5e3c06c4d899283842790d5370397133be9d
@@ -1,13 +1,8 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
 Index: pciutils-2.2.4/lib/configure
 ===================================================================
 --- pciutils-2.2.4.orig/lib/configure	2006-09-09 13:06:10.000000000 +0200
-+++ pciutils-2.2.4/lib/configure	2006-10-31 11:52:13.000000000 +0100
-@@ -12,15 +12,15 @@
++++ pciutils-2.2.4/lib/configure	2008-06-17 10:15:07.000000000 +0200
+@@ -12,15 +12,15 @@ echo_n() {
  echo_n "Configuring libpci for your system..."
  idsdir=${1:-/usr/share}
  version=${2:-0.0}
@@ -26,10 +21,15 @@ Index: pciutils-2.2.4/lib/configure
  fi
  if [ "$sys" = "GNU/kFreeBSD" ]
  then
-@@ -34,6 +34,11 @@
+@@ -34,6 +34,16 @@ rel=${4:-$rel}
  echo " $host $rel"
  zlib=$5
  
++if [ "$host" = "linux--gnuspe" ]
++then
++	sys=linux
++fi
++
 +if [ "$host" = "linux--gnueabi" ]
 +then
 +	sys=linux
============================================================
--- packages/pciutils/pciutils_2.2.4.bb	86d87aa633c415ab2ef8e0ec59eb7d7008fb0f90
+++ packages/pciutils/pciutils_2.2.4.bb	570c4d2e7e8cc7ad779ce37908f03169ebf28339
@@ -13,7 +13,7 @@ PARALLEL_MAKE = ""
 
 PARALLEL_MAKE = ""
 
-PR="r1"
+PR="r2"
 
 do_configure () {
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})






More information about the Openembedded-commits mailing list