The Makefile of xenstore and related to that the global .gitignore
file contain some leftovers from ancient times. Remove those.

While at it sort the tools/xenstore/* entries in .gitignore.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 .gitignore              | 7 +++----
 tools/xenstore/Makefile | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c2fa1530b..4aad2ddd65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -288,15 +288,15 @@ tools/xenpaging/xenpaging
 tools/xenpmd/xenpmd
 tools/xenstore/xenstore
 tools/xenstore/xenstore-chmod
+tools/xenstore/xenstore-control
 tools/xenstore/xenstore-exists
 tools/xenstore/xenstore-list
+tools/xenstore/xenstore-ls
 tools/xenstore/xenstore-read
 tools/xenstore/xenstore-rm
+tools/xenstore/xenstore-watch
 tools/xenstore/xenstore-write
-tools/xenstore/xenstore-control
-tools/xenstore/xenstore-ls
 tools/xenstore/xenstored
-tools/xenstore/xenstored_test
 tools/xenstore/xs_tdb_dump
 tools/xentop/xentop
 tools/xentrace/xentrace_setsize
@@ -428,7 +428,6 @@ tools/firmware/etherboot/ipxe.tar.gz
 tools/firmware/etherboot/ipxe/
 tools/python/xen/lowlevel/xl/_pyxl_types.c
 tools/python/xen/lowlevel/xl/_pyxl_types.h
-tools/xenstore/xenstore-watch
 tools/xl/_paths.h
 tools/xl/xl
 
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 01c9ccc70f..292b478fa1 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -90,7 +90,7 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
 .PHONY: clean
 clean:
 	rm -f *.a *.o xenstored_probes.h
-	rm -f xenstored xs_random xs_stress xs_crashme
+	rm -f xenstored
 	rm -f xs_tdb_dump xenstore-control init-xenstore-domain
 	rm -f xenstore $(CLIENTS)
 	$(RM) $(DEPS_RM)
-- 
2.26.2

Hi Juergen,

On 14/05/2021 10:01, Juergen Gross wrote:
> The Makefile of xenstore and related to that the global .gitignore
> file contain some leftovers from ancient times. Remove those.
> 
> While at it sort the tools/xenstore/* entries in .gitignore.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Acked-by: Julien Grall <jgrall@amazon.com>

Cheers,

> ---
>   .gitignore              | 7 +++----
>   tools/xenstore/Makefile | 2 +-
>   2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 1c2fa1530b..4aad2ddd65 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -288,15 +288,15 @@ tools/xenpaging/xenpaging
>   tools/xenpmd/xenpmd
>   tools/xenstore/xenstore
>   tools/xenstore/xenstore-chmod
> +tools/xenstore/xenstore-control
>   tools/xenstore/xenstore-exists
>   tools/xenstore/xenstore-list
> +tools/xenstore/xenstore-ls
>   tools/xenstore/xenstore-read
>   tools/xenstore/xenstore-rm
> +tools/xenstore/xenstore-watch
>   tools/xenstore/xenstore-write
> -tools/xenstore/xenstore-control
> -tools/xenstore/xenstore-ls
>   tools/xenstore/xenstored
> -tools/xenstore/xenstored_test
>   tools/xenstore/xs_tdb_dump
>   tools/xentop/xentop
>   tools/xentrace/xentrace_setsize
> @@ -428,7 +428,6 @@ tools/firmware/etherboot/ipxe.tar.gz
>   tools/firmware/etherboot/ipxe/
>   tools/python/xen/lowlevel/xl/_pyxl_types.c
>   tools/python/xen/lowlevel/xl/_pyxl_types.h
> -tools/xenstore/xenstore-watch
>   tools/xl/_paths.h
>   tools/xl/xl
>   
> diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
> index 01c9ccc70f..292b478fa1 100644
> --- a/tools/xenstore/Makefile
> +++ b/tools/xenstore/Makefile
> @@ -90,7 +90,7 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
>   .PHONY: clean
>   clean:
>   	rm -f *.a *.o xenstored_probes.h
> -	rm -f xenstored xs_random xs_stress xs_crashme
> +	rm -f xenstored
>   	rm -f xs_tdb_dump xenstore-control init-xenstore-domain
>   	rm -f xenstore $(CLIENTS)
>   	$(RM) $(DEPS_RM)
> 

-- 
Julien Grall

On 14/05/2021 18:06, Julien Grall wrote:
> Hi Juergen,
> 
> On 14/05/2021 10:01, Juergen Gross wrote:
>> The Makefile of xenstore and related to that the global .gitignore
>> file contain some leftovers from ancient times. Remove those.
>>
>> While at it sort the tools/xenstore/* entries in .gitignore.
>>
>> Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Acked-by: Julien Grall <jgrall@amazon.com>

Committed.

Cheers,

-- 
Julien Grall