[edk2,edk2-staging,04/19] IntelUndiPkg/GigUndiDxe: consistently use forward slashes as path separators

Message ID 20181106175833.26964-5-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC
Related show

Commit Message

Ard Biesheuvel Nov. 6, 2018, 5:58 p.m.
Replace backslashes in paths with forward slashes to be compatible with
non-Windows OSes.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 IntelUndiPkg/GigUndiDxe/Decode.c       |  2 +-
 IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf | 14 +++++++-------
 IntelUndiPkg/GigUndiDxe/e1000_osdep.h  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

-- 
2.19.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Philippe Mathieu-Daudé Nov. 6, 2018, 7:37 p.m. | #1
On 6/11/18 18:58, Ard Biesheuvel wrote:
> Replace backslashes in paths with forward slashes to be compatible with
> non-Windows OSes.

I thought the Windows format expected escaped backslashes...

> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>   IntelUndiPkg/GigUndiDxe/Decode.c       |  2 +-
>   IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf | 14 +++++++-------
>   IntelUndiPkg/GigUndiDxe/e1000_osdep.h  |  4 ++--
>   3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/IntelUndiPkg/GigUndiDxe/Decode.c b/IntelUndiPkg/GigUndiDxe/Decode.c
> index 14060db0d050..9f8a5a8c1c81 100644
> --- a/IntelUndiPkg/GigUndiDxe/Decode.c
> +++ b/IntelUndiPkg/GigUndiDxe/Decode.c
> @@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   
>   ***************************************************************************/
>   #include "e1000.h"
> -#include <Uefi\UEfiPxe.h>
> +#include <Uefi/UefiPxe.h>
>   
>   /** This routine determines the operational state of the UNDI.  It updates the state flags in the
>      Command Descriptor Block based on information derived from the GigAdapter instance data.
> diff --git a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
> index 0e4462733df6..6c195872c00f 100644
> --- a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
> +++ b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
> @@ -115,13 +115,13 @@ AdapterInformation.c
>   AdapterInformation.h
>   Version.h
>   
> -wol\wol.h
> -wol\wol.c
> -wol\wolimpl.h
> -wol\wolimpl.c
> -wol\wolfamily.c
> -wol\wolinfo.c
> -wol\wol_1G.c
> +wol/wol.h
> +wol/wol.c
> +wol/wolimpl.h
> +wol/wolimpl.c
> +wol/wolfamily.c
> +wol/wolinfo.c
> +wol/wol_1G.c
>   
>   [sources.X64]
>     
> diff --git a/IntelUndiPkg/GigUndiDxe/e1000_osdep.h b/IntelUndiPkg/GigUndiDxe/e1000_osdep.h
> index 01c0843a2c9a..4408b409a445 100644
> --- a/IntelUndiPkg/GigUndiDxe/e1000_osdep.h
> +++ b/IntelUndiPkg/GigUndiDxe/e1000_osdep.h
> @@ -31,8 +31,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   
>   #include <Uefi.h>
>   #include <Base.h>
> -#include <Library\BaseLib.h>
> -#include <Library\BaseMemoryLib.h>
> +#include <Library/BaseLib.h>
> +#include <Library/BaseMemoryLib.h>
>   
>   #pragma warning(disable : 4244)
>   #pragma warning(disable : 4206)
>
Ryszard Knop Jan. 29, 2019, 2:26 p.m. | #2
Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com>


On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote:
> Replace backslashes in paths with forward slashes to be compatible

> with

> non-Windows OSes.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>

> ---

>  IntelUndiPkg/GigUndiDxe/Decode.c       |  2 +-

>  IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf | 14 +++++++-------

>  IntelUndiPkg/GigUndiDxe/e1000_osdep.h  |  4 ++--

>  3 files changed, 10 insertions(+), 10 deletions(-)

> 

> diff --git a/IntelUndiPkg/GigUndiDxe/Decode.c

> b/IntelUndiPkg/GigUndiDxe/Decode.c

> index 14060db0d050..9f8a5a8c1c81 100644

> --- a/IntelUndiPkg/GigUndiDxe/Decode.c

> +++ b/IntelUndiPkg/GigUndiDxe/Decode.c

> @@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE

> POSSIBILITY OF SUCH DAMAGE.

>  

>  ********************************************************************

> *******/

>  #include "e1000.h"

> -#include <Uefi\UEfiPxe.h>

> +#include <Uefi/UefiPxe.h>

>  

>  /** This routine determines the operational state of the UNDI.  It

> updates the state flags in the

>     Command Descriptor Block based on information derived from the

> GigAdapter instance data.

> diff --git a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> index 0e4462733df6..6c195872c00f 100644

> --- a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> +++ b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf

> @@ -115,13 +115,13 @@ AdapterInformation.c

>  AdapterInformation.h

>  Version.h

>  

> -wol\wol.h

> -wol\wol.c

> -wol\wolimpl.h

> -wol\wolimpl.c

> -wol\wolfamily.c

> -wol\wolinfo.c

> -wol\wol_1G.c

> +wol/wol.h

> +wol/wol.c

> +wol/wolimpl.h

> +wol/wolimpl.c

> +wol/wolfamily.c

> +wol/wolinfo.c

> +wol/wol_1G.c

>  

>  [sources.X64]

>    

> diff --git a/IntelUndiPkg/GigUndiDxe/e1000_osdep.h

> b/IntelUndiPkg/GigUndiDxe/e1000_osdep.h

> index 01c0843a2c9a..4408b409a445 100644

> --- a/IntelUndiPkg/GigUndiDxe/e1000_osdep.h

> +++ b/IntelUndiPkg/GigUndiDxe/e1000_osdep.h

> @@ -31,8 +31,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE

> POSSIBILITY OF SUCH DAMAGE.

>  

>  #include <Uefi.h>

>  #include <Base.h>

> -#include <Library\BaseLib.h>

> -#include <Library\BaseMemoryLib.h>

> +#include <Library/BaseLib.h>

> +#include <Library/BaseMemoryLib.h>

>  

>  #pragma warning(disable : 4244)

>  #pragma warning(disable : 4206)


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/IntelUndiPkg/GigUndiDxe/Decode.c b/IntelUndiPkg/GigUndiDxe/Decode.c
index 14060db0d050..9f8a5a8c1c81 100644
--- a/IntelUndiPkg/GigUndiDxe/Decode.c
+++ b/IntelUndiPkg/GigUndiDxe/Decode.c
@@ -27,7 +27,7 @@  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 #include "e1000.h"
-#include <Uefi\UEfiPxe.h>
+#include <Uefi/UefiPxe.h>
 
 /** This routine determines the operational state of the UNDI.  It updates the state flags in the
    Command Descriptor Block based on information derived from the GigAdapter instance data.
diff --git a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
index 0e4462733df6..6c195872c00f 100644
--- a/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
+++ b/IntelUndiPkg/GigUndiDxe/GigUndiDxe.inf
@@ -115,13 +115,13 @@  AdapterInformation.c
 AdapterInformation.h
 Version.h
 
-wol\wol.h
-wol\wol.c
-wol\wolimpl.h
-wol\wolimpl.c
-wol\wolfamily.c
-wol\wolinfo.c
-wol\wol_1G.c
+wol/wol.h
+wol/wol.c
+wol/wolimpl.h
+wol/wolimpl.c
+wol/wolfamily.c
+wol/wolinfo.c
+wol/wol_1G.c
 
 [sources.X64]
   
diff --git a/IntelUndiPkg/GigUndiDxe/e1000_osdep.h b/IntelUndiPkg/GigUndiDxe/e1000_osdep.h
index 01c0843a2c9a..4408b409a445 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000_osdep.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000_osdep.h
@@ -31,8 +31,8 @@  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <Uefi.h>
 #include <Base.h>
-#include <Library\BaseLib.h>
-#include <Library\BaseMemoryLib.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
 
 #pragma warning(disable : 4244)
 #pragma warning(disable : 4206)