isomd5sum: add recipe 1.2.1

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 128 insertions, 0 deletions

diff --git a/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch b/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
new file mode 100644
index 000000000..bcfc11724
--- /dev/null
+++ b/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
@@ -0,0 +1,60 @@
+From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 18 Jul 2017 21:53:00 -0400
+Subject: [PATCH] tweak install prefix
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index df16a3b..fbdfcb4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS)
+ install: all install-bin install-python install-devel
+ 
+ install-bin:
+-       install -d -m 0755 $(DESTDIR)/usr/bin
+-       install -d -m 0755 $(DESTDIR)/usr/share/man/man1
+-       install -m 0755 implantisomd5 $(DESTDIR)/usr/bin
+-       install -m 0755 checkisomd5 $(DESTDIR)/usr/bin
+-       install -m 0644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1
+-       install -m 0644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1
++       install -d -m 0755 $(DESTDIR)$(bindir)
++       install -d -m 0755 $(DESTDIR)$(mandir)/man1
++       install -m 0755 implantisomd5 $(DESTDIR)$(bindir)
++       install -m 0755 checkisomd5 $(DESTDIR)$(bindir)
++       install -m 0644 implantisomd5.1 $(DESTDIR)$(mandir)/man1
++       install -m 0644 checkisomd5.1 $(DESTDIR)$(mandir)/man1
+ 
+ install-python:
+        install -d -m 0755 $(DESTDIR)$(PYTHONSITEPACKAGES)
+        install -m 0755 pyisomd5sum.so $(DESTDIR)$(PYTHONSITEPACKAGES)
+ 
+ install-devel:
+-       install -d -m 0755 $(DESTDIR)/usr/include
+-       install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)
+-       install -d -m 0755 $(DESTDIR)/usr/share/pkgconfig
+-       install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/
+-       install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/
+-       install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR)
+-       install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR)
+-       sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc
++       install -d -m 0755 $(DESTDIR)$(includedir)
++       install -d -m 0755 $(DESTDIR)$(libdir)
++       install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig
++       install -m 0644 libimplantisomd5.h $(DESTDIR)$(includedir)
++       install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir)
++       install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir)
++       install -m 0644 libcheckisomd5.a $(DESTDIR)$(libdir)
++       sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc
+ 
+ clean:
+        rm -f *.o *.so *.pyc *.a .depend *~
+-- 
+2.8.1
+
diff --git a/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch b/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch
new file mode 100644
index 000000000..7a33e423a
--- /dev/null
+++ b/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch
@@ -0,0 +1,33 @@
+From 2acce7bc8ab7711e76c7765c84a198fe38f247f3 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 18 Jul 2017 23:06:41 -0400
+Subject: [PATCH] fix parallel error
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fbdfcb4..2ad3238 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,9 +29,11 @@ implantisomd5: implantisomd5.o libimplantisomd5.a
+ checkisomd5: checkisomd5.o libcheckisomd5.a
+        $(CC) $(CPPFLAGS) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5
+ 
+-libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o utilities.o)
++libimplantisomd5.a: libimplantisomd5.o md5.o utilities.o
++       $(AR) rv $@ $^
+ 
+-libcheckisomd5.a: libcheckisomd5.a(libcheckisomd5.o md5.o utilities.o)
++libcheckisomd5.a: libcheckisomd5.o md5.o utilities.o
++       $(AR) rv $@ $^
+ 
+ pyisomd5sum.so: $(PYOBJS)
+        $(CC) $(CPPFLAGS) $(CFLAGS) -shared -g -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so
+-- 
+2.8.1
+
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
new file mode 100644
index 000000000..815113e67
--- /dev/null
+++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Tools for taking the MD5 sum of ISO images"
+DESCRIPTION = "Tools for taking the MD5 sum of ISO images"
+
+DEPENDS = "popt python3 openssl curl popt-native"
+RDEPENDS_${PN} = "openssl curl"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \
+           file://0001-tweak-install-prefix.patch \
+           file://0002-fix-parallel-error.patch \
+"
+
+S = "${WORKDIR}/git"
+inherit python3native
+
+EXTRA_OEMAKE += " \
+    DESTDIR='${D}' \
+    PYTHONINCLUDE='-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}' \
+    PYTHONSITEPACKAGES='${PYTHON_SITEPACKAGES_DIR}' \
+"
+
+do_install () {
+    oe_runmake install
+}
+
+PACKAGES += "${PYTHON_PN}-${PN} ${PYTHON_PN}-${PN}-dbg"
+
+FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
+FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so"
+
+SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026"
+
+BBCLASSEXTEND = "native"