public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH 1/2] BaseTools: add centralized location for git config files
@ 2019-06-10 11:54 Leif Lindholm
  2019-06-11  5:25 ` Bob Feng
  0 siblings, 1 reply; 4+ messages in thread
From: Leif Lindholm @ 2019-06-10 11:54 UTC (permalink / raw)
  To: devel
  Cc: Feng, Bob C, Liming Gao, Yonghong Zhu, Andrew Fish, Laszlo Ersek,
	Michael D Kinney

Before adding the git environment initialization script, add the
following files that will be pointed to after running said script:

- BaseTools/Conf/diff.order
- BaseTools/Conf/gitattributes

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
 BaseTools/Conf/diff.order    |  8 ++++++++
 BaseTools/Conf/gitattributes | 14 ++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 BaseTools/Conf/diff.order
 create mode 100644 BaseTools/Conf/gitattributes

diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order
new file mode 100644
index 0000000000..1d578ac28c
--- /dev/null
+++ b/BaseTools/Conf/diff.order
@@ -0,0 +1,8 @@
+*.dec
+*.dsc.inc
+*.dsc
+*.fdf
+*.inf
+*.h
+*.vfr
+*.c
diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes
new file mode 100644
index 0000000000..a8f923fd8a
--- /dev/null
+++ b/BaseTools/Conf/gitattributes
@@ -0,0 +1,14 @@
+*.efi     -diff
+*.EFI     -diff
+*.bin     -diff
+*.BIN     -diff
+*.raw     -diff
+*.RAW     -diff
+*.bmp     -diff
+*.BMP     -diff
+*.dec     diff=ini
+*.dsc     diff=ini
+*.dsc.inc diff=ini
+*.fdf     diff=ini
+*.fdf.inc diff=ini
+*.inf     diff=ini
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] BaseTools: add centralized location for git config files
  2019-06-10 11:54 [PATCH 1/2] BaseTools: add centralized location for git config files Leif Lindholm
@ 2019-06-11  5:25 ` Bob Feng
  2019-06-11  9:35   ` Leif Lindholm
  0 siblings, 1 reply; 4+ messages in thread
From: Bob Feng @ 2019-06-11  5:25 UTC (permalink / raw)
  To: Leif Lindholm, devel@edk2.groups.io
  Cc: Gao, Liming, Zhu, Yonghong, Andrew Fish, Laszlo Ersek,
	Kinney, Michael D

Hi Leif,

These 2 new file have no license header, need to add?

Thanks,
Bob

-----Original Message-----
From: Leif Lindholm [mailto:leif.lindholm@linaro.org] 
Sent: Monday, June 10, 2019 7:54 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: [PATCH 1/2] BaseTools: add centralized location for git config files

Before adding the git environment initialization script, add the following files that will be pointed to after running said script:

- BaseTools/Conf/diff.order
- BaseTools/Conf/gitattributes

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
 BaseTools/Conf/diff.order    |  8 ++++++++
 BaseTools/Conf/gitattributes | 14 ++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 BaseTools/Conf/diff.order  create mode 100644 BaseTools/Conf/gitattributes

diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order new file mode 100644 index 0000000000..1d578ac28c
--- /dev/null
+++ b/BaseTools/Conf/diff.order
@@ -0,0 +1,8 @@
+*.dec
+*.dsc.inc
+*.dsc
+*.fdf
+*.inf
+*.h
+*.vfr
+*.c
diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes new file mode 100644 index 0000000000..a8f923fd8a
--- /dev/null
+++ b/BaseTools/Conf/gitattributes
@@ -0,0 +1,14 @@
+*.efi     -diff
+*.EFI     -diff
+*.bin     -diff
+*.BIN     -diff
+*.raw     -diff
+*.RAW     -diff
+*.bmp     -diff
+*.BMP     -diff
+*.dec     diff=ini
+*.dsc     diff=ini
+*.dsc.inc diff=ini
+*.fdf     diff=ini
+*.fdf.inc diff=ini
+*.inf     diff=ini
--
2.11.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] BaseTools: add centralized location for git config files
  2019-06-11  5:25 ` Bob Feng
@ 2019-06-11  9:35   ` Leif Lindholm
  2019-06-12  1:07     ` Bob Feng
  0 siblings, 1 reply; 4+ messages in thread
From: Leif Lindholm @ 2019-06-11  9:35 UTC (permalink / raw)
  To: Feng, Bob C
  Cc: devel@edk2.groups.io, Gao, Liming, Zhu, Yonghong, Andrew Fish,
	Laszlo Ersek, Kinney, Michael D

Right, I tend to think of configuration files as
not-really-copyrightable.

Would you like me to send a v2, or would you be OK with me adding
#
# Copyright (c) 2019, Linaro Ltd. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
to both files and pushing the series?

Regards

Leif

On Tue, Jun 11, 2019 at 05:25:58AM +0000, Feng, Bob C wrote:
> Hi Leif,
> 
> These 2 new file have no license header, need to add?
> 
> Thanks,
> Bob
> 
> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org] 
> Sent: Monday, June 10, 2019 7:54 PM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: [PATCH 1/2] BaseTools: add centralized location for git config files
> 
> Before adding the git environment initialization script, add the following files that will be pointed to after running said script:
> 
> - BaseTools/Conf/diff.order
> - BaseTools/Conf/gitattributes
> 
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  BaseTools/Conf/diff.order    |  8 ++++++++
>  BaseTools/Conf/gitattributes | 14 ++++++++++++++
>  2 files changed, 22 insertions(+)
>  create mode 100644 BaseTools/Conf/diff.order  create mode 100644 BaseTools/Conf/gitattributes
> 
> diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order new file mode 100644 index 0000000000..1d578ac28c
> --- /dev/null
> +++ b/BaseTools/Conf/diff.order
> @@ -0,0 +1,8 @@
> +*.dec
> +*.dsc.inc
> +*.dsc
> +*.fdf
> +*.inf
> +*.h
> +*.vfr
> +*.c
> diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes new file mode 100644 index 0000000000..a8f923fd8a
> --- /dev/null
> +++ b/BaseTools/Conf/gitattributes
> @@ -0,0 +1,14 @@
> +*.efi     -diff
> +*.EFI     -diff
> +*.bin     -diff
> +*.BIN     -diff
> +*.raw     -diff
> +*.RAW     -diff
> +*.bmp     -diff
> +*.BMP     -diff
> +*.dec     diff=ini
> +*.dsc     diff=ini
> +*.dsc.inc diff=ini
> +*.fdf     diff=ini
> +*.fdf.inc diff=ini
> +*.inf     diff=ini
> --
> 2.11.0
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] BaseTools: add centralized location for git config files
  2019-06-11  9:35   ` Leif Lindholm
@ 2019-06-12  1:07     ` Bob Feng
  0 siblings, 0 replies; 4+ messages in thread
From: Bob Feng @ 2019-06-12  1:07 UTC (permalink / raw)
  To: Leif Lindholm
  Cc: devel@edk2.groups.io, Gao, Liming, Zhu, Yonghong, Andrew Fish,
	Laszlo Ersek, Kinney, Michael D

OK. I will add the header when I do push.

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Leif Lindholm [mailto:leif.lindholm@linaro.org] 
Sent: Tuesday, June 11, 2019 5:35 PM
To: Feng, Bob C <bob.c.feng@intel.com>
Cc: devel@edk2.groups.io; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: Re: [PATCH 1/2] BaseTools: add centralized location for git config files

Right, I tend to think of configuration files as not-really-copyrightable.

Would you like me to send a v2, or would you be OK with me adding # # Copyright (c) 2019, Linaro Ltd. All rights reserved.
#
# SPDX-License-Identifier: BSD-2-Clause-Patent # to both files and pushing the series?

Regards

Leif

On Tue, Jun 11, 2019 at 05:25:58AM +0000, Feng, Bob C wrote:
> Hi Leif,
> 
> These 2 new file have no license header, need to add?
> 
> Thanks,
> Bob
> 
> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: Monday, June 10, 2019 7:54 PM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming 
> <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Andrew 
> Fish <afish@apple.com>; Laszlo Ersek <lersek@redhat.com>; Kinney, 
> Michael D <michael.d.kinney@intel.com>
> Subject: [PATCH 1/2] BaseTools: add centralized location for git 
> config files
> 
> Before adding the git environment initialization script, add the following files that will be pointed to after running said script:
> 
> - BaseTools/Conf/diff.order
> - BaseTools/Conf/gitattributes
> 
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  BaseTools/Conf/diff.order    |  8 ++++++++
>  BaseTools/Conf/gitattributes | 14 ++++++++++++++
>  2 files changed, 22 insertions(+)
>  create mode 100644 BaseTools/Conf/diff.order  create mode 100644 
> BaseTools/Conf/gitattributes
> 
> diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order new 
> file mode 100644 index 0000000000..1d578ac28c
> --- /dev/null
> +++ b/BaseTools/Conf/diff.order
> @@ -0,0 +1,8 @@
> +*.dec
> +*.dsc.inc
> +*.dsc
> +*.fdf
> +*.inf
> +*.h
> +*.vfr
> +*.c
> diff --git a/BaseTools/Conf/gitattributes 
> b/BaseTools/Conf/gitattributes new file mode 100644 index 
> 0000000000..a8f923fd8a
> --- /dev/null
> +++ b/BaseTools/Conf/gitattributes
> @@ -0,0 +1,14 @@
> +*.efi     -diff
> +*.EFI     -diff
> +*.bin     -diff
> +*.BIN     -diff
> +*.raw     -diff
> +*.RAW     -diff
> +*.bmp     -diff
> +*.BMP     -diff
> +*.dec     diff=ini
> +*.dsc     diff=ini
> +*.dsc.inc diff=ini
> +*.fdf     diff=ini
> +*.fdf.inc diff=ini
> +*.inf     diff=ini
> --
> 2.11.0
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-06-12  1:07 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-10 11:54 [PATCH 1/2] BaseTools: add centralized location for git config files Leif Lindholm
2019-06-11  5:25 ` Bob Feng
2019-06-11  9:35   ` Leif Lindholm
2019-06-12  1:07     ` Bob Feng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox