diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/tgt | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
| download | openembedded-c326ad5a1960df22c5efd71bd815b9b12688556e.tar.gz | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/tgt')
| -rw-r--r-- | recipes/tgt/tgt_1.0.5.bb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/recipes/tgt/tgt_1.0.5.bb b/recipes/tgt/tgt_1.0.5.bb index 7baee86fa5..5c120f60e6 100644 --- a/recipes/tgt/tgt_1.0.5.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" |