x
/
fuel-plugin-qemu
Code Issues Proposed changes

Merge "Fix qemu/kvm bug"

This commit is contained in:
Jenkins 2016-01-29 05:06:33 +00:00 committed by Gerrit Code Review
parent dcb7040adf 8b23372508
commit c4dd9beec0
7 changed files with 161 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
deployment_scripts/puppet/manifests/qemu-install.pp
View File

@ -13,42 +13,6 @@ if $operatingsystem == 'Ubuntu' {
path => "/usr/bin:/usr/sbin:/bin:/sbin",
}
} else {
package { 'qemu-block-extra':
ensure => "${qemu_version}",
}
package { 'qemu-utils':
ensure => "${qemu_version}",
}
package { 'qemu-system-common':
ensure => "${qemu_version}",
}
package { 'qemu-system-arm':
ensure => "${qemu_version}",
}
package { 'qemu-system-mips':
ensure => "${qemu_version}",
}
package { 'qemu-system-misc':
ensure => "${qemu_version}",
}
package { 'qemu-system-sparc':
ensure => "${qemu_version}",
}
package { 'qemu-system-x86':
ensure => "${qemu_version}",
}
package { 'qemu-system-ppc':
ensure => "${qemu_version}",
}
package { 'qemu-user':
ensure => "${qemu_version}",
}
package { 'qemu-system':
ensure => "${qemu_version}",
}
package { 'qemu':
ensure => "${qemu_version}",
}
}
} elsif $operatingsystem == 'CentOS' {
}

137
kvm/build_kvm.sh
View File

@ -201,7 +201,142 @@ EOF
echo "CONFIG_IP_SET_LIST_SET=m" >>.config
echo "CONFIG_IP_VS=m" >>.config
echo "CONFIG_IP_VS_IPV6=y" >>.config
echo "CONFIG_IP_VS_TAB_BITS=12" >>.config
echo "CONFIG_IP_VS_TAB_BITS=m" >>.config
echo "CONFIG_CRYPTO_AES_NI_INTEL=m" >>.config
echo "CONFIG_CRYPTO_AES_X86_64=m" >>.config
echo "CONFIG_ACPI_PROCESSOR_AGGREGATOR=m" >>.config
echo "CONFIG_SENSORS_ACPI_POWER=m" >>.config
echo "CONFIG_ASYNC_RAID6_RECOV=m" >>.config
echo "CONFIG_CONFIGFS_FS=m" >>.config
echo "CONFIG_SENSORS_CORETEMP=m" >>.config
echo "CONFIG_CRYPTO_CRC32_PCLMUL=m" >>.config
echo "CONFIG_CRYPTO_CRCT10DIF=m" >>.config
echo "CONFIG_CRYPTO_CRYPTD=m" >>.config
echo "CONFIG_DCA=m" >>.config
echo "CONFIG_INTEL_POWERCLAMP=m" >>.config
echo "CONFIG_INTEL_IOATDMA=m" >>.config
echo "CONFIG_INPUT_JOYDEV=m" >>.config
echo "CONFIG_MD_LINEAR=m" >>.config
echo "CONFIG_MD_RAID0=m" >>.config
echo "CONFIG_MD_RAID1=m" >>.config
echo "CONFIG_MD_RAID10=m" >>.config
echo "CONFIG_MD_RAID456=m" >>.config
echo "CONFIG_MD_MULTIPATH=m" >>.config
echo "CONFIG_MD_FAULTY=m" >>.config
echo "CONFIG_LPC_ICH=m" >>.config
echo "CONFIG_CRYPTO_LRW=m" >>.config
echo "CONFIG_BLK_DEV_NBD=m" >>.config
echo "CONFIG_SCSI_DH=m" >>.config
echo "CONFIG_HOTPLUG_PCI_SHPC=m" >>.config
echo "CONFIG_ACPI_WMI=m" >>.config
echo "CONFIG_NETFILTER_ADVANCED=y" >>.config
echo "CONFIG_NETFILTER_ADVANCED=y" >>.config
echo "CONFIG_BRIDGE_NETFILTER=m" >>.config
echo "# CONFIG_NETFILTER_NETLINK_ACCT is not set" >>.config
echo "# CONFIG_NETFILTER_NETLINK_QUEUE is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_MARK is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_EVENTS is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_TIMEOUT is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_TIMESTAMP is not set" >>.config
echo "# CONFIG_NF_CT_PROTO_DCCP is not set" >>.config
echo "CONFIG_NF_CT_PROTO_GRE=m" >>.config
echo "# CONFIG_NF_CT_PROTO_SCTP is not set" >>.config
echo "# CONFIG_NF_CT_PROTO_UDPLITE is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_AMANDA is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_H323 is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_SNMP is not set" >>.config
echo "CONFIG_NF_CONNTRACK_PPTP=m" >>.config
echo "# CONFIG_NF_CONNTRACK_SANE is not set" >>.config
echo "# CONFIG_NF_CONNTRACK_TFTP is not set" >>.config
echo "# CONFIG_NF_CT_NETLINK_TIMEOUT is not set" >>.config
echo "# CONFIG_NETFILTER_XT_CONNMARK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_SET is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_DSCP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_HL is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_HMARK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_MARK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_TEE is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_TRACE is not set" >>.config
echo "# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_BPF is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_CPU is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_DCCP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_DSCP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_ECN is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_ESP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_HELPER is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_HL is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_IPVS is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_L2TP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_MAC is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_MARK is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_OSF is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_OWNER is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_REALM is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_RECENT is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_SCTP is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_STRING is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_TIME is not set" >>.config
echo "# CONFIG_NETFILTER_XT_MATCH_U32 is not set" >>.config
echo "CONFIG_NF_NAT_PROTO_GRE=m" >>.config
echo "CONFIG_NF_NAT_PPTP=m" >>.config
echo "# CONFIG_IP_NF_MATCH_AH is not set" >>.config
echo "# CONFIG_IP_NF_MATCH_ECN is not set" >>.config
echo "# CONFIG_IP_NF_MATCH_RPFILTER is not set" >>.config
echo "# CONFIG_IP_NF_MATCH_TTL is not set" >>.config
echo "# CONFIG_IP_NF_TARGET_SYNPROXY is not set" >>.config
echo "# CONFIG_IP_NF_TARGET_NETMAP is not set" >>.config
echo "# CONFIG_IP_NF_TARGET_REDIRECT is not set" >>.config
echo "# CONFIG_IP_NF_TARGET_CLUSTERIP is not set" >>.config
echo "# CONFIG_IP_NF_TARGET_ECN is not set" >>.config
echo "# CONFIG_IP_NF_TARGET_TTL is not set" >>.config
echo "# CONFIG_IP_NF_SECURITY is not set" >>.config
echo "# CONFIG_IP_NF_ARPTABLES is not set" >>.config
echo "# CONFIG_NF_NAT_IPV6 is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_AH is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_EUI64 is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_FRAG is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_OPTS is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_HL is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_MH is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_RPFILTER is not set" >>.config
echo "# CONFIG_IP6_NF_MATCH_RT is not set" >>.config
echo "# CONFIG_IP6_NF_TARGET_HL is not set" >>.config
echo "# CONFIG_IP6_NF_TARGET_SYNPROXY is not set" >>.config
echo "# CONFIG_IP6_NF_SECURITY is not set" >>.config
echo "# CONFIG_IP6_NF_NAT is not set" >>.config
echo "CONFIG_INTEL_MEI=m" >>.config
echo "CONFIG_INTEL_MEI_ME=m" >>.config
echo "# CONFIG_INTEL_MEI_TXE is not set" >>.config
echo "CONFIG_WATCHDOG_CORE=y" >>.config
make oldconfig </dev/null

25
pre_build_hook
View File

@ -23,18 +23,19 @@ function build_pkg {
cd ${DIR}/qemu
sudo docker build -t qemu .
container_id=`sudo docker run -d qemu`
sudo docker cp $container_id:/qemu-block-extra_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-utils_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-user_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-arm_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-common_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-mips_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-misc_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-ppc_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-sparc_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-x86_2.4+dfsg-4ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-keymaps_2.2.1-0ubuntu1_all.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-utils_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-user_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-arm_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-common_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-mips_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-misc_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-ppc_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-sparc_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-system-x86_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
sudo docker cp $container_id:/qemu-kvm_2.2.1-0ubuntu1_amd64.deb ${DIR}/repositories/ubuntu/
cd ${DIR}/kvm
sudo docker build -t kvm .
container_id=`sudo docker run -d kvm`

10
qemu/Dockerfile
View File

@ -2,19 +2,11 @@
FROM ubuntu:14.04.3
RUN apt-get update
RUN apt-get install -y software-properties-common python-software-properties \
make python-setuptools python-all dpkg-dev debhelper \
fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
ca-certificates sudo apt-utils lsb-release autotools-dev device-tree-compiler texinfo acpica-tools libaio-dev libasound2-dev libattr1-dev libbluetooth-dev libbrlapi-dev libcap-dev libcap-ng-dev libcurl4-gnutls-dev libfdt-dev libncurses5-dev libnss3-dev libpixman-1-dev libpulse-dev librados-dev librbd-dev libsasl2-dev libsdl1.2-dev libseccomp-dev libspice-server-dev libspice-protocol-dev libusb-1.0-0-dev libusbredirparser-dev libx11-dev libxen-dev libnuma-dev uuid-dev xfslibs-dev zlib1g-dev libjpeg-dev libpng12-dev
RUN apt-get install wget -y
RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
RUN chmod 0440 /etc/sudoers.d/open-sudo
ADD ./download-qemu.sh /root/download-qemu.sh
RUN chmod +x /root/download-qemu.sh
RUN /root/download-qemu.sh
ADD ./build-qemu.sh /root/build-qemu.sh
RUN chmod +x /root/build-qemu.sh
RUN /root/build-qemu.sh

18
qemu/build-qemu.sh
View File

@ -1,8 +1,12 @@
#!/bin/bash
wget http://kr.archive.ubuntu.com/ubuntu/pool/main/libt/libtool/libtool_2.4.2-1.11_all.deb
wget http://kr.archive.ubuntu.com/ubuntu/pool/main/libt/libtool/libtool-bin_2.4.2-1.11_amd64.deb
sudo dpkg -i libtool_2.4.2-1.11_all.deb
sudo dpkg -i libtool-bin_2.4.2-1.11_amd64.deb
dpkg-source -x qemu_2.4+dfsg-4ubuntu1.dsc
cd /qemu-2.4+dfsg;sudo dpkg-buildpackage
wget http://wiki.qemu-project.org/download/qemu-2.2.1.tar.bz2
sudo apt-get build-dep qemu -y
sudo apt-get install devscripts -y
sudo apt-get install dpkg-dev -y
apt-get source qemu -y
dpkg-source -x qemu_2.0.0+dfsg-2ubuntu1.21.dsc
cd qemu-2.0.0+dfsg; uupdate -v 2.2.1 ../qemu-2.2.1.tar.bz2
cd ../qemu-2.2.1;echo "">> debian/patches/series
sed -i 's/seccomp="yes"/seccomp="no"/' configure
debian/rules build
fakeroot debian/rules binary

5
qemu/download-qemu.sh
View File

@ -1,5 +0,0 @@
#!/bin/bash
wget https://launchpad.net/ubuntu/+archive/primary/+files/qemu_2.4%2Bdfsg.orig.tar.xz
wget https://launchpad.net/ubuntu/+archive/primary/+files/qemu_2.4%2Bdfsg-4ubuntu1.debian.tar.xz
wget https://launchpad.net/ubuntu/+archive/primary/+files/qemu_2.4%2Bdfsg-4ubuntu1.dsc

2
qemu_package/ubuntu/dependencies.txt
View File

@ -1,2 +0,0 @@
http://archive.ubuntu.com/ubuntu/pool/main/s/seabios/seabios_1.7.5-1ubuntu1_all.deb
http://archive.ubuntu.com/ubuntu/pool/main/s/slof/qemu-slof_20140630+dfsg-1ubuntu1~14.04_all.deb