- Make xen-setup use the env CC

  - Remove disalbe-aio (add into ioemu-compil)
  - rebase alsa-config

diff --git a/master/alsa-config b/master/alsa-config
index 24e992cdce8a5752ca8ebadbd155d75fd824bbae..3b351ff078f067142215b9344e4d683038966b94 100644 (file)
--- a/master/alsa-config
+++ b/master/alsa-config
@@ -12,10 +12,10 @@ index 5b1f4d7..75a748c 100644
 +
  #endif /*XEN_CONFIG_HOST_H*/
 diff --git a/xen-hooks.mak b/xen-hooks.mak
-index 55dd477..976d6d7 100644
+index eb321c8..871f8ce 100644
 --- a/xen-hooks.mak
 +++ b/xen-hooks.mak
-@@ -48,6 +48,7 @@ CONFIG_SDL=
+@@ -51,6 +51,7 @@ CONFIG_SDL=
  CONFIG_AUDIO=
  OBJS += xenfbfront.o
  else
@@ -24,15 +24,15 @@ index 55dd477..976d6d7 100644
  LIBS += -L$(XEN_ROOT)/tools/blktap/lib -lblktap
  OBJS += xen_blktap.o
 diff --git a/xen-setup b/xen-setup
-index 84f2936..1260156 100755
+index f74a09e..454301a 100755
 --- a/xen-setup
 +++ b/xen-setup
 @@ -9,7 +9,7 @@ rm -f config-host.mak
  
  if test -f config-host.h; then mv config-host.h config-host.h~; fi
  
--./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr
-+./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio --audio-drv-list=alsa "$@" --prefix=/usr
+-./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=${CC}
++./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=${CC} --audio-drv-list=alsa 
  
  target=i386-dm
  

diff --git a/master/disable-aio b/master/disable-aio
deleted file mode 100644 (file)
index b6c874e..0000000
--- a/master/disable-aio
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xen-setup b/xen-setup
-index 24defda..84f2936 100755
---- a/xen-setup
-+++ b/xen-setup
-@@ -9,7 +9,7 @@ rm -f config-host.mak
- 
- if test -f config-host.h; then mv config-host.h config-host.h~; fi
- 
--./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl "$@" --prefix=/usr
-+./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr
- 
- target=i386-dm
- 

diff --git a/master/ioemu-compil b/master/ioemu-compil
index 477838bd614dc21340b7bff9a9822499ffcfcdc9..e303c9e6605ac0be54d7795adb0d8fe508e44f0e 100644 (file)
--- a/master/ioemu-compil
+++ b/master/ioemu-compil
@@ -22,7 +22,7 @@ index c6b4f8c..d2f09fb 100644
  CFLAGS += -DCONFIG_PASSTHROUGH 
  $(info === PCI passthrough capability has been enabled ===)
 diff --git a/xen-setup b/xen-setup
-index 8ca0019..24defda 100755
+index 8ca0019..f74a09e 100755
 --- a/xen-setup
 +++ b/xen-setup
 @@ -9,7 +9,7 @@ rm -f config-host.mak
@@ -30,7 +30,7 @@ index 8ca0019..24defda 100755
  if test -f config-host.h; then mv config-host.h config-host.h~; fi
  
 -./configure --disable-gfx-check --disable-curses --disable-slirp "$@" --prefix=/usr
-+./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl "$@" --prefix=/usr
++./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr --cc=${CC}
  
  target=i386-dm
  

diff --git a/master/series b/master/series
index 69d6775ff9d2a9795ad587f4979e953e7a4306e0..a7b238df8db331f170ab13d69039186c74d625b8 100644 (file)
--- a/master/series
+++ b/master/series
@@ -13,7 +13,6 @@ vga-passthrough
 dom0-driver
 intel
 use-vga-cmdline
-disable-aio
 ps2-passthrough
 
 alsa-fix