diff options
| -rw-r--r-- | recipes/iscsi-target/iscsi-target_1.4.20.1.bb (renamed from recipes/iscsi-target/iscsi-target_1.4.19.bb) | 11 | ||||
| -rw-r--r-- | recipes/tgt/tgt_1.0.5.bb (renamed from recipes/tgt/tgt_1.0.3.bb) | 7 | ||||
| -rw-r--r-- | recipes/webm/libvpx_0.9.0.bb | 3 |
3 files changed, 13 insertions, 8 deletions
diff --git a/recipes/iscsi-target/iscsi-target_1.4.19.bb b/recipes/iscsi-target/iscsi-target_1.4.20.1.bb index ed61bce024..bcf86f99f0 100644 --- a/recipes/iscsi-target/iscsi-target_1.4.19.bb +++ b/recipes/iscsi-target/iscsi-target_1.4.20.1.bb @@ -3,15 +3,12 @@ HOMEPAGE = "http://iscsitarget.sourceforge.net/" LICENSE = "GPL" PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz;name=iscsitarget1419targz \ - - file://libs.patch \ - file://2.6.31.patch \ - file://2.6.32.patch \ +SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \ file://ietd.conf \ file://init" -SRC_URI[iscsitarget1419targz.md5sum] = "9beca214c28949cce1716b49fec57de4" -SRC_URI[iscsitarget1419targz.sha256sum] = "a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a" + +SRC_URI[md5sum] = "6e5e641b832d420e030d5efb59eca7ce" +SRC_URI[sha256sum] = "994186389911d41a0d2a65b7001ff060f778e2c77f80bd98e03776b215e0732c" S = "${WORKDIR}/iscsitarget-${PV}" diff --git a/recipes/tgt/tgt_1.0.3.bb b/recipes/tgt/tgt_1.0.5.bb index 1b01cecd9c..5c120f60e6 100644 --- a/recipes/tgt/tgt_1.0.3.bb +++ b/recipes/tgt/tgt_1.0.5.bb @@ -4,10 +4,17 @@ LICENSE = "GPLv2" DEPENDS = "openssl" RDEPENDS_${PN} = "iscsi-target" +<<<<<<< HEAD:recipes/tgt/tgt_1.0.5.bb +PR = "r0" +SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz" +SRC_URI[md5sum] = "200fb1b4e8d42b072de2bac238c7d779" +SRC_URI[sha256sum] = "b8cc9fdbacdcd9717b6c4bc15f7999a5bd4a20a334a09b47a3ae5ea21383eb1a" +======= PR = "r1" SRC_URI = "http://stgt.berlios.de/releases/tgt-${PV}.tar.gz;name=tgttargz" SRC_URI[tgttargz.md5sum] = "5a7c6b2c585c5f969c64e2c19f49f439" SRC_URI[tgttargz.sha256sum] = "018f772370fe3dae815e09416e5dae5ae464335a1efe6343cf80612a29fe54e4" +>>>>>>> 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee:recipes/tgt/tgt_1.0.3.bb EXTRA_OEMAKE += "ISCSI=1" diff --git a/recipes/webm/libvpx_0.9.0.bb b/recipes/webm/libvpx_0.9.0.bb index a59d94dd3e..0e7545fa0a 100644 --- a/recipes/webm/libvpx_0.9.0.bb +++ b/recipes/webm/libvpx_0.9.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "vpx Multi-Format Codec SDK" LICENSE = "VP8" -PR = "r2" +PR = "r3" SRC_URI = "http://webm.googlecode.com/files/libvpx-${PV}.tar.bz2" @@ -22,6 +22,7 @@ CONFIGUREOPTS = " \ --target=${VPXTARGET} \ --enable-vp8 \ --enable-libs \ + --disable-install-docs \ " do_install() { |