[PATCH 0/2] e2fsprogs: fix PV and PACKAGECONFIG

[PATCH 0/2] e2fsprogs: fix PV and PACKAGECONFIG

[Robert Yang]

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(-)

-- 
1.7.9.5

[PATCH 1/2] e2fsprogs: add PACKAGECONFIG for fuse

[Robert Yang]

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 <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
index 0aab8ae..b1b7931 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
@@ -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}/
 }
-- 
1.7.9.5

[PATCH 2/2] e2fsprogs: fix PV

[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 <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
index b1b7931..60b2854 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
@@ -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 \
-- 
1.7.9.5

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

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1732 bytes --]

On Mon, Jan 18, 2016 at 07:23:03PM -0800, Robert Yang wrote:
> 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 <liezhi.yang@windriver.com>
> ---
>  meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
> index b1b7931..60b2854 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
> @@ -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.

>  EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
>                  --enable-elf-shlibs --disable-libuuid --disable-uuidd \
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

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

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

On 19 January 2016 at 11:40, Martin Jansa <martin.jansa@gmail.com> wrote:

> 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

[-- Attachment #2: Type: text/html, Size: 845 bytes --]

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

[Robert Yang]

On 01/19/2016 08:04 PM, Burton, Ross wrote:
>
> On 19 January 2016 at 11:40, Martin Jansa <martin.jansa@gmail.com
> <mailto:martin.jansa@gmail.com>> wrote:
>
>     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

>
> Ross