From ec12f9799c6b5e04cb20e643442a47745a1cef5c Mon Sep 17 00:00:00 2001 From: "Mauro S. M. Rodrigues" Date: Fri, 26 Aug 2016 12:16:10 -0300 Subject: [PATCH] Update packages versions at august, 17th, 2016 (#5) Kernel was rebased to 4.7. * Qemu to 2.7.0-rc3 -kvm_stat moved to kernel tree moving out qemu https://patchwork.kernel.org/patch/9138047/ moving into kernel https://patchwork.kernel.org/patch/8761351/ - rpmmacro to ignore unpackaged files at the end of the build added. There are a new set of roms available, let's investigate case by case if we should keep them or not, here is the list: /usr/share/qemu/efi-e1000e.rom /usr/share/qemu/efi-vmxnet3.rom /usr/share/qemu/linuxboot_dma.bin - trace-events apprently moved into trace-events-all reference https://patchwork.kernel.org/patch/9167517/ Closes #24 (Weekly build - August, 17th, 2016) --- kernel/centOS/7.2/kernel.spec | 6 +++--- kernel/kernel.yaml | 6 +++--- libvirt/centOS/7.2/libvirt.spec | 2 +- libvirt/libvirt.yaml | 4 ++-- qemu/centOS/7.2/qemu.spec | 11 ++++------- qemu/centOS/7.2/rpmmacro | 1 + qemu/qemu.yaml | 7 ++++--- 7 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 qemu/centOS/7.2/rpmmacro diff --git a/kernel/centOS/7.2/kernel.spec b/kernel/centOS/7.2/kernel.spec index 4525a802..76d39bdf 100644 --- a/kernel/centOS/7.2/kernel.spec +++ b/kernel/centOS/7.2/kernel.spec @@ -24,12 +24,12 @@ Summary: The Linux kernel # This crazy release structure is so the daily scratch builds and the weekly official builds # will always yum install correctly over each other -%define release_week 22 +%define release_week 31 %define release_day 0 %define release_spin 0 %define pkvm_release .pkvm3_1_1.%{?release_week}0%{?release_day}.%{?release_spin} -%define rpmversion 4.4.11 +%define rpmversion 4.7.0 %define pkgrelease 3 # allow pkg_release to have configurable %{?dist} tag @@ -1638,7 +1638,7 @@ fi %files -n kernel-tools-libs %defattr(-,root,root) %{_libdir}/libcpupower.so.0 -%{_libdir}/libcpupower.so.0.0.0 +%{_libdir}/libcpupower.so.0.0.1 %files -n kernel-tools-libs-devel %defattr(-,root,root) diff --git a/kernel/kernel.yaml b/kernel/kernel.yaml index 97ba218e..251de1fe 100644 --- a/kernel/kernel.yaml +++ b/kernel/kernel.yaml @@ -1,9 +1,9 @@ Package: name: 'kernel' clone_url: 'https://github.com/open-power-host-os/linux.git' - branch: 'powerkvm-v3.1.1' - commit_id: '3daef95' - expects_source: "kernel-2200.0" + branch: 'hostos-devel' + commit_id: 'bf1d492' + expects_source: "kernel-3100.0" files: centos: '7.2': diff --git a/libvirt/centOS/7.2/libvirt.spec b/libvirt/centOS/7.2/libvirt.spec index 3c4a6dd8..2fe71e9d 100644 --- a/libvirt/centOS/7.2/libvirt.spec +++ b/libvirt/centOS/7.2/libvirt.spec @@ -382,7 +382,7 @@ Version: 1.3.4 #define ibm_release %{?repo}.1 # This release structure is so the daily scratch builds and the weekly official builds # will always yum install correctly over each other -%define release_week 22 +%define release_week 31 %define release_day 0 %define release_spin 0 %define pkvm_release .pkvm3_1_1.%{?release_week}0%{?release_day}.%{?release_spin} diff --git a/libvirt/libvirt.yaml b/libvirt/libvirt.yaml index e3777353..45ac4562 100644 --- a/libvirt/libvirt.yaml +++ b/libvirt/libvirt.yaml @@ -2,8 +2,8 @@ Package: name: 'libvirt' clone_url: 'https://github.com/open-power-host-os/libvirt.git' branch: 'powerkvm-v3.1.1' - commit_id: '232c054' - expects_source: "libvirt-2200.0" + commit_id: '232c054' + expects_source: "libvirt-3100.0" files: centos: '7.2': diff --git a/qemu/centOS/7.2/qemu.spec b/qemu/centOS/7.2/qemu.spec index c72f96fb..2a4acbeb 100644 --- a/qemu/centOS/7.2/qemu.spec +++ b/qemu/centOS/7.2/qemu.spec @@ -185,11 +185,11 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 2.5 +Version: 2.6.93 # This crazy release structure is so the daily scratch builds and the weekly official builds # will always yum install correctly over each other -%define release_week 22 +%define release_week 31 %define release_day 0 %define release_spin 0 %define pkvm_release .pkvm3_1_1.%{?release_week}0%{?release_day}.%{?release_spin} @@ -716,8 +716,7 @@ Summary: KVM debugging and diagnostics tools Group: Development/Tools %description kvm-tools -This package contains some diagnostics and debugging tools for KVM, -such as kvm_stat. +This package contains some diagnostics and debugging tools for KVM. %endif %if %{without separate_kvm} @@ -852,7 +851,6 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/kvm.m mkdir -p $RPM_BUILD_ROOT%{_bindir}/ mkdir -p $RPM_BUILD_ROOT%{_udevdir} -install -m 0755 scripts/kvm/kvm_stat $RPM_BUILD_ROOT%{_bindir}/ install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_udevdir} %endif @@ -1182,7 +1180,7 @@ getent passwd qemu >/dev/null || \ %dir %{_datadir}/%{name}/ #{_datadir}/%{name}/qemu-icon.bmp %{_datadir}/%{name}/qemu_logo_no_text.svg -%{_datadir}/%{name}/trace-events +%{_datadir}/%{name}/trace-events-all %{_datadir}/%{name}/keymaps/ %{_mandir}/man1/qemu.1* %{_mandir}/man1/virtfs-proxy-helper.1* @@ -1324,7 +1322,6 @@ getent passwd qemu >/dev/null || \ %ifarch %{kvm_archs} %files kvm-tools %defattr(-,root,root,-) -%{_bindir}/kvm_stat %endif %endif diff --git a/qemu/centOS/7.2/rpmmacro b/qemu/centOS/7.2/rpmmacro new file mode 100644 index 00000000..ec0f17d6 --- /dev/null +++ b/qemu/centOS/7.2/rpmmacro @@ -0,0 +1 @@ +%_unpackaged_files_terminate_build 0 diff --git a/qemu/qemu.yaml b/qemu/qemu.yaml index 780593fc..10b82902 100644 --- a/qemu/qemu.yaml +++ b/qemu/qemu.yaml @@ -1,13 +1,14 @@ Package: name: 'QEMU' clone_url: 'https://github.com/open-power-host-os/qemu.git' - branch: 'powerkvm-v3.1.1' - commit_id: '7d4a58a' - expects_source: "qemu-2200.0" + branch: 'hostos-devel' + commit_id: '5f0e775' + expects_source: "qemu-3100.0" files: centos: '7.2': spec: 'centOS/7.2/qemu.spec' + rpmmacro: 'centOS/7.2/rpmmacro' build_files: 'centOS/7.2/SOURCES' dependencies: - 'libseccomp'