diff options
Diffstat (limited to 'meta-oe/recipes-support/libbytesize')
-rw-r--r-- | meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch | 37 | ||||
-rw-r--r-- | meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb (renamed from meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb) | 6 |
2 files changed, 2 insertions, 41 deletions
diff --git a/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch b/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch deleted file mode 100644 index 3f42c25d7e..0000000000 --- a/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 55802fd187b844f0c114c1657b18482bfc80ec51 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 2 Jul 2019 02:52:31 +0000 -Subject: [PATCH] fix out of tree build failure - -Since commit [116da95 Add the '--version' option to bs_calc.py] applied, -while build out of tree, there is a install failure -... -|install -m0755 ../../git/tools/bs_calc.py /usr/bin/bscalc -|install: cannot stat '../../git/tools/bs_calc.py': No such file or directory -... - -The generated bs_calc.py locates in builddir rather than srcdir - -Upstream-Status: Submitted [https://github.com/storaged-project/libbytesize/pull/59] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 08223a8..ae22fed 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -5,7 +5,7 @@ dist_man1_MANS = bscalc.man - - install-exec-local: - install -d ${DESTDIR}${bindir} -- install -m0755 ${srcdir}/bs_calc.py ${DESTDIR}${bindir}/bscalc -+ install -m0755 ${builddir}/bs_calc.py ${DESTDIR}${bindir}/bscalc - - uninstall-local: - rm ${DESTDIR}${bindir}/bscalc --- -2.17.1 - diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb index 74f1800d18..07bf1faaeb 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb @@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "92c00638a6f846df5c40dbb690f9fcf998ad6df2" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ - file://0001-fix-out-of-tree-build-failure.patch \ -" +SRCREV = "9ecc1042109528051983261ffd491d45e7c471e1" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" inherit gettext autotools python3native |