Re: [edk2-devel] [PATCH 1/1 v2] BaseTools: remove useless dependency on libuuid

Re: [edk2-devel] [PATCH 1/1 v2] BaseTools: remove useless dependency on libuuid

[tlaronde]

New pull request #3975:

https://github.com/tianocore/edk2/pull/3975

CI tests passed.

Could this trivial clean-up please be merged?

TIA

T. Laronde

Le Mon, Jan 30, 2023 at 11:58:43AM +0100, tlaronde@polynum.com a écrit :
> As asked by Bob Feng, I created a pull request #3969:
> 
> https://github.com/tianocore/edk2/pull/3969
> 
> CI check test passed successfully.
> 
> v2:
> 	- Remove also unneeded libuuid linking in GNUMakefile.
> 
> 
> >From d8967e70cf649ed8d9412ba6996906c5ae2ff47d Mon Sep 17 00:00:00 2001
> From: Thierry LARONDE <tlaronde@polynum.com>
> Date: Mon, 30 Jan 2023 10:58:43 +0100
> Subject: [PATCH] Remove useless libuuid dependency.
> 
> Signed-off-by: Thierry LARONDE <tlaronde@polynum.com>
> ---
>  BaseTools/Source/C/GenFv/GNUmakefile        | 6 +-----
>  BaseTools/Source/C/GenFv/GenFvInternalLib.c | 5 -----
>  2 files changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/BaseTools/Source/C/GenFv/GNUmakefile b/BaseTools/Source/C/GenFv/GNUmakefile
> index 7c7b95ba1b..872b981f6a 100644
> --- a/BaseTools/Source/C/GenFv/GNUmakefile
> +++ b/BaseTools/Source/C/GenFv/GNUmakefile
> @@ -14,10 +14,6 @@ include $(MAKEROOT)/Makefiles/app.makefile
>  
>  LIBS = -lCommon
>  ifeq ($(CYGWIN), CYGWIN)
> -  LIBS += -L/lib/e2fsprogs -luuid
> -endif
> -
> -ifeq ($(LINUX), Linux)
> -  LIBS += -luuid
> +  LIBS += -L/lib/e2fsprogs
>  endif
>  
> diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> index 6bd59515b1..2df7182f8b 100644
> --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> @@ -14,11 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  // Include files
>  //
>  
> -#if defined(__FreeBSD__)
> -#include <uuid.h>
> -#elif defined(__GNUC__)
> -#include <uuid/uuid.h>
> -#endif
>  #ifdef __GNUC__
>  #include <sys/stat.h>
>  #endif
> -- 
> 2.39.0
> 

-- 
        Thierry Laronde <tlaronde +AT+ polynum +dot+ com>
                     http://www.kergis.com/
                    http://kertex.kergis.com/
Key fingerprint = 0FF7 E906 FBAF FE95 FD89  250D 52B1 AE95 6006 F40C

回复: [edk2-devel] [PATCH 1/1 v2] BaseTools: remove useless dependency on libuuid

[gaoliming]

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表
> tlaronde@polynum.com
> 发送时间: 2023年2月1日 3:14
> 收件人: devel@edk2.groups.io
> 抄送: Gao, Liming <gaoliming@byosoft.com.cn>; Bob Feng
> <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>;
> michael.d.kinney@intel.com
> 主题: Re: [edk2-devel] [PATCH 1/1 v2] BaseTools: remove useless
> dependency on libuuid
> 
> New pull request #3975:
> 
> https://github.com/tianocore/edk2/pull/3975
> 
> CI tests passed.
> 
> Could this trivial clean-up please be merged?
> 
> TIA
> 
> T. Laronde
> 
> Le Mon, Jan 30, 2023 at 11:58:43AM +0100, tlaronde@polynum.com a écrit :
> > As asked by Bob Feng, I created a pull request #3969:
> >
> > https://github.com/tianocore/edk2/pull/3969
> >
> > CI check test passed successfully.
> >
> > v2:
> > 	- Remove also unneeded libuuid linking in GNUMakefile.
> >
> >
> > >From d8967e70cf649ed8d9412ba6996906c5ae2ff47d Mon Sep 17
> 00:00:00 2001
> > From: Thierry LARONDE <tlaronde@polynum.com>
> > Date: Mon, 30 Jan 2023 10:58:43 +0100
> > Subject: [PATCH] Remove useless libuuid dependency.
> >
> > Signed-off-by: Thierry LARONDE <tlaronde@polynum.com>
> > ---
> >  BaseTools/Source/C/GenFv/GNUmakefile        | 6 +-----
> >  BaseTools/Source/C/GenFv/GenFvInternalLib.c | 5 -----
> >  2 files changed, 1 insertion(+), 10 deletions(-)
> >
> > diff --git a/BaseTools/Source/C/GenFv/GNUmakefile
> b/BaseTools/Source/C/GenFv/GNUmakefile
> > index 7c7b95ba1b..872b981f6a 100644
> > --- a/BaseTools/Source/C/GenFv/GNUmakefile
> > +++ b/BaseTools/Source/C/GenFv/GNUmakefile
> > @@ -14,10 +14,6 @@ include $(MAKEROOT)/Makefiles/app.makefile
> >
> >  LIBS = -lCommon
> >  ifeq ($(CYGWIN), CYGWIN)
> > -  LIBS += -L/lib/e2fsprogs -luuid
> > -endif
> > -
> > -ifeq ($(LINUX), Linux)
> > -  LIBS += -luuid
> > +  LIBS += -L/lib/e2fsprogs
> >  endif
> >
> > diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> > index 6bd59515b1..2df7182f8b 100644
> > --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> > +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> > @@ -14,11 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> >  // Include files
> >  //
> >
> > -#if defined(__FreeBSD__)
> > -#include <uuid.h>
> > -#elif defined(__GNUC__)
> > -#include <uuid/uuid.h>
> > -#endif
> >  #ifdef __GNUC__
> >  #include <sys/stat.h>
> >  #endif
> > --
> > 2.39.0
> >
> 
> --
>         Thierry Laronde <tlaronde +AT+ polynum +dot+ com>
>                      http://www.kergis.com/
>                     http://kertex.kergis.com/
> Key fingerprint = 0FF7 E906 FBAF FE95 FD89  250D 52B1 AE95 6006 F40C
> 
> 
> 
>