diff options
| author |   Henning Heinold <heinold@inf.fu-berlin.de> | 2010-06-12 23:24:55 +0200 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2010-06-12 23:24:55 +0200 |
| commit | af076e3b59d54843d48448b64c74a45a3aafd9e0 (patch) | |
| tree | ba2c13a99fb12fabb4afb20a599bb0708df8f0e1 | |
| parent | c326ad5a1960df22c5efd71bd815b9b12688556e (diff) | |
| download | openembedded-af076e3b59d54843d48448b64c74a45a3aafd9e0.tar.gz | |
tgt: unbork then recipe, next please look better into it
| -rw-r--r-- | recipes/tgt/tgt_1.0.5.bb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/recipes/tgt/tgt_1.0.5.bb b/recipes/tgt/tgt_1.0.5.bb index 5c120f60e6..6b835994bd 100644 --- a/recipes/tgt/tgt_1.0.5.bb +++ b/recipes/tgt/tgt_1.0.5.bb @@ -4,18 +4,10 @@ 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" |