summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch60
-rw-r--r--meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch33
-rw-r--r--meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb35
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 @@
1From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 18 Jul 2017 21:53:00 -0400
4Subject: [PATCH] tweak install prefix
5
6Upstream-Status: Inappropriate [oe specific]
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 Makefile | 28 ++++++++++++++--------------
11 1 file changed, 14 insertions(+), 14 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index df16a3b..fbdfcb4 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS)
18 install: all install-bin install-python install-devel
19
20 install-bin:
21- install -d -m 0755 $(DESTDIR)/usr/bin
22- install -d -m 0755 $(DESTDIR)/usr/share/man/man1
23- install -m 0755 implantisomd5 $(DESTDIR)/usr/bin
24- install -m 0755 checkisomd5 $(DESTDIR)/usr/bin
25- install -m 0644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1
26- install -m 0644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1
27+ install -d -m 0755 $(DESTDIR)$(bindir)
28+ install -d -m 0755 $(DESTDIR)$(mandir)/man1
29+ install -m 0755 implantisomd5 $(DESTDIR)$(bindir)
30+ install -m 0755 checkisomd5 $(DESTDIR)$(bindir)
31+ install -m 0644 implantisomd5.1 $(DESTDIR)$(mandir)/man1
32+ install -m 0644 checkisomd5.1 $(DESTDIR)$(mandir)/man1
33
34 install-python:
35 install -d -m 0755 $(DESTDIR)$(PYTHONSITEPACKAGES)
36 install -m 0755 pyisomd5sum.so $(DESTDIR)$(PYTHONSITEPACKAGES)
37
38 install-devel:
39- install -d -m 0755 $(DESTDIR)/usr/include
40- install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)
41- install -d -m 0755 $(DESTDIR)/usr/share/pkgconfig
42- install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/
43- install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/
44- install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR)
45- install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR)
46- 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
47+ install -d -m 0755 $(DESTDIR)$(includedir)
48+ install -d -m 0755 $(DESTDIR)$(libdir)
49+ install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig
50+ install -m 0644 libimplantisomd5.h $(DESTDIR)$(includedir)
51+ install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir)
52+ install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir)
53+ install -m 0644 libcheckisomd5.a $(DESTDIR)$(libdir)
54+ 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
55
56 clean:
57 rm -f *.o *.so *.pyc *.a .depend *~
58--
592.8.1
60
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 @@
1From 2acce7bc8ab7711e76c7765c84a198fe38f247f3 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 18 Jul 2017 23:06:41 -0400
4Subject: [PATCH] fix parallel error
5
6Upstream-Status: Pending
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 Makefile | 6 ++++--
11 1 file changed, 4 insertions(+), 2 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index fbdfcb4..2ad3238 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -29,9 +29,11 @@ implantisomd5: implantisomd5.o libimplantisomd5.a
18 checkisomd5: checkisomd5.o libcheckisomd5.a
19 $(CC) $(CPPFLAGS) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5
20
21-libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o utilities.o)
22+libimplantisomd5.a: libimplantisomd5.o md5.o utilities.o
23+ $(AR) rv $@ $^
24
25-libcheckisomd5.a: libcheckisomd5.a(libcheckisomd5.o md5.o utilities.o)
26+libcheckisomd5.a: libcheckisomd5.o md5.o utilities.o
27+ $(AR) rv $@ $^
28
29 pyisomd5sum.so: $(PYOBJS)
30 $(CC) $(CPPFLAGS) $(CFLAGS) -shared -g -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so
31--
322.8.1
33
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 @@
1SUMMARY = "Tools for taking the MD5 sum of ISO images"
2DESCRIPTION = "Tools for taking the MD5 sum of ISO images"
3
4DEPENDS = "popt python3 openssl curl popt-native"
5RDEPENDS_${PN} = "openssl curl"
6
7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
9
10SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \
11 file://0001-tweak-install-prefix.patch \
12 file://0002-fix-parallel-error.patch \
13"
14
15S = "${WORKDIR}/git"
16inherit python3native
17
18EXTRA_OEMAKE += " \
19 DESTDIR='${D}' \
20 PYTHONINCLUDE='-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}' \
21 PYTHONSITEPACKAGES='${PYTHON_SITEPACKAGES_DIR}' \
22"
23
24do_install () {
25 oe_runmake install
26}
27
28PACKAGES += "${PYTHON_PN}-${PN} ${PYTHON_PN}-${PN}-dbg"
29
30FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
31FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so"
32
33SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026"
34
35BBCLASSEXTEND = "native"