aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-08-01 15:21:37 +0800
committerKhem Raj <raj.khem@gmail.com>2018-08-02 11:23:03 -0700
commitf38ff38f48468a4505ed6396e832d2574d7914d7 (patch)
treeb9ee1e489799ab09178a4ed42f2ac25e9389c3bf
parent2f04ee22e136f013d4938d82d93bab0183dce8b9 (diff)
downloadmeta-openembedded-contrib-f38ff38f48468a4505ed6396e832d2574d7914d7.tar.gz
isomd5sum: 1.2.1 -> 1.2.3
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch14
-rw-r--r--meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb (renamed from meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb)2
2 files changed, 8 insertions, 8 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
index bcfc117245..61310ccf5b 100644
--- a/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
+++ b/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
@@ -1,7 +1,7 @@
-From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001
+From a70513ff59da3c593c76330afb445c21761c3268 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
+Date: Tue, 31 Jul 2018 17:14:24 +0800
+Subject: [PATCH 1/2] tweak install prefix
Upstream-Status: Inappropriate [oe specific]
@@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
-index df16a3b..fbdfcb4 100644
+index c98cf35..7c5907f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS)
@@ -43,7 +43,7 @@ index df16a3b..fbdfcb4 100644
- 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
+- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#/usr/include#g; s#@libdir@#/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
@@ -51,10 +51,10 @@ index df16a3b..fbdfcb4 100644
+ 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
++ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#$(includedir)#g; s#@libdir@#$(libdir)#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc
clean:
rm -f *.o *.so *.pyc *.a .depend *~
--
-2.8.1
+2.7.4
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb
index 815113e674..d88df5b459 100644
--- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
+++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb
@@ -30,6 +30,6 @@ 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"
+SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b"
BBCLASSEXTEND = "native"