aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Jackson <Ian.Jackson@eu.citrix.com>2012-06-28 15:59:24 +0100
committerIan Jackson <Ian.Jackson@eu.citrix.com>2012-06-28 15:59:24 +0100
commit11c0cc13b76d378a6520d34c2c7143bfd2496f75 (patch)
treee621004630b354ec9f3e64248cb7e6cceabaa6df
parent8742c8ef005ff05da421c83182970fd9ecfbb56b (diff)
downloadxen-11c0cc13b76d378a6520d34c2c7143bfd2496f75.tar.gz
xen-11c0cc13b76d378a6520d34c2c7143bfd2496f75.tar.bz2
xen-11c0cc13b76d378a6520d34c2c7143bfd2496f75.zip
hgignore/gitignore: add xen/arch/x86/boot/reloc.bin, .lnk
25479:61dfb3da56b0 added a .PRECIOUS which causes these files to be left over more often. They should have been ignored already, though. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--.gitignore2
-rw-r--r--.hgignore4
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 7770e54d6b..24b9846e50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -296,6 +296,8 @@ xen/arch/x86/asm-offsets.s
xen/arch/x86/boot/mkelf32
xen/arch/x86/xen.lds
xen/arch/x86/boot/reloc.S
+xen/arch/x86/boot/reloc.bin
+xen/arch/x86/boot/reloc.lnk
xen/arch/x86/efi.lds
xen/arch/x86/efi/disabled
xen/arch/x86/efi/mkreloc
diff --git a/.hgignore b/.hgignore
index 27d8f794ae..ee17571b7b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -322,7 +322,9 @@
^xen/arch/x86/asm-offsets\.s$
^xen/arch/x86/boot/mkelf32$
^xen/arch/x86/xen\.lds$
-^xen/arch/x86/boot/reloc.S$
+^xen/arch/x86/boot/reloc\.S$
+^xen/arch/x86/boot/reloc\.bin$
+^xen/arch/x86/boot/reloc\.lnk$
^xen/arch/x86/efi\.lds$
^xen/arch/x86/efi/disabled$
^xen/arch/x86/efi/mkreloc$