~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2011-05-11 12:29:51 UTC
  • mfrom: (1.4.1) (3.4.30 sid)
  • mto: This revision was merged to the branch mainline in revision 167.
  • Revision ID: package-import@ubuntu.com-20110511122951-ku5fk1tv37o5aymm
Tags: 0.9.1-1ubuntu1
* Resynchronize and merge from Debian unstable (LP: #794378). Remaining
  changes:
  - debian/control:
    * set X-Python-Version to 2.7, as 2.6 is not in oneiric.
    * set ubuntu maintainer
    * Build-Depends:
      - remove [linux-any] from all dependencies
      - remove [!linux-any] deps
      - swap libxen to libxen3, qemu to qemu-kvm, and open-iscsi to
        open-iscsi-utils in Build-Depends
      - remove virtualbox-ose Build-Depends
      - add parted and libapparmor-dev Build-Depends
    * convert Vcs-Git to Xs-Debian-Vcs-Git
    * libvirt-bin Depends: move netcat-openbsd, bridge-utils, dnsmasq-base
      (>= 2.46-1), and iptables from Recommends to Depends
    * libvirt-bin Recommends: move qemu to Suggests
    * libvirt-bin Suggests: add apparmor
    * libvirt0 Recommands: move lvm2 to Suggests
  - keep debian/libvirt-bin.apport
  - keep debian/libvirt-bin.cron.daily
  - debian/libvirt-bin.dirs:
    * add apparmor, cron.daily, and apport dirs
  - debian/libvirt-bin.examples:
    * add debian/libvirt-suspendonreboot
  - debian/libvirt-bin.install:
    * add /etc/apparmor.d files
    * add apport hook
  - debian/libvirt-bin.manpages:
    * add debian/libvirt-migrate-qemu-disks.1
  - debian/libvirt-bin.postinst:
    * replace libvirt groupname with libvirtd
    * add each admin user to libvirtd group
    * call apparmor_parser on usr.sbin.libvirtd and
      usr.lib.libvirt.virt-aa-helper
    * call 'libvirt-migrate-qemu-disks -a' after
      libvirt-bin has started if migrating from
      older than 0.8.3-1ubuntu1
  - debian/libvirt-bin.postrm:
    * replace libvirt groupname with libvirtd
    * remove usr.sbin.libvirtd and
      usr.lib.libvirt.virt-aa-helper
  - keep added files under debian/:
    * libvirt-bin.upstart
    * libvirt-migrate-qemu-disks
    * libvirt-migrate-qemu-disks.1
    * libvirt-suspendonreboot
    * apparmor profiles
  - debian/README.Debian:
    * add 'Apparmor Profile' section
    * add 'Disk migration' section
  - debian/rules:
    * move include of debhelper.mk to top of file so DEB_HOST_ARCH_OS
      is defined.
    * don't build with vbox since virtualbox-ose is in universe
      - remove WITH_VBOX, add explicit --without-vbox
    * add --with-apparmor to DEB_CONFIGURE_EXTRA_FLAGS
    * set DEB_DH_INSTALLINIT_ARGS to '--upstart-only'
    * remove unneeded binary-install/libvirt-bin:: and clean::
      sections (they only deal with sysvinit stuff)
    * add build/libvirt-bin:: section to install
      - apparmor files
      - apport hooks
      - libvirt-migrate-qemu-disks
* debian/patches/series:
  - don't apply Disable-CHECKSUM-rule.patch: our iptables can do this
  - don't apply Debian-specific Debianize-libvirt-guests.patch (sysvinit only)
  - don't apply Disable qemu-disable-network.diff.patch
* debian/patches:
  - drop 9007-fix-daemon-conf-ftbfs.patch (looks like it may be fixed)
  - drop patches applied upstream:
    * 9022-drop-booton-when-kernel-specified.patch
    * 9023-fix-lxc-console-hangup.patch
    * 9024-fix-broken-commandtest.patch
    * 9025-Pass-virSecurityManagerPtr-to-virSecurityDAC-Set-Res.patch
    * 9026-security-avoid-memory-leak.patch
    * 9027-CVE-2011-1146.patch
  - keep patches:
    * 9000-delayed_iff_up_bridge.patch
    * 9001-dont_clobber_existing_bridges.patch
    * 9002-better_default_uri_virsh.patch
    * 9003-better-default-arch.patch
    * 9004-libvirtd-group-name.patch
    * 9005-increase-unix-socket-timeout.patch
    * 9006-default-config-test-case.patch
    * 9011-move-ebtables-script.patch (refreshed)
    * 9014-skip-nodeinfotest.patch (modified to make it apply)
    * 9020-lp545795.patch (modified to make it still apply)
    * 9021-fix-uint64_t.patch
    * 9022-allows-lxc-containers-with-lxcguest.patch (renamed, modified
      to make it still apply, and added DEP-3 tags).
  - new patches:
    * 9023-disable-test-poll.patch - don't run broken test-poll

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/make -f
2
2
 
3
 
DEB_PYTHON_SYSTEM = pycentral
4
3
DEB_BUILD_PARALLEL = yes
5
 
 
6
 
ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
7
 
  BUILD_XEN = --with-xen
8
 
else
9
 
  BUILD_XEN = --without-xen
10
 
endif
11
 
 
12
 
ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
13
 
  BUILD_LXC = --without-lxc
14
 
else
15
 
  BUILD_LXC = --with-lxc
16
 
endif
 
4
DEB_MAKE_CHECK_TARGET = check
17
5
 
18
6
include /usr/share/cdbs/1/rules/debhelper.mk
19
7
include /usr/share/cdbs/1/class/autotools.mk
20
8
include /usr/share/cdbs/1/class/python-distutils.mk
21
9
 
 
10
ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
 
11
  WITH_XEN = --with-xen
 
12
else
 
13
  WITH_XEN = --without-xen
 
14
endif
 
15
 
 
16
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 
17
  WITH_STORAGE_LVM    = --with-storage-lvm
 
18
  WITH_STORAGE_ISCSI  = --with-storage-iscsi
 
19
  WITH_STORAGE_DISK   = --with-storage-disk
 
20
  WITH_UDEV           = --with-udev --without-hal
 
21
  WITH_CAPNG          = --with-capng
 
22
  WITH_POLKIT         = --with-polkit
 
23
  WITH_MACVTAP        = --with-macvtap
 
24
  WITH_NETWORK        = --with-network
 
25
  WITH_QEMU           = --with-qemu
 
26
  ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
 
27
      WITH_LXC        = --without-lxc
 
28
  else
 
29
      WITH_LXC        = --with-lxc
 
30
  endif
 
31
else
 
32
  WITH_STORAGE_LVM    = --without-storage-lvm
 
33
  WITH_STORAGE_ISCSI  = --without-storage-iscsi
 
34
  WITH_STORAGE_DISK   = --without-storage-disk
 
35
  WITH_UDEV           = --without-udev --with-hal
 
36
  WITH_CAPNG          = --without-capng
 
37
  WITH_POLKIT         = --without-polkit
 
38
  WITH_MACVTAP        = --without-macvtap
 
39
  WITH_NETWORK        = --without-network
 
40
  WITH_QEMU           = --without-qemu
 
41
  WITH_LXC            = --without-lxc
 
42
endif
 
43
 
22
44
DEB_CONFIGURE_EXTRA_FLAGS :=     \
23
45
        --disable-rpath          \
24
 
        --with-qemu              \
 
46
        $(WITH_QEMU)             \
25
47
        --with-qemu-user=libvirt-qemu  \
26
48
        --with-qemu-group=kvm    \
27
49
        --with-openvz            \
28
50
        --with-avahi             \
29
51
        --with-sasl              \
30
 
        --with-polkit            \
31
 
        --with-udev              \
32
 
        --without-hal            \
 
52
        $(WITH_POLKIT)           \
 
53
        $(WITH_UDEV)             \
33
54
        --with-storage-fs        \
34
 
        --with-storage-lvm       \
35
 
        --with-storage-iscsi     \
36
 
        --with-storage-disk      \
 
55
        $(WITH_STORAGE_LVM)      \
 
56
        $(WITH_STORAGE_ISCSI)    \
 
57
        $(WITH_STORAGE_DISK)     \
37
58
        --with-init-script=none  \
38
 
        --with-apparmor          \
39
 
        --without-vbox           \
40
59
        --without-numactl        \
41
60
        --without-selinux        \
42
61
        --without-esx            \
43
62
        --without-libssh2        \
44
 
        --with-capng             \
45
 
        --with-macvtap           \
 
63
        $(WITH_CAPNG)            \
46
64
        --enable-debug           \
47
 
        $(BUILD_XEN)             \
48
 
        $(BUILD_VBOX)            \
49
 
        $(BUILD_LXC)
 
65
        $(WITH_MACVTAP)          \
 
66
        $(WITH_NETWORK)          \
 
67
        --without-netcf          \
 
68
        $(WITH_XEN)              \
 
69
        $(WITH_LXC)              \
 
70
        --with-apparmor          \
 
71
        --without-vbox
50
72
 
51
73
DEB_COMPRESS_EXCLUDE = .o event-test hellolibvirt info1 suspend
52
74
DEB_PYTHON_SETUP_CMD = /dev/null
53
75
DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)'
54
76
DEB_DH_INSTALLINIT_ARGS = --upstart-only
55
77
DEB_DH_INSTALLLOGROTATE_ARGS = --name=libvirtd
56
 
DEB_MAKE_CHECK_TARGET := check
57
78
 
58
79
EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
59
80
 
 
81
build/libvirt-bin::
 
82
        # Add empty dir so dh_install doesn't fail on kFreebsd until we have Polkit support
 
83
        mkdir -p debian/tmp/usr/share/polkit-1
 
84
 
60
85
binary-install/libvirt-doc::
61
86
        find $(EXAMPLES_DIR) -name "*.o" -type f -delete -o -name .libs -type d -exec rm -rf {} \;
62
87
        rm -f $(EXAMPLES_DIR)domain-events/events-c/event-test