Skip to contentSkip to conversation

Mainly build system fixes and cleanups

PATCH In review Daniel Kiper 7 participants 45 messages May 7, 2013 – May 10, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

cover Mainly build system fixes and cleanups

Hi,

Here are patches for issues (mainly build system problems) which I found during work on different stuff:
- xen/arch/x86: Fix efi directory cleanup,
- tools/libfsimage: Fix clean and distclean make targets,
- tools/debugger/kdd: Remove dependencies files during make clean,
- tools/xenmon: Fix typo in Makefile,
- tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean,
- stubdom: Clean extras/mini-os directory during make clean,
- stubdom: Remove xenstore directory during make crossclean,
- stubdom: Do not create dangling links,
- stubdom/vtpm: Silently ignore rm errors during make clean,
- docs: Remove tmp files during make clean,
- Silently ignore rm and include errors during make distclean,
- Remove tools/libaio/src/syscall-ia64.h file,
- Remove traces of IA-64 architecture support.

I think that it is worth to apply most
of them to stable trees too.

Daniel

#1 lore raw

PATCH 1/13 xen/arch/x86: Fix efi directory cleanup

clean target is never called from xen/arch/x86/efi/Makefile. Move all needed stuff to xen/arch/x86/Makefile
and additionally remove efi.lds.

---
 xen/arch/x86/Makefile     |    4 ++--
 xen/arch/x86/efi/Makefile |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
xen/arch/x86/Makefile +2 -2
index 0fe547b..091c272 100644
@@ -166,7 +166,7 @@ efi/mkreloc: efi/mkreloc.c
 
 .PHONY: clean
 clean::
-	rm -f asm-offsets.s xen.lds boot/*.o boot/*~ boot/core boot/mkelf32
+	rm -f asm-offsets.s xen.lds efi.lds boot/*.o boot/*~ boot/core boot/mkelf32
 	rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d
-	rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/mkreloc efi/.*.d
+	rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/.*.d efi/*.efi efi/disabled efi/mkreloc
 	rm -f boot/reloc.S boot/reloc.lnk boot/reloc.bin
xen/arch/x86/efi/Makefile +0 -3
index 514dba0..1daa7ac 100644
@@ -12,6 +12,3 @@ efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(c
 extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o
 
 stub.o: $(extra-y)
-
-clean::
-	rm -f disabled *.efi
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/13 tools/libfsimage: Fix clean and distclean make targets

In reply to Daniel Kiper

Define clean and distclean make targets as double-colon rules. Remove some unneeded stuff.

---
 tools/libfsimage/Rules.mk        |    2 +-
 tools/libfsimage/common/Makefile |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
tools/libfsimage/Rules.mk +1 -1
index e4b2a91..8a23655 100644
@@ -21,7 +21,7 @@ fs-install: fs-all
 $(FSLIB): $(PIC_OBJS)
 	$(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS)
 
-clean distclean:
+clean distclean::
 	rm -f $(PIC_OBJS) $(FSLIB) $(DEPS)
 
 -include $(DEPS)
tools/libfsimage/common/Makefile +2 -2
index f0ee3ab..cbd60b4 100644
@@ -31,8 +31,8 @@ install: all
 	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
 
-clean distclean:
-	rm -f $(PIC_OBJS) $(LIB) $(DEPS)
+clean distclean::
+	rm -f $(LIB)
 
 libfsimage.so: libfsimage.so.$(MAJOR)
 	ln -sf $< $@
Signature · 1 line
1.7.10.4
#3 lore raw

Re: [PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets

Daniel Kiper writes ("[PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets"):

Quoted 1 line

Define clean and distclean make targets as double-colon rules.

To clarify: AIUI the effect of doing this in libfsimage/Rules.mk is that if other Makefiles which include libfsimage/Rules.mk also define clean and/or distclean, (a) they must do so with double-colon rather than single-colon and (b) all the commands (from libfsimage/Rules.mk and Makefile) will be run.

Is that right ? At the moment, after your patch, the double-colon-ness doesn't have any effect ?

I think this could all be better explained in the commit message.

Thanks,
Ian.

#4 lore raw

Re: [PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets

Quoted 8 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets"):

Quoted 1 line

Define clean and distclean make targets as double-colon rules.

To clarify: AIUI the effect of doing this in libfsimage/Rules.mk is that if other Makefiles which include libfsimage/Rules.mk also define clean and/or distclean, (a) they must do so with double-colon rather than single-colon and (b) all the commands (from libfsimage/Rules.mk and Makefile) will be run.

Right.

Quoted 2 lines

Is that right ? At the moment, after your patch, the double-colon-ness doesn't have any effect ?

If there is a single colon then make executes only one target and displays following warning:

Makefile:35: warning: overriding commands for target `clean' tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25:
warning: ignoring old commands for target clean' Makefile:35: warning: overriding commands for target distclean' tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25:
warning: ignoring old commands for target `distclean'

My patch fixes this issue. However, I have just realized that I forgot about other makefiles in subdirs. I will fix it and post new patch.

Quoted 1 line

I think this could all be better explained in the commit message.

Sure, I will do that.

Daniel

#5 lore raw

Re: [PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets

Quoted 25 lines · Daniel Kiper
Quoted 8 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets"):

Quoted 1 line

Define clean and distclean make targets as double-colon rules.

To clarify: AIUI the effect of doing this in libfsimage/Rules.mk is that if other Makefiles which include libfsimage/Rules.mk also define clean and/or distclean, (a) they must do so with double-colon rather than single-colon and (b) all the commands (from libfsimage/Rules.mk and Makefile) will be run.

Right.

Quoted 2 lines

Is that right ? At the moment, after your patch, the double-colon-ness doesn't have any effect ?

If there is a single colon then make executes only one target and displays following warning:

Makefile:35: warning: overriding commands for target `clean' tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25:
warning: ignoring old commands for target clean' Makefile:35: warning: overriding commands for target distclean' tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25:
warning: ignoring old commands for target `distclean'

Quoted 3 lines

My patch fixes this issue. However, I have just realized that I forgot about other makefiles in subdirs. I will fix it and post new patch.

The two sets of rules seem to be in fsimage/common/Makefile:

        clean distclean:
                rm -f $(PIC_OBJS) $(LIB) $(DEPS)

and in tools/libfsimage/Rules.mk:

        clean distclean:
                rm -f $(PIC_OBJS) $(FSLIB) $(DEPS)

Which seems a bit redundant anyway, perhaps rather than allowing both rules we should combine them and just have tools/libfsimage/Rules.mk:

        clean distclean:
                rm -f $(PIC_OBJS) $(LIB) $(FSLIB) $(DEPS)

?

Ian

#6 lore raw

Re: [PATCH 02/13] tools/libfsimage: Fix clean and distclean make targets

On Thu, May 09, 2013 at 09:17:01AM +0100, Ian Campbell wrote:

[...]

Quoted 7 lines

The two sets of rules seem to be in fsimage/common/Makefile:

        clean distclean:
                rm -f $(PIC_OBJS) $(LIB) $(DEPS)

and in tools/libfsimage/Rules.mk:

Quoted 8 lines
        clean distclean:
                rm -f $(PIC_OBJS) $(FSLIB) $(DEPS)

Which seems a bit redundant anyway, perhaps rather than allowing both rules we should combine them and just have tools/libfsimage/Rules.mk:

        clean distclean:
                rm -f $(PIC_OBJS) $(LIB) $(FSLIB) $(DEPS)

?

Yes, my last patch fixed that too. However, I think that it is worth to change those rules to double-colon and have one generic and some specific if required. As I saw this solution is used in some places in Xen source. Anyway, I will post new patch for review.

Daniel

#7 lore raw

PATCH 3/13 tools/debugger/kdd: Remove dependencies files during make clean

In reply to Daniel Kiper

Remove dependencies files during make clean.

---
 tools/debugger/kdd/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/debugger/kdd/Makefile +1 -1
index 8b50766..b569749 100644
@@ -14,7 +14,7 @@ kdd: $(OBJS)
 
 .PHONY: clean
 clean:
-	rm -f $(OBJS) kdd
+	rm -f $(OBJS) $(DEPS) kdd
 
 .PHONY: install
 install: all
Signature · 1 line
1.7.10.4
Acked-by on v1 3/13
#8 lore raw

Re: [PATCH 03/13] tools/debugger/kdd: Remove dependencies files during make clean

Daniel Kiper writes ("[PATCH 03/13] tools/debugger/kdd: Remove dependencies files during make clean"):

Quoted 1 line

Remove dependencies files during make clean.

Acked-by
#9 lore raw

Re: [PATCH 03/13] tools/debugger/kdd: Remove dependencies files during make clean

Quoted 4 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 03/13] tools/debugger/kdd: Remove dependencies files during make clean"):

Quoted 1 line

Remove dependencies files during make clean.

Re release:

Quoted 5 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#10 lore raw

PATCH 4/13 tools/xenmon: Fix typo in Makefile

In reply to Daniel Kiper

Fix typo in Makefile.

---
 tools/xenmon/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/xenmon/Makefile +1 -1
index 5648075..3fe87ba 100644
@@ -38,7 +38,7 @@ install: build
 clean:
 	$(RM) -f $(DEPS)
 	$(RM) -f xenbaked xenbaked.o
-	$(RM) -f xentrace_setmake setmask.o
+	$(RM) -f xentrace_setmask setmask.o
 
 xenbaked: xenbaked.o Makefile
 	$(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
Signature · 1 line
1.7.10.4
Acked-by on v1 4/13
#11 lore raw

Re: [PATCH 04/13] tools/xenmon: Fix typo in Makefile

Daniel Kiper writes ("[PATCH 04/13] tools/xenmon: Fix typo in Makefile"):

Quoted 1 line

Fix typo in Makefile.

#13 lore raw

PATCH 5/13 tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean

In reply to Daniel Kiper

Remove src/libxenstat.a file during make clean.

---
 tools/xenstat/libxenstat/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/xenstat/libxenstat/Makefile +1 -1
index adeb495..21aad89 100644
@@ -139,7 +139,7 @@ endif
 
 .PHONY: clean
 clean:
-	rm -f $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
+	rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
 	      $(BINDINGS) $(BINDINGSRC) $(DEPS)
 
 -include $(DEPS)
Signature · 1 line
1.7.10.4
Acked-by on v1 5/13
#14 lore raw

Re: [PATCH 05/13] tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean

Daniel Kiper writes ("[PATCH 05/13] tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean"):

Quoted 1 line

Remove src/libxenstat.a file during make clean.

Acked-by
#15 lore raw

Re: [PATCH 05/13] tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean

Quoted 4 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 05/13] tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean"):

Quoted 1 line

Remove src/libxenstat.a file during make clean.

Re release:

Quoted 5 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#16 lore raw

PATCH 6/13 stubdom: Clean extras/mini-os directory during make clean

In reply to Daniel Kiper

Clean extras/mini-os directory during make clean.

---
 stubdom/Makefile |    1 +
 1 file changed, 1 insertion(+)
stubdom/Makefile +1 -0
index a2ac044..91e2e1a 100644
@@ -498,6 +498,7 @@ clean:
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
+	$(MAKE) DESTDIR= -C $(MINI_OS) clean
 	$(MAKE) DESTDIR= -C caml clean
 	$(MAKE) DESTDIR= -C c clean
 	$(MAKE) -C vtpm clean
Signature · 1 line
1.7.10.4
Acked-by on v1 6/13
#17 lore raw

Re: [PATCH 06/13] stubdom: Clean extras/mini-os directory during make clean

Quoted 3 lines · Daniel Kiper, le Tue 07 May 2013 13:51:41 +0200, a écrit :

Clean extras/mini-os directory during make clean.

Quoted 19 lines
---
 stubdom/Makefile |    1 +
 1 file changed, 1 insertion(+)
stubdom/Makefile +1 -0
index a2ac044..91e2e1a 100644
@@ -498,6 +498,7 @@ clean:
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
+	$(MAKE) DESTDIR= -C $(MINI_OS) clean
 	$(MAKE) DESTDIR= -C caml clean
 	$(MAKE) DESTDIR= -C c clean
 	$(MAKE) -C vtpm clean
Signature · 1 line
1.7.10.4
Signature · 9 lines
Samuel
Now, it we had this sort of thing:
  yield -a     for yield to all traffic
  yield -t     for yield to trucks
  yield -f     for yield to people walking (yield foot)
  yield -d t*  for yield on days starting with t
...you'd have a lot of dead people at intersections, and traffic jams you
wouldn't believe...
(Discussion in comp.os.linux.misc on the intuitiveness of commands.)
Acked-by on v1 6/13
#18 lore raw

Re: [PATCH 06/13] stubdom: Clean extras/mini-os directory during make clean

In reply to Daniel Kiper
Quoted 3 lines · Daniel Kiper

Clean extras/mini-os directory during make clean.

Re release:

Quoted 24 lines
---
 stubdom/Makefile |    1 +
 1 file changed, 1 insertion(+)
stubdom/Makefile +1 -1
index a2ac044..91e2e1a 100644
@@ -498,6 +498,7 @@ clean:
        rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
        rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
        rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
+       $(MAKE) DESTDIR= -C $(MINI_OS) clean
        $(MAKE) DESTDIR= -C caml clean
        $(MAKE) DESTDIR= -C c clean
        $(MAKE) -C vtpm clean
--

1.7.10.4

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#19 lore raw

PATCH 7/13 stubdom: Remove xenstore directory during make crossclean

In reply to Daniel Kiper

Remove xenstore directory during make crossclean.

---
 stubdom/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/Makefile +1 -1
index 91e2e1a..b1a2d18 100644
@@ -515,7 +515,7 @@ crossclean: clean
 	rm -fr $(CROSS_ROOT)
 	rm -fr newlib-$(XEN_TARGET_ARCH)
 	rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH)
-	rm -fr libxc-$(XEN_TARGET_ARCH) ioemu
+	rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore
 	rm -fr gmp-$(XEN_TARGET_ARCH)
 	rm -fr polarssl-$(XEN_TARGET_ARCH)
 	rm -fr openssl-$(XEN_TARGET_ARCH)
Signature · 1 line
1.7.10.4
Acked-by on v1 7/13
#20 lore raw

Re: [PATCH 07/13] stubdom: Remove xenstore directory during make crossclean

Quoted 3 lines · Daniel Kiper, le Tue 07 May 2013 13:51:42 +0200, a écrit :

Remove xenstore directory during make crossclean.

Quoted 20 lines
---
 stubdom/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/Makefile +1 -1
index 91e2e1a..b1a2d18 100644
@@ -515,7 +515,7 @@ crossclean: clean
 	rm -fr $(CROSS_ROOT)
 	rm -fr newlib-$(XEN_TARGET_ARCH)
 	rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH)
-	rm -fr libxc-$(XEN_TARGET_ARCH) ioemu
+	rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore
 	rm -fr gmp-$(XEN_TARGET_ARCH)
 	rm -fr polarssl-$(XEN_TARGET_ARCH)
 	rm -fr openssl-$(XEN_TARGET_ARCH)
Signature · 1 line
1.7.10.4
Signature · 3 lines
Samuel
<k> faut en profiter, aujourd'hui, les blagues bidon sont à 100 dollars
 -+- #sos-bourse -+-
Acked-by on v1 7/13
#21 lore raw

Re: [PATCH 07/13] stubdom: Remove xenstore directory during make crossclean

In reply to Daniel Kiper
Quoted 3 lines · Daniel Kiper

Remove xenstore directory during make crossclean.

Re release:

Quoted 25 lines
---
 stubdom/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/Makefile +1 -2
index 91e2e1a..b1a2d18 100644
@@ -515,7 +515,7 @@ crossclean: clean
        rm -fr $(CROSS_ROOT)
        rm -fr newlib-$(XEN_TARGET_ARCH)
        rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH)
-       rm -fr libxc-$(XEN_TARGET_ARCH) ioemu
+       rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore
        rm -fr gmp-$(XEN_TARGET_ARCH)
        rm -fr polarssl-$(XEN_TARGET_ARCH)
        rm -fr openssl-$(XEN_TARGET_ARCH)
--

1.7.10.4

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#22 lore raw

PATCH 8/13 stubdom: Do not create dangling links

In reply to Daniel Kiper

There is not architecture dependent files in libxc hence do not create dangling links.

---
 stubdom/Makefile |    5 -----
 1 file changed, 5 deletions(-)
stubdom/Makefile +0 -5
index b1a2d18..f316d4e 100644
@@ -304,11 +304,6 @@ mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
 	  ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \
 	  ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \
 	  ln -sf $(XEN_ROOT)/tools/libxc/Makefile . )
-	mkdir -p libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH)
-	[ -h libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) ] || ( cd libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) && \
-	  ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \
-	  ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \
-	  ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . )
 	mkdir -p xenstore
 	[ -h xenstore/Makefile ] || ( cd xenstore && \
 	  ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \
Signature · 1 line
1.7.10.4
Acked-by on v1 8/13
#23 lore raw

Re: [PATCH 08/13] stubdom: Do not create dangling links

Quoted 4 lines · Daniel Kiper, le Tue 07 May 2013 13:51:43 +0200, a écrit :

There is not architecture dependent files in libxc hence do not create dangling links.

Quoted 23 lines
---
 stubdom/Makefile |    5 -----
 1 file changed, 5 deletions(-)
stubdom/Makefile +0 -5
index b1a2d18..f316d4e 100644
@@ -304,11 +304,6 @@ mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
 	  ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \
 	  ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \
 	  ln -sf $(XEN_ROOT)/tools/libxc/Makefile . )
-	mkdir -p libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH)
-	[ -h libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) ] || ( cd libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) && \
-	  ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \
-	  ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \
-	  ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . )
 	mkdir -p xenstore
 	[ -h xenstore/Makefile ] || ( cd xenstore && \
 	  ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \
Signature · 1 line
1.7.10.4
Signature · 5 lines
Samuel
J'ai beaucoup de mal a lire fcola quand il y a toutes les annonces de howto :
les annonces interessantes sont noyees dans les howto. Ca serait pas mal
de degager toute cette pollution dans un autre groupe.
  JLM in Guide du linuxien pervers : "Cachez ces doc que je ne saurais voir"
Acked-by on v1 8/13
#24 lore raw

Re: [PATCH 08/13] stubdom: Do not create dangling links

In reply to Daniel Kiper
Quoted 4 lines · Daniel Kiper

There is not architecture dependent files in libxc hence do not create dangling links.

Re release:

Quoted 28 lines
---
 stubdom/Makefile |    5 -----
 1 file changed, 5 deletions(-)
stubdom/Makefile +0 -6
index b1a2d18..f316d4e 100644
@@ -304,11 +304,6 @@ mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
          ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \
          ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \
          ln -sf $(XEN_ROOT)/tools/libxc/Makefile . )
-       mkdir -p libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH)
-       [ -h libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) ] || ( cd libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) && \
-         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \
-         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \
-         ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . )
        mkdir -p xenstore
        [ -h xenstore/Makefile ] || ( cd xenstore && \
          ln -sf $(XEN_ROOT)/tools/xenstore/*.c . && \
--

1.7.10.4

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#25 lore raw

PATCH 9/13 stubdom/vtpm: Silently ignore rm errors during make clean

In reply to Daniel Kiper

Silently ignore rm errors during make clean.

---
 stubdom/vtpm/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/vtpm/Makefile +1 -1
index 37051c1..316794c 100644
@@ -29,6 +29,6 @@ vtpm_manager.h:
 	ln -s ../vtpmmgr/vtpm_manager.h vtpm_manager.h
 
 clean:
-	-rm $(TARGET) $(OBJS) vtpm_manager.h
+	rm -f $(TARGET) $(OBJS) vtpm_manager.h
 
 .PHONY: clean
Signature · 1 line
1.7.10.4
Acked-by on v1 9/13
#26 lore raw

Re: [PATCH 09/13] stubdom/vtpm: Silently ignore rm errors during make clean

Quoted 3 lines · Daniel Kiper, le Tue 07 May 2013 13:51:44 +0200, a écrit :

Silently ignore rm errors during make clean.

Quoted 19 lines
---
 stubdom/vtpm/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/vtpm/Makefile +1 -1
index 37051c1..316794c 100644
@@ -29,6 +29,6 @@ vtpm_manager.h:
 	ln -s ../vtpmmgr/vtpm_manager.h vtpm_manager.h
 
 clean:
-	-rm $(TARGET) $(OBJS) vtpm_manager.h
+	rm -f $(TARGET) $(OBJS) vtpm_manager.h
 
 .PHONY: clean
Signature · 1 line
1.7.10.4
Signature · 2 lines
Samuel
<L> pour moi le seul qui est autorisé à fasciser, c moi :-)
Acked-by on v1 9/13
#27 lore raw

Re: [PATCH 09/13] stubdom/vtpm: Silently ignore rm errors during make clean

In reply to Daniel Kiper
Quoted 3 lines · Daniel Kiper

Silently ignore rm errors during make clean.

Quoted 17 lines
---
  stubdom/vtpm/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
stubdom/vtpm/Makefile +1 -1
index 37051c1..316794c 100644
@@ -29,6 +29,6 @@ vtpm_manager.h:
  	ln -s ../vtpmmgr/vtpm_manager.h vtpm_manager.h
 
  clean:
-	-rm $(TARGET) $(OBJS) vtpm_manager.h
+	rm -f $(TARGET) $(OBJS) vtpm_manager.h
 
  .PHONY: clean
#28 lore raw

PATCH 10/13 docs: Remove tmp files during make clean

In reply to Daniel Kiper

Remove tmp files during make clean.

---
 docs/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
docs/Makefile +1 -1
index 5f319a1..72b3c0b 100644
@@ -68,7 +68,7 @@ man5/%.5: man/%.pod.5 Makefile
 clean:
 	$(MAKE) -C figs clean
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
-	rm -rf *.ilg *.log *.ind *.toc *.bak core
+	rm -rf *.ilg *.log *.ind *.toc *.bak *.tmp core
 	rm -rf html txt
 	rm -rf man5
 	rm -rf man1
Signature · 1 line
1.7.10.4
Acked-by on v1 10/13
#29 lore raw

Re: [PATCH 10/13] docs: Remove tmp files during make clean

Daniel Kiper writes ("[PATCH 10/13] docs: Remove tmp files during make clean"):

Quoted 1 line

Remove tmp files during make clean.

Acked-by
#30 lore raw

Re: [PATCH 10/13] docs: Remove tmp files during make clean

Quoted 4 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 10/13] docs: Remove tmp files during make clean"):

Quoted 1 line

Remove tmp files during make clean.

Re release:

Quoted 5 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#31 lore raw

PATCH 11/13 Silently ignore rm and include errors during make distclean

In reply to Daniel Kiper

Silently ignore rm and include errors during make distclean.

---
 Makefile                         |    2 +-
 buildconfigs/mk.linux-2.6-common |    2 +-
 stubdom/Makefile                 |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
Makefile +1 -1
index 32efb70..5a7107e 100644
@@ -158,7 +158,7 @@ endif
 # clean, but blow away kernel build tree plus tarballs
 .PHONY: distclean
 distclean:
-	-rm config/Toplevel.mk
+	rm -f config/Toplevel.mk
 	$(MAKE) -C xen distclean
 	$(MAKE) -C tools distclean
 	$(MAKE) -C stubdom distclean
buildconfigs/mk.linux-2.6-common +1 -1
index f3680f0..e8e97fb 100644
@@ -29,7 +29,7 @@ LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))
 .PHONY: _build
 _build: build
 
-include buildconfigs/src.$(XEN_LINUX_SOURCE)
+-include buildconfigs/src.$(XEN_LINUX_SOURCE)
 
 LINUX_ARCH = $$(sh buildconfigs/select-linux-arch $(LINUX_SRCDIR))
 IMAGE_PATH = $$(sh buildconfigs/select-linux-image $(LINUX_DIR) $(LINUX_ARCH) $(IMAGE_TARGET))
stubdom/Makefile +1 -2
index f316d4e..32f0daf 100644
@@ -546,8 +546,7 @@ downloadclean: patchclean
 
 .PHONY: distclean
 distclean: downloadclean
-	-rm ../config/Stubdom.mk
-	rm -rf config.log config.status config.cache autom4te.cache
+	rm -rf config.log config.status config.cache autom4te.cache ../config/Stubdom.mk
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Stubdom.mk:
Signature · 1 line
1.7.10.4
Acked-by on v1 11/13
#32 lore raw

Re: [PATCH 11/13] Silently ignore rm and include errors during make distclean

Daniel Kiper writes ("[PATCH 11/13] Silently ignore rm and include errors during make distclean"):

Quoted 1 line

Silently ignore rm and include errors during make distclean.

Acked-by
#33 lore raw

Re: [PATCH 11/13] Silently ignore rm and include errors during make distclean

Quoted 4 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 11/13] Silently ignore rm and include errors during make distclean"):

Quoted 1 line

Silently ignore rm and include errors during make distclean.

Re release:

Quoted 5 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#34 lore raw

PATCH 12/13 Remove tools/libaio/src/syscall-ia64.h file

In reply to Daniel Kiper

There is no support for IA-64 architecture in Xen. Remove tools/libaio/src/syscall-ia64.h file.

---
 tools/libaio/src/syscall-ia64.h |   45 ---------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 tools/libaio/src/syscall-ia64.h
tools/libaio/src/syscall-ia64.h deleted +0 -45
deleted file mode 100644
index 52ce9dd..0000000
@@ -1,45 +0,0 @@
-#define __NR_io_setup		1238
-#define __NR_io_destroy		1239
-#define __NR_io_getevents	1240
-#define __NR_io_submit		1241
-#define __NR_io_cancel		1242
-
-#define __ia64_raw_syscall(fname, sname) \
-	__asm__ (".text\n"						\
-		".globl " SYMSTR(fname) "\n"				\
-		".proc " SYMSTR(fname) "\n"				\
-		SYMSTR(fname) ":\n"					\
-		"	mov r15=" SYMSTR( __NR_ ## sname ) "\n"		\
-		"	break 0x100000\n"				\
-		"	;;\n"						\
-		"	cmp.eq p6,p0=-1,r10\n"				\
-		"	;;\n"						\
-		"	(p6) sub r8=0,r8\n"				\
-		"	br.ret.sptk.few b0\n"				\
-		".size " SYMSTR(fname) ", . - " SYMSTR(fname) "\n"	\
-		".endp " SYMSTR(fname) "\n"				\
-	);
-
-#define io_syscall0(type, name)						\
-	extern type name(void);						\
-	__ia64_raw_syscall(name);
-
-#define io_syscall1(type, fname, sname, type1, arg1)			\
-	extern type fname(type1 arg1);					\
-	__ia64_raw_syscall(fname, sname);
-
-#define io_syscall2(type, fname, sname, type1, arg1, type2, arg2)	\
-	extern type fname(type1 arg1, type2 arg2);			\
-	__ia64_raw_syscall(fname, sname);
-
-#define io_syscall3(type, fname, sname, type1, arg1, type2, arg2, type3, arg3)	\
-	extern type fname(type1 arg1, type2 arg2, type3 arg3);		\
-	__ia64_raw_syscall(fname, sname);
-
-#define io_syscall4(type, fname, sname, type1, arg1, type2, arg2, type3, arg3, type4, arg4)	\
-	extern type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4);		\
-	__ia64_raw_syscall(fname, sname);
-
-#define io_syscall5(type, fname, sname, type1, arg1, type2, arg2, type3, arg3, type4, arg4, type5, arg5)	\
-	extern type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5);			\
-	__ia64_raw_syscall(fname, sname);
Signature · 1 line
1.7.10.4
Acked-by on v1 12/13
#35 lore raw

Re: [PATCH 12/13] Remove tools/libaio/src/syscall-ia64.h file

Daniel Kiper writes ("[PATCH 12/13] Remove tools/libaio/src/syscall-ia64.h file"):

Quoted 2 lines

There is no support for IA-64 architecture in Xen. Remove tools/libaio/src/syscall-ia64.h file.

Acked-by
#36 lore raw

Re: [PATCH 12/13] Remove tools/libaio/src/syscall-ia64.h file

Quoted 5 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 12/13] Remove tools/libaio/src/syscall-ia64.h file"):

Quoted 2 lines

There is no support for IA-64 architecture in Xen. Remove tools/libaio/src/syscall-ia64.h file.

Re release:

Quoted 5 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#37 lore raw

PATCH 13/13 Remove traces of IA-64 architecture support

In reply to Daniel Kiper

Remove traces of IA-64 architecture support.

---
 docs/Makefile    |    2 +-
 stubdom/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
docs/Makefile +1 -1
index 72b3c0b..b26738c 100644
@@ -128,7 +128,7 @@ html/hypercall/index.html: ./xen-headers
 	$(INSTALL_DIR) $(@D)
 	./xen-headers -O $(@D) \
 		-T 'arch-x86_64 - Xen public headers' \
-		-X arch-ia64 -X arch-x86_32 -X xen-x86_32 -X arch-arm \
+		-X arch-x86_32 -X xen-x86_32 -X arch-arm \
 		../xen include/public include/xen/errno.h
 
 -include html/hypercall/.deps
stubdom/Makefile +1 -1
index 32f0daf..9caccc4 100644
@@ -292,7 +292,7 @@ endif
 mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
 	mkdir -p include/xen && \
           ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) include/xen && \
-          ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \
+          ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) include/xen && \
           ( [ -h include/xen/sys ] || ln -sf $(XEN_ROOT)/tools/include/xen-sys/MiniOS include/xen/sys ) && \
           ( [ -h include/xen/libelf ] || ln -sf $(XEN_ROOT)/tools/include/xen/libelf include/xen/libelf ) && \
 	  mkdir -p include/xen-foreign && \
Signature · 1 line
1.7.10.4
Acked-by on v1 13/13
#38 lore raw

Re: [PATCH 13/13] Remove traces of IA-64 architecture support

Quoted 3 lines · Daniel Kiper, le Tue 07 May 2013 13:51:48 +0200, a écrit :

Remove traces of IA-64 architecture support.

Quoted 34 lines
---
 docs/Makefile    |    2 +-
 stubdom/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
docs/Makefile +1 -1
index 72b3c0b..b26738c 100644
@@ -128,7 +128,7 @@ html/hypercall/index.html: ./xen-headers
 	$(INSTALL_DIR) $(@D)
 	./xen-headers -O $(@D) \
 		-T 'arch-x86_64 - Xen public headers' \
-		-X arch-ia64 -X arch-x86_32 -X xen-x86_32 -X arch-arm \
+		-X arch-x86_32 -X xen-x86_32 -X arch-arm \
 		../xen include/public include/xen/errno.h
 
 -include html/hypercall/.deps
stubdom/Makefile +1 -1
index 32f0daf..9caccc4 100644
@@ -292,7 +292,7 @@ endif
 mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp
 	mkdir -p include/xen && \
           ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) include/xen && \
-          ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) include/xen && \
+          ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) include/xen && \
           ( [ -h include/xen/sys ] || ln -sf $(XEN_ROOT)/tools/include/xen-sys/MiniOS include/xen/sys ) && \
           ( [ -h include/xen/libelf ] || ln -sf $(XEN_ROOT)/tools/include/xen/libelf include/xen/libelf ) && \
 	  mkdir -p include/xen-foreign && \
Signature · 1 line
1.7.10.4
Signature · 5 lines
Samuel
 tohi.cybercable.fr (212.198.0.3) si une personne se reconnait derriere
 cette adresse que ce soit un pirate ou une victime qu'il se manifeste,
 cette personne pourrait bien etre un petit malin
 -+- Fred in NPC : Mamaaaaan, y a le routeur qui veut me hacker -+-
Acked-by
#40 lore raw

Re: [PATCH 13/13] Remove traces of IA-64 architecture support

Quoted 4 lines · Ian Jackson

Daniel Kiper writes ("[PATCH 13/13] Remove traces of IA-64 architecture support"):

Quoted 1 line

Remove traces of IA-64 architecture support.

Re release:

Quoted 5 lines

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#41 lore raw
In reply to Daniel Kiper
Quoted 4 lines · Daniel Kiper

Hi,

Here are patches for issues (mainly build system problems) which I found during work on different stuff:

Although these are mostly (exclusively?) fixes if you are proposing them for 4.3 then they need acking by the release manager. George CCd.

Quoted 19 lines

- xen/arch/x86: Fix efi directory cleanup,
- tools/libfsimage: Fix clean and distclean make targets,
- tools/debugger/kdd: Remove dependencies files during make clean,
- tools/xenmon: Fix typo in Makefile,
- tools/xenstat/libxenstat: Remove src/libxenstat.a file during make clean,
- stubdom: Clean extras/mini-os directory during make clean,
- stubdom: Remove xenstore directory during make crossclean,
- stubdom: Do not create dangling links,
- stubdom/vtpm: Silently ignore rm errors during make clean,
- docs: Remove tmp files during make clean,
- Silently ignore rm and include errors during make distclean,
- Remove tools/libaio/src/syscall-ia64.h file,
- Remove traces of IA-64 architecture support.

I think that it is worth to apply most
of them to stable trees too.

Daniel

#42 lore raw

Ian Campbell writes ("Re: [PATCH 00/13] Mainly build system fixes and cleanups"):

Quoted 6 lines · Daniel Kiper
Quoted 2 lines

Here are patches for issues (mainly build system problems) which I found during work on different stuff:

Although these are mostly (exclusively?) fixes if you are proposing them for 4.3 then they need acking by the release manager. George CCd.

Most of them look like fixes to me. The ones I've acked are IMO fine for 4.3, but it's George's decision.

Quoted 2 lines
Quoted 2 lines

I think that it is worth to apply most
of them to stable trees too.

Arguably, yes.

Ian.

#43 lore raw
In reply to Daniel Kiper
Quoted 4 lines · Daniel Kiper

Hi,

Here are patches for issues (mainly build system problems) which I found during work on different stuff:

I applied all of these with the various acks except:

Quoted 1 line

- xen/arch/x86: Fix efi directory cleanup,

Already applied by Jan.

Quoted 1 line

- tools/libfsimage: Fix clean and distclean make targets,

Ian J had some comments here so I have left for now.

You seem to have a habit of repeating the subject line in the body of the commit log, which looks ok in email but is strange in the git log, so I have stripped those as I went.

Ian.

#44 lore raw
Quoted 7 lines · Ian Campbell
Quoted 4 lines · Daniel Kiper

Hi,

Here are patches for issues (mainly build system problems) which I found during work on different stuff:

I applied all of these with the various acks except:

Thanks.

Quoted 3 lines
Quoted 1 line

- xen/arch/x86: Fix efi directory cleanup,

Already applied by Jan.

Thanks.

Quoted 4 lines
Quoted 2 lines

- xen/arch/x86: Fix efi directory cleanup,
- tools/libfsimage: Fix clean and distclean make targets,

Ian J had some comments here so I have left for now.

OK.

Quoted 3 lines

You seem to have a habit of repeating the subject line in the body of the commit log, which looks ok in email but is strange in the git log, so I have stripped those as I went.

No problem.

Daniel