Skip to contentSkip to conversation

e2fsprogs: fix PV and PACKAGECONFIG

PATCH In review Robert Yang 3 participants 6 messages Jan 19, 2016 – Jan 20, 2016

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover e2fsprogs: fix PV and PACKAGECONFIG

The following changes since commit a42229df424552955c0ac62da1063461f97f5938:

openssh: CVE-2016-1907 (2016-01-17 11:32:21 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/e2fsprogs
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/e2fsprogs

Robert Yang (2):
e2fsprogs: add PACKAGECONFIG for fuse
e2fsprogs: fix PV

 meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 e2fsprogs: add PACKAGECONFIG for fuse

Fixed:
e2fsprogs-1.42+1.43-gitAUTOINC+0f26747167: e2fsprogs rdepends on fuse, but it isn't a build dependency? [build-deps]

The fuse is in meta-filesystems layer.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    3 +++
 1 file changed, 3 insertions(+)
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +3 -0
index 0aab8ae..b1b7931 100644
@@ -17,6 +17,9 @@ EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
 
 EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse'
+
 do_configure_prepend () {
 	cp ${WORKDIR}/acinclude.m4 ${S}/
 }
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/2 e2fsprogs: fix PV

In reply to Robert Yang

We had upgraded e2fsprogs from 1.42.9 to 1.43 (WIP), and used:
PV = "1.42+1.43-git${SRCPV}"
But:

$ dpkg --compare-versions 1.42+1.43 gt 1.42.9 && echo greater || echo less
less

It shows that 1.42+1.43 is less than 1.42.9, so this is a downgraded. Use PV = "1.42.13+git${SRCPV}"
to fix the problem. 1.42.13 is the latest e2fsprogs 1.42 version.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +1 -1
index b1b7931..60b2854 100644
@@ -9,7 +9,7 @@ SRC_URI += "file://acinclude.m4 \
 "
 
 SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544"
-PV = "1.42+1.43-git${SRCPV}"
+PV = "1.42.13+git${SRCPV}"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
                 --enable-elf-shlibs --disable-libuuid --disable-uuidd \
Signature · 1 line
1.7.9.5
#3 lore raw

Re: [PATCH 2/2] e2fsprogs: fix PV

Quoted 20 lines · Robert Yang

We had upgraded e2fsprogs from 1.42.9 to 1.43 (WIP), and used:
PV = "1.42+1.43-git${SRCPV}"
But:

$ dpkg --compare-versions 1.42+1.43 gt 1.42.9 && echo greater || echo less
less

It shows that 1.42+1.43 is less than 1.42.9, so this is a downgraded. Use PV = "1.42.13+git${SRCPV}"
to fix the problem. 1.42.13 is the latest e2fsprogs 1.42 version.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +0 -0
index b1b7931..60b2854 100644

meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb SRC_URI += "file://acinclude.m4 \ · line 12

Quoted 5 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI += "file://acinclude.m4 \
 "
 
 SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544"
-PV = "1.42+1.43-git${SRCPV}"
+PV = "1.42.13+git${SRCPV}"

If 0f26747167cc9d82df849b0aad387bf824f04544 is going to be released as 1.43, then it would be better to use 1.42.99+1.43+git${SRCPV} to make sure, that hypothetical 1.42.14 will also sort lower than this future 1.43.

Quoted 10 lines
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +0 -0
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
                 --enable-elf-shlibs --disable-libuuid --disable-uuidd \
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw

Re: [PATCH 2/2] e2fsprogs: fix PV

Quoted 5 lines · Martin Jansa

If 0f26747167cc9d82df849b0aad387bf824f04544 is going to be released as 1.43, then it would be better to use 1.42.99+1.43+git${SRCPV} to make sure, that hypothetical 1.42.14 will also sort lower than this future 1.43.

Agreed - if this hash came from the 1.43 branch and won't ever be released as 1.42, then 1.42.99 is sensible.

Ross

author
#5 lore raw

Re: [PATCH 2/2] e2fsprogs: fix PV

Quoted 4 lines · Ross

On 19 January 2016 at 11:40, Martin Jansa <[email protected] <mailto:[email protected]>> wrote:

Quoted 8 lines
    If 0f26747167cc9d82df849b0aad387bf824f04544 is going to be released as
    1.43, then it would be better to use 1.42.99+1.43+git${SRCPV} to make
    sure, that hypothetical 1.42.14 will also sort lower than this future
    1.43.

Agreed - if this hash came from the 1.43 branch and won't ever be released as 1.42, then 1.42.99 is sensible.

Thanks, I will update it.

// Robert

Quoted 2 lines

Ross