Skip to content

Commit ec12f97

Browse files
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)
1 parent f681c36 commit ec12f97

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

kernel/centOS/7.2/kernel.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Summary: The Linux kernel
2424

2525
# This crazy release structure is so the daily scratch builds and the weekly official builds
2626
# will always yum install correctly over each other
27-
%define release_week 22
27+
%define release_week 31
2828
%define release_day 0
2929
%define release_spin 0
3030
%define pkvm_release .pkvm3_1_1.%{?release_week}0%{?release_day}.%{?release_spin}
3131

32-
%define rpmversion 4.4.11
32+
%define rpmversion 4.7.0
3333
%define pkgrelease 3
3434

3535
# allow pkg_release to have configurable %{?dist} tag
@@ -1638,7 +1638,7 @@ fi
16381638
%files -n kernel-tools-libs
16391639
%defattr(-,root,root)
16401640
%{_libdir}/libcpupower.so.0
1641-
%{_libdir}/libcpupower.so.0.0.0
1641+
%{_libdir}/libcpupower.so.0.0.1
16421642

16431643
%files -n kernel-tools-libs-devel
16441644
%defattr(-,root,root)

kernel/kernel.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Package:
22
name: 'kernel'
33
clone_url: 'https://github.com/open-power-host-os/linux.git'
4-
branch: 'powerkvm-v3.1.1'
5-
commit_id: '3daef95'
6-
expects_source: "kernel-2200.0"
4+
branch: 'hostos-devel'
5+
commit_id: 'bf1d492'
6+
expects_source: "kernel-3100.0"
77
files:
88
centos:
99
'7.2':

libvirt/centOS/7.2/libvirt.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ Version: 1.3.4
382382
#define ibm_release %{?repo}.1
383383
# This release structure is so the daily scratch builds and the weekly official builds
384384
# will always yum install correctly over each other
385-
%define release_week 22
385+
%define release_week 31
386386
%define release_day 0
387387
%define release_spin 0
388388
%define pkvm_release .pkvm3_1_1.%{?release_week}0%{?release_day}.%{?release_spin}

libvirt/libvirt.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Package:
22
name: 'libvirt'
33
clone_url: 'https://github.com/open-power-host-os/libvirt.git'
44
branch: 'powerkvm-v3.1.1'
5-
commit_id: '232c054'
6-
expects_source: "libvirt-2200.0"
5+
commit_id: '232c054'
6+
expects_source: "libvirt-3100.0"
77
files:
88
centos:
99
'7.2':

qemu/centOS/7.2/qemu.spec

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@
185185

186186
Summary: QEMU is a FAST! processor emulator
187187
Name: qemu
188-
Version: 2.5
188+
Version: 2.6.93
189189

190190
# This crazy release structure is so the daily scratch builds and the weekly official builds
191191
# will always yum install correctly over each other
192-
%define release_week 22
192+
%define release_week 31
193193
%define release_day 0
194194
%define release_spin 0
195195
%define pkvm_release .pkvm3_1_1.%{?release_week}0%{?release_day}.%{?release_spin}
@@ -716,8 +716,7 @@ Summary: KVM debugging and diagnostics tools
716716
Group: Development/Tools
717717

718718
%description kvm-tools
719-
This package contains some diagnostics and debugging tools for KVM,
720-
such as kvm_stat.
719+
This package contains some diagnostics and debugging tools for KVM.
721720
%endif
722721

723722
%if %{without separate_kvm}
@@ -852,7 +851,6 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/kvm.m
852851
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
853852
mkdir -p $RPM_BUILD_ROOT%{_udevdir}
854853

855-
install -m 0755 scripts/kvm/kvm_stat $RPM_BUILD_ROOT%{_bindir}/
856854
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_udevdir}
857855
%endif
858856

@@ -1182,7 +1180,7 @@ getent passwd qemu >/dev/null || \
11821180
%dir %{_datadir}/%{name}/
11831181
#{_datadir}/%{name}/qemu-icon.bmp
11841182
%{_datadir}/%{name}/qemu_logo_no_text.svg
1185-
%{_datadir}/%{name}/trace-events
1183+
%{_datadir}/%{name}/trace-events-all
11861184
%{_datadir}/%{name}/keymaps/
11871185
%{_mandir}/man1/qemu.1*
11881186
%{_mandir}/man1/virtfs-proxy-helper.1*
@@ -1324,7 +1322,6 @@ getent passwd qemu >/dev/null || \
13241322
%ifarch %{kvm_archs}
13251323
%files kvm-tools
13261324
%defattr(-,root,root,-)
1327-
%{_bindir}/kvm_stat
13281325
%endif
13291326
%endif
13301327

qemu/centOS/7.2/rpmmacro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
%_unpackaged_files_terminate_build 0

qemu/qemu.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Package:
22
name: 'QEMU'
33
clone_url: 'https://github.com/open-power-host-os/qemu.git'
4-
branch: 'powerkvm-v3.1.1'
5-
commit_id: '7d4a58a'
6-
expects_source: "qemu-2200.0"
4+
branch: 'hostos-devel'
5+
commit_id: '5f0e775'
6+
expects_source: "qemu-3100.0"
77
files:
88
centos:
99
'7.2':
1010
spec: 'centOS/7.2/qemu.spec'
11+
rpmmacro: 'centOS/7.2/rpmmacro'
1112
build_files: 'centOS/7.2/SOURCES'
1213
dependencies:
1314
- 'libseccomp'

0 commit comments

Comments
 (0)