diff mbox series

[oe,meta-oe,5/8] sanlock: Upgrade to 3.8.0+

Message ID 20191231010652.3206534-5-raj.khem@gmail.com
State Superseded
Headers show
Series [oe,meta-oe,1/8] glfw: Update to latest | expand

Commit Message

Khem Raj Dec. 31, 2019, 1:06 a.m. UTC
The original SRCREV was at 3.7.3 even though PV was 3.8.0
this upgrades to latest on top of 3.8.0 to get py3 support

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../recipes-extended/sanlock/sanlock_3.8.0.bb | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

-- 
2.24.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Adrian Bunk Dec. 31, 2019, 7:38 a.m. UTC | #1
On Mon, Dec 30, 2019 at 05:06:50PM -0800, Khem Raj wrote:
> The original SRCREV was at 3.7.3 even though PV was 3.8.0

>...

> -SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f"

>...


This looks like 3.8.0 to me.

> this upgrades to latest on top of 3.8.0 to get py3 support

>...


This should also add +git to PV.

cu
Adrian
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj Dec. 31, 2019, 7:53 a.m. UTC | #2
On Mon, Dec 30, 2019 at 11:38 PM Adrian Bunk <bunk@stusta.de> wrote:
>

> On Mon, Dec 30, 2019 at 05:06:50PM -0800, Khem Raj wrote:

> > The original SRCREV was at 3.7.3 even though PV was 3.8.0

> >...

> > -SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f"


right. this needs a v2. Somehow it gott the wrath of rebase and squash
somewhere.

> >...

>

> This looks like 3.8.0 to me.

>

> > this upgrades to latest on top of 3.8.0 to get py3 support

> >...

>

> This should also add +git to PV.


right

>

> cu

> Adrian

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb
index bf7eaf4111..3b65d48741 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb
@@ -9,13 +9,14 @@  HOMEPAGE = "https://pagure.io/sanlock"
 SECTION = "utils"
 
 LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22"
+LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22"
 
 SRC_URI = "git://pagure.io/sanlock.git;protocol=http \
-           file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
+           file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \
           "
-SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f"
-S = "${WORKDIR}/git"
+SRCREV = "cff348800722f7dadf030ffe7494c2df714996e3"
+
+S = "${WORKDIR}/git/python"
 
 DEPENDS = "libaio util-linux"
 
@@ -24,15 +25,13 @@  inherit distutils3 useradd
 do_configure[noexec] = "1"
 
 do_compile_prepend () {
-    oe_runmake -C wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}"
-    oe_runmake -C src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}"
-    cd ${S}/python
+    oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}"
+    oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}"
 }
 
 do_install_prepend () {
-    oe_runmake -C wdmd DESTDIR=${D} LIBDIR=${libdir} install
-    oe_runmake -C src DESTDIR=${D} LIBDIR=${libdir} install
-    cd ${S}/python
+    oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install
+    oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install
 }
 
 SANLOCKGROUP ?= "sanlock"