summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/libbytesize
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-09-18 13:27:43 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-09-18 13:36:02 +0300
commitb809eb9d31058aad51fb82ff321a6bef45b23e58 (patch)
tree79e830e2b140780b96250c595592e1172bf31869 /meta-openembedded/meta-oe/recipes-support/libbytesize
parent85521d71312d95503e78e3470267cbd4d7a6ecfa (diff)
downloadopenbmc-b809eb9d31058aad51fb82ff321a6bef45b23e58.tar.xz
meta-openembedded: subtree update:19528ba2a6..ef1b17f4ef
Callaghan, Dan (1): lmsensors: add a PACKAGECONFIG for sensord Changqing Li (1): ntp: fix package split wrongly when enabled usrmerge Khem Raj (1): remove spurious file Nathan Rossi (3): libeigen: Add native and nativesdk to BBCLASSEXTEND python*-pyusb: Add native and nativesdk to BBCLASSEXTEND python*-pyserial: Add native and nativesdk to BBCLASSEXTEND Oleksandr Kravchuk (23): babl: update to 0.1.62 znc: update to 1.7.4 zlog: update to 1.2.14 wipe: update to 0.24 upower: update to 0.99.11 python-pyobject: update to 3.34.0 python-pytoml: update to 0.1.21 python-cpuset: update to 1.6 libwebsockets: update to 3.2.0 libvpx: update to 1.8.1 libvdpau: update to 1.3 libmicrohttpd: update to 0.9.66 lcms: update to 2.9 libblockdev: update to 2.23 libbytesize: update to 2.1 iwd: update to 0.20 gsl: update to 2.6 gflags: update to 2.2.2 digitemp: update to 3.7.2 catch2: update to 2.9.2 botan: update to 2.11.0 agent-proxy: update to 1.97 ceres-solver: fix package version Paul Eggleton (1): mosquitto: update to 1.6.5 Scott Ellis (1): wireguard: Upgrade 20190905 to 20190913 Trevor Gamblin (1): openjpeg: upgrade 2.3.0 -> 2.3.1 Yi Zhao (1): samba: upgrade 4.10.7 -> 4.10.8 Zang Ruochen (2): python-dbus: upgrade 1.2.10 -> 1.2.12 python-pluggy: upgrade 0.12.0 -> 0.13.0 Zheng Ruoqin (1): xrdp: 0.9.4 -> 0.9.11 Change-Id: I3152060569cc5af7f7950c7037f25f54191d20a9 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/libbytesize')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch37
-rw-r--r--meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb (renamed from meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb)6
2 files changed, 2 insertions, 41 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch b/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch
deleted file mode 100644
index 3f42c25d7..000000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.1.bb
index 74f1800d1..07bf1faae 100644
--- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.0.bb
+++ b/meta-openembedded/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