Skip to content

Commit

Permalink
Update packages versions at august, 17th, 2016 (#5)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
maurorodrigues authored Aug 26, 2016
1 parent f681c36 commit ec12f97
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
6 changes: 3 additions & 3 deletions kernel/centOS/7.2/kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions kernel/kernel.yaml
Original file line number Diff line number Diff line change
@@ -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':
Expand Down
2 changes: 1 addition & 1 deletion libvirt/centOS/7.2/libvirt.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions libvirt/libvirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
11 changes: 4 additions & 7 deletions qemu/centOS/7.2/qemu.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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*
Expand Down Expand Up @@ -1324,7 +1322,6 @@ getent passwd qemu >/dev/null || \
%ifarch %{kvm_archs}
%files kvm-tools
%defattr(-,root,root,-)
%{_bindir}/kvm_stat
%endif
%endif

Expand Down
1 change: 1 addition & 0 deletions qemu/centOS/7.2/rpmmacro
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
%_unpackaged_files_terminate_build 0
7 changes: 4 additions & 3 deletions qemu/qemu.yaml
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit ec12f97

Please sign in to comment.