diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2016-05-18 14:11:14 -0600 |
---|---|---|
committer | Dan McGregor <dan.mcgregor@usask.ca> | 2016-07-06 12:57:44 -0600 |
commit | 30662b849aad37c1d339327676706de2f9b71a9e (patch) | |
tree | 4f5c3ada037d70ec4fff2391a7c50cc242904427 | |
parent | fab5a46ca63ca0f9cd3d1524703eaec91ec997a6 (diff) | |
download | meta-openembedded-contrib-30662b849aad37c1d339327676706de2f9b71a9e.tar.gz |
mercurial: update to 3.8.2 and make target recipe
Update mercurial to 3.8.2, while here, make the recipe build for the
target so it can be installed as part of an sdk.
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
-rw-r--r-- | meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb | 26 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/mercurial/mercurial_3.8.2.bb | 63 |
2 files changed, 63 insertions, 26 deletions
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb b/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb deleted file mode 100644 index aeec195fa2..0000000000 --- a/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "The Mercurial distributed SCM" -HOMEPAGE = "http://mercurial.selenic.com/" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "python-native" - -SRC_URI = "http://mercurial.selenic.com/release/mercurial-${PV}.tar.gz" -SRC_URI[md5sum] = "65783a60aefb46a11296b587e9403537" -SRC_URI[sha256sum] = "7a8acf7329beda38ceea29c689212574d9a6bfffe24cf565015ea0066f7cee3f" - -S = "${WORKDIR}/mercurial-${PV}" - -inherit native - -EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ - PREFIX=${prefix}" - -do_configure_append () { - sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile -} - -do_install () { - oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} -} - diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_3.8.2.bb b/meta-oe/recipes-devtools/mercurial/mercurial_3.8.2.bb new file mode 100644 index 0000000000..ce21c1263c --- /dev/null +++ b/meta-oe/recipes-devtools/mercurial/mercurial_3.8.2.bb @@ -0,0 +1,63 @@ +SUMMARY = "The Mercurial distributed SCM" +HOMEPAGE = "http://mercurial.selenic.com/" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "http://mercurial.selenic.com/release/mercurial-${PV}.tar.gz" +SRC_URI[md5sum] = "c38daa0cbe264fc621dc3bb05933b0b3" +SRC_URI[sha256sum] = "cb78b16956140625266a8a6d1fadc7c868969d994086e1ec60279a66bf20bffd" + +S = "${WORKDIR}/mercurial-${PV}" + +inherit distutils + +DEPENDS += "python-docutils-native" + +RDEPENDS_${PN} += " \ + python-codecs \ + python-contextlib \ + python-crypt \ + python-debugger \ + python-io \ + python-lang \ + python-mime \ + python-netclient \ + python-re \ + python-readline \ + python-shell \ + python-stringold \ + python-textutils \ + python-threading \ + python-unixadmin \ + python-xml \ +" + +RDEPENDS_${PN}_class-native = "" + +do_compile_append_class-target() { + oe_runmake -C doc PREFIX=${prefix} +} + +do_install_append() { + oe_runmake -C doc install DESTDIR=${D} PREFIX=${prefix} + + install -m 755 ${S}/contrib/hg-ssh ${D}${bindir} + install -m 755 ${S}/hgeditor ${D}${bindir} + + mkdir -p ${D}${docdir}/${BPN} + install -m 644 ${S}/CONTRIBUTORS ${D}${docdir}/${BPN} + install -m 644 ${S}/COPYING ${D}${docdir}/${BPN} + install -m 644 ${S}/doc/*1.txt ${D}${docdir}/${BPN} + install -m 644 ${S}/doc/*5.txt ${D}${docdir}/${BPN} + install -m 644 ${S}/doc/*.html ${D}${docdir}/${BPN} + install -m 644 ${S}/doc/style.css ${D}${docdir}/${BPN} + install -m 644 ${S}/contrib/logo-droplets.svg ${D}${docdir}/${BPN} + + mkdir -p ${D}${docdir}/${BPN}/examples + install -m 755 ${S}/hgweb.cgi ${D}${docdir}/${BPN}/examples + install -m 755 ${S}/contrib/hgweb.fcgi ${D}${docdir}/${BPN}/examples + install -m 644 ${S}/contrib/hgweb.wsgi ${D}${docdir}/${BPN}/examples +} + +BBCLASSEXTEND = "native nativesdk" |