Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/17 21:30:51-06:00 kergoth.com!kergoth
Add the quilt-native autoreconf patch that I apparently missed in my earlier commit, and adjust the PATCHCMD in quilt-native and patcher-native to properly fail on patch application failure.

BKrev: 41ec9328QpfEWBxLn3lgqOBVACLMjw

diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb
index cebdde0..e1ac1c1 100644 (file)
--- a/packages/patcher/patcher-native_20040913.bb
+++ b/packages/patcher/patcher-native_20040913.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
 S = "${WORKDIR}/patcher"
 
 PATCHCLEANCMD = ""
-PATCHCMD = "num='%s'; name='%s'; file='%s'; cat $file | patch -p "$num""
+PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
 
 do_stage() {
        install -m 0755 patcher.py ${STAGING_BINDIR}/patcher

diff --git a/packages/quilt/files/autoreconf.patch b/packages/quilt/files/autoreconf.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/quilt/quilt-native_0.37.bb b/packages/quilt/quilt-native_0.37.bb
index e69de29..756ea0b 100644 (file)
--- a/packages/quilt/quilt-native_0.37.bb
+++ b/packages/quilt/quilt-native_0.37.bb
@@ -0,0 +1,21 @@
+include quilt.inc
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+
+SRC_URI = "cvs://anoncvs:@savannah.nongnu.org/cvsroot/quilt;method=ext;module=quilt;tag=VER_0_37 \
+          file://install.patch;patch=1 \
+          file://nostrip.patch;patch=1 \
+          file://wiggle.patch;patch=1 \
+          file://autoreconf.patch;patch=1"
+S = "${WORKDIR}/quilt"
+
+inherit autotools native
+
+PATCHCLEANCMD = ""
+PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file""
+EXTRA_OECONF = "--disable-nls"
+
+do_configure () {
+       chmod 755 configure
+       oe_runconf
+}