diff options
-rw-r--r-- | meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch | 14 | ||||
-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 @@ | |||
1 | From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001 | 1 | From a70513ff59da3c593c76330afb445c21761c3268 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 18 Jul 2017 21:53:00 -0400 | 3 | Date: Tue, 31 Jul 2018 17:14:24 +0800 |
4 | Subject: [PATCH] tweak install prefix | 4 | Subject: [PATCH 1/2] tweak install prefix |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | 7 | ||
@@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
11 | 1 file changed, 14 insertions(+), 14 deletions(-) | 11 | 1 file changed, 14 insertions(+), 14 deletions(-) |
12 | 12 | ||
13 | diff --git a/Makefile b/Makefile | 13 | diff --git a/Makefile b/Makefile |
14 | index df16a3b..fbdfcb4 100644 | 14 | index c98cf35..7c5907f 100644 |
15 | --- a/Makefile | 15 | --- a/Makefile |
16 | +++ b/Makefile | 16 | +++ b/Makefile |
17 | @@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS) | 17 | @@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS) |
@@ -43,7 +43,7 @@ index df16a3b..fbdfcb4 100644 | |||
43 | - install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ | 43 | - install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ |
44 | - install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) | 44 | - install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) |
45 | - install -m 0644 libcheckisomd5.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 | 46 | - sed "s#@VERSION@#${VERSION}#g; s#@includedir@#/usr/include#g; s#@libdir@#/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc |
47 | + install -d -m 0755 $(DESTDIR)$(includedir) | 47 | + install -d -m 0755 $(DESTDIR)$(includedir) |
48 | + install -d -m 0755 $(DESTDIR)$(libdir) | 48 | + install -d -m 0755 $(DESTDIR)$(libdir) |
49 | + install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig | 49 | + install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig |
@@ -51,10 +51,10 @@ index df16a3b..fbdfcb4 100644 | |||
51 | + install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir) | 51 | + install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir) |
52 | + install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir) | 52 | + install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir) |
53 | + install -m 0644 libcheckisomd5.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 | 54 | + sed "s#@VERSION@#${VERSION}#g; s#@includedir@#$(includedir)#g; s#@libdir@#$(libdir)#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc |
55 | 55 | ||
56 | clean: | 56 | clean: |
57 | rm -f *.o *.so *.pyc *.a .depend *~ | 57 | rm -f *.o *.so *.pyc *.a .depend *~ |
58 | -- | 58 | -- |
59 | 2.8.1 | 59 | 2.7.4 |
60 | 60 | ||
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" | |||
30 | FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" | 30 | FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" |
31 | FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so" | 31 | FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so" |
32 | 32 | ||
33 | SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026" | 33 | SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" |
34 | 34 | ||
35 | BBCLASSEXTEND = "native" | 35 | BBCLASSEXTEND = "native" |