← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu-linaro/vivid

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Ricardo Salveti de Araujo
  • Date: 2012-09-20 18:39:31 UTC
  • mfrom: (12922.1.2 qemu-linaro)
  • Revision ID: ricardo.salveti@linaro.org-20120920183931-sp3cg6kpdl8dmwo9
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control:
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
18
18
  QEMU_CPU = ppc
19
19
endif
20
20
ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))
21
 
  QEMU_CPU = armv4l
 
21
  QEMU_CPU = armv7l
22
22
endif
23
23
 
24
24
ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
25
 
  conf_arch += --cc=$(DEB_HOST_GNU_TYPE)-gcc --cpu=$(QEMU_CPU)
 
25
  conf_arch += --cross-prefix=$(DEB_HOST_GNU_TYPE)- --cpu=$(QEMU_CPU)
26
26
endif
27
27
 
28
28
ifeq ($(DEB_HOST_ARCH_OS),linux)
29
 
       conf_audio_drv += --audio-drv-list=alsa,oss,sdl,pa
 
29
# Note: We differ from Debian here by favoring the pulseaudio driver, since that's default in Ubuntu.
 
30
#       Users override this when calling qemu by exporting the environment variable QEMU_AUDIO_DRV.
 
31
       conf_audio_drv += --audio-drv-list=pa,alsa,sdl,oss
30
32
endif
31
33
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
32
34
       conf_audio_drv += --audio-drv-list=oss,sdl,pa
36
38
       conf_arch += --disable-kvm
37
39
endif
38
40
 
 
41
ifeq ($(DEB_HOST_ARCH_CPU),arm)
 
42
       conf_arch += --enable-kvm
 
43
endif
 
44
 
 
45
 
39
46
# binfmt support
40
47
ALL_BINFMT_TARGETS=alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus sparc64 x86_64
41
48
ifeq ($(DEB_HOST_ARCH),amd64)
104
111
                    --disable-strip \
105
112
                    --disable-linux-user \
106
113
                    --disable-bsd-user \
107
 
                    --disable-darwin-user \
108
114
                    --disable-spice \
 
115
                    --enable-fdt \
109
116
                    $(conf_arch) $(conf_audio_drv)
110
117
 
111
118
ifeq ($(DEB_HOST_ARCH_OS),linux)
163
170
 
164
171
override_dh_auto_build:
165
172
        # system build
166
 
        dh_auto_build -B system-build
 
173
        dh_auto_build -B system-build --parallel
167
174
ifeq ($(DEB_HOST_ARCH_OS),linux)
168
175
        # user build
169
 
        dh_auto_build -B user-build
 
176
        dh_auto_build -B user-build --parallel
170
177
 
171
178
        # static user build
172
 
        dh_auto_build -B user-static-build
 
179
        dh_auto_build -B user-static-build --parallel
173
180
 
174
181
ifeq ($(DEB_HOST_ARCH),amd64)
175
182
        # spice build
176
 
        dh_auto_build -B spice-build
 
183
        dh_auto_build -B spice-build --parallel
177
184
endif
178
185
endif
179
186