diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 04:40:08 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-18 04:40:08 +0000 |
| commit | a35990fa45364f8fca196741fa0b1e6728254459 (patch) | |
| tree | 5ff7f85262c714fdb189bf876d322a62897779f7 | |
| parent | 0f235b0f42575bfb50dd891cf44aa08c2e404a67 (diff) | |
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
| -rw-r--r-- | packages/patcher/patcher-native_20040913.bb | 2 | ||||
| -rw-r--r-- | packages/quilt/files/autoreconf.patch | 0 | ||||
| -rw-r--r-- | packages/quilt/quilt-native_0.37.bb | 21 |
3 files changed, 22 insertions, 1 deletions
diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index cebdde0b9c..e1ac1c1ca2 100644 --- 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/quilt/files/autoreconf.patch diff --git a/packages/quilt/quilt-native_0.37.bb b/packages/quilt/quilt-native_0.37.bb index e69de29bb2..756ea0b5f3 100644 --- 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 +} |