Skip to content

Commit 1a83bbe

Browse files
maurorodriguesOlav Philipp Henschel
authored and
Olav Philipp Henschel
committed
Weekly build - August, 31st, 2016 (#14)
* Kernel, Qemu, libvirt, slof and sos didn't change. * New commit ids for kimchi's family are: Kimchi: 12fe984 ginger: 670ff8c ginger-base: 2fa4618 wok: 240f449 * Updated kimchi, gingerbase and wok spec files to reflect recent code. * Fix libguestfs dependency
1 parent b8f4a5a commit 1a83bbe

File tree

10 files changed

+72
-120
lines changed

10 files changed

+72
-120
lines changed

ginger/centOS/7.2/ginger.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name: ginger
66
Version: 2.2.0
7-
Release: 1%{?dist}%{?pkvm_release}
7+
Release: 2%{?dist}%{?pkvm_release}
88
Summary: Host management plugin for Wok - Webserver Originated from Kimchi
99
BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}
1010
Group: System Environment/Base
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
9999

100100

101101
%changelog
102+
* Thu Sep 01 2016 Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> - 2.2.0-2.pkvm3_1_1
103+
- Build August, 31st, 2016
104+
102105
* Wed Aug 24 2016 <baseuser@ibm.com>
103106
Log from git:
104107
- 4b9924f023099d28c919e55e0834860ca8342d06 Issue #381: 'make clean' does not revert its changes from 'make rpm'

ginger/ginger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package:
22
name: 'ginger'
33
clone_url: 'https://github.com/open-power-host-os/ginger.git'
44
branch: 'powerkvm-v3.1.1'
5-
commit_id: '4b9924f'
5+
commit_id: '670ff8c'
66
expects_source: 'ginger'
77
files:
88
centos:

gingerbase/centOS/7.2/gingerbase.spec

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Name: ginger-base
1010
Version: 2.0.0
11-
Release: 1%{?dist}%{?pkvm_release}
11+
Release: 2%{?dist}%{?pkvm_release}
1212
Summary: Wok plugin for base host management
1313
BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}
1414
BuildArch: noarch
@@ -75,58 +75,11 @@ rm -rf $RPM_BUILD_ROOT
7575

7676

7777
%changelog
78-
* Wed Jan 20 2016 <baseuser@ibm.com>
79-
Log from git:
80-
- 0116a20469f779df16c4322dd97b2981d3a0feef Issue #19: Fix HTTP return code of host updated.
81-
- ad2fed466e19254cb4b5d59acecc31689bca2c71 Update README.md file.
82-
- b32fbb11d2db06fe50519b3dfb4906bdf0414af8 Issue #27 : wrong parent device name for multipath devices
83-
- 14ce7c45d1d09edec10cc06555379f1bddf3aa78 Github #3: failing gingerbase tests
84-
- e979cd5acc81e2f4b4c03c4a3b33d9a22ef8f0df Implement a new testcase for the sw upgrade monitor
85-
- fce108fc28592a6c7c2e3a1416da4f374d72f814 Remove unecessary apt lock from AptRepo class
86-
- aff316bd6a4162be9b36f186319f2cfc43e7e60e Remove unecessary apt lock from AptUpdate class
87-
- 88fbc07bad0a8bb0ed479f5ae753c7c7c2fd25f2 Implement the package manager monitor frontend
88-
- 8f1c57a71d39acdaae4c2e20b5fe22792f9640ac Implement class to support Fedora dnf package manager
89-
- ff5edae125642f266f2bce28c3efe440a04fdf69 issue #23: Update README.md
90-
- 518fae03aff5341976d43819aff9614acc3e5047 Debug report enhancement to find the generated SoSreport and debugreport files
91-
- 52c7ea56e3bf7d0f5bfa839a961c94bd453cc0ef Fixing openSUSE rpm build
92-
- 734f4b2dcde807585731d19008e11a6f6db8362a Do not rely on python-pip to install build dependencies
93-
- f6bed1ff4755912b6a57ef233e3c5953eb578b82 Fix Portuguese translations for storage pool.
94-
- d78e65b93c1f03a67d21d7a41304b19e9b755f85 Github #18: lscpu output varies with system language
95-
- 8a03afe8ec068e6447feade3430f141c336ec3b7 Fixing errors in .po files
96-
- 9d2ffb1dedffae95e108db14218ce565761dad9a Preparing Ginger-base version 2.0.0
97-
- dda6b1135e80158a03c9c7975194c1685372224f Use correct gettext package for building
98-
- 6c9f6ab36e469ff4f719ab99219b8f13e3edcbc7 Fixing whitespace errors
99-
- 7e0cba5235b56bff0fbbdd295e6f699a28fba5ec Github #16: make check-local improvements
100-
- f70ccb14fe1c3b1528f3760fd18c0b3ddf640ca8 Issue #14 : Help pages split
101-
- 6b31d076c70c7aaeca2cd67c35d0166cc1b7dad4 Issue #14 : Help pages split
102-
- 64c3487452dade4321ce8c3e2e30cb67c5ccc801 Issue #14 : Help pages split
103-
- 1e41ecb9a8758b91b6ca5cde6ff6712dac50cbb1 Issue #14 : Help pages split
104-
- fcaa1d3c8e3a944e8215c7c9099d894dd9a93e15 Issue #14 : Help pages split
105-
- dcb4376784e06744317cfbb645f26b1c81f57557 Issue #14 : Help pages split
106-
- 7e6234ce6186f92bcdf2a255beed4a141a3f8db1 Issue #14 : Help pages split
107-
- 304a495acbeba4eb7abf20898dc7c671c9c986c3 Issue #14 : Help pages split
108-
- 344297e1e02008d1482ce7de01b6947e270abcd5 Issue #14 : Help pages split
109-
- 3df9b75f6d22fd841742a175b89768249871594f Issue #14 : Help pages split
110-
- 1e32cfa8479ed8ce2255e25d2ed9e436571cbd04 Issue #14 : Help pages split
111-
- 1d266db0db4a57616201fc4894e2ec73da409087 Removed line-chart SCSS from Wok and added to Gingerbase
112-
- 1d9e6401460c37d85e2140763e3cb1689c925658 Upgrade GingerBase objectstore schema.
113-
- d9c4da167b5859e66ee2a98bff05db449f3ee21c Use always flag as a fallback
114-
- 67f4df227a8fe8286755ed2e28484982840318c8 Update dependencies for all distributions
115-
- 9bf0a9c28bda69d45534302b71315f86c8aaac5b Issue #12: fixing _get_cpus() of HostModel
116-
- 5d322a4cb5bdec9d11a5d4d464f7015f44b334ea Fixing RPM packaging of tabs
117-
- 637389bab622b11ce27bbde73f7129b6be79669a Fixing broken packaging due to wrong variable
118-
- 2f96d70ee8b8bda4d51ef2b808e55ab7a7c3fa27 Bug fix: Proper set role_key according to new tabs
119-
- 3cf077e224580ae9d8f61a3c1ee39d59ab3be226 Remove required authentication from /
120-
- 52dbc280d4515d787517febc67a3449b68d6fb3d Create read-only view for Dashboard tab
121-
- b04c055660e11935a762c8de5c1702989dcbc471 Expose HTML tabs files in a specific /tabs URI
122-
- 6039f64507aa97a265810ecb9a3d1d28490fb838 Add missing dependency python-apt
123-
- 3f990d12df59ac9f1f119246e35455bac844ed16 Fixed Repository Add and Edit modals
124-
- 21a29cbc9c7daff92b22ba5f339d6f8cf2f284bb Adding Media Queries support to Gingerbase
125-
- a022e3c58b9040b7de577c97341d856639e33064 Issue #8: Ubuntu repositories not being displayed (error GGBREPOS0025E)
126-
- f94dba213b96b4de80c7d2544ecd9ed80c8f9d6d Issue #4 : rpm creation failed on Fedora 23
127-
- e4d839cf87ab1172104fceb061d88120e0f28b91 Fix Issue #2 - Support dnf for Fedora repositories and updates
128-
- 299832ed895b532dec0847debeac4dfe354b1d5d Ginger Base repository
129-
- b10d056daf0d65ef257e848d32798fc61b65b90d Fix issue 766 - Define network interface in libvirt
78+
* Thu Sep 01 2016 Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> - 2.0.0-2.pkvm3_1_1
79+
- Build August, 31st, 2016
80+
81+
* Wed Mar 23 2016 Daniel Henrique Barboza <dhbarboza82@gmail.com>
82+
- Added wok version restriction >= 2.1.0
13083

13184
* Tue Aug 25 2015 Chandra Shehkhar Reddy Potula <chandra@linux.vnet.ibm.com> 0.0-1
13285
- First build

gingerbase/gingerbase.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package:
22
name: 'gingerbase'
33
clone_url: 'https://github.com/open-power-host-os/gingerbase.git'
44
branch: 'powerkvm-v3.1.1'
5-
commit_id: '56a2bc3'
5+
commit_id: '2fa4618'
66
expects_source: 'ginger-base'
77
files:
88
centos:

kimchi/centOS/7.2/kimchi.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name: kimchi
66
Version: 2.2.0
7-
Release: 1%{?dist}%{?pkvm_release}
7+
Release: 2%{?dist}%{?pkvm_release}
88
Summary: Kimchi server application
99
BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}
1010
BuildArch: noarch
@@ -51,7 +51,7 @@ Requires: spice-html5
5151

5252
%if 0%{?rhel} == 6
5353
Requires: python-ordereddict
54-
Requires: python-pillow
54+
Requires: python-imaging
5555
BuildRequires: python-unittest2
5656
%endif
5757

@@ -94,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
9494

9595

9696
%changelog
97+
* Thu Sep 01 2016 Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> - 2.2.0-2.pkvm3_1_1
98+
- Build August, 31st, 2016
99+
97100
* Wed Aug 24 2016 <baseuser@ibm.com>
98101
Log from git:
99102
- 5d50e5308e1cf68c2c9530ea09e52856ef184aa3 Merge remote-tracking branch 'upstream/master' into powerkvm-v3.1.1

kimchi/kimchi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package:
22
name: 'kimchi'
33
clone_url: 'https://github.com/open-power-host-os/kimchi.git'
44
branch: 'powerkvm-v3.1.1'
5-
commit_id: '5d50e53'
5+
commit_id: '12fe984'
66
expects_source: 'kimchi'
77
files:
88
centos:

libguestfs/centOS/7.2/libguestfs.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Requires: libvirt-daemon-kvm >= 1.2.8-3
412412
%ifarch aarch64
413413
Requires: AAVMF
414414
%endif
415-
%ifarch aarch64 #%{power64}
415+
%ifarch aarch64 ppc64 ppc64p7
416416
# RHBZ#1177910
417417
Requires: qemu-kvm-rhev
418418
%endif

noVNC/centOS/7.2/noVNC.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: novnc
22
Version: 0.5.1
33
%define ibm_release %{?repo}.2
4-
Release: 3%{?dist}%{?ibm_release}
4+
Release: 4%{?dist}%{?ibm_release}
55
Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support
66
Requires: python-websockify
77

@@ -60,6 +60,9 @@ install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/
6060
%{_mandir}/man1/novnc_server.1*
6161

6262
%changelog
63+
* Thu Sep 01 2016 Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> - 0.5.1-4.2
64+
- Build August, 31st, 2016
65+
6366
* Mon Aug 29 2016 Mauro S. M. Rodrigues <maurosr@br.ibm.com> - 0.5.1-3
6467
- Add patches:
6568
0001-QEMU-RFB-extension-rfb.js-and-input.js-changes.patch

wok/centOS/7.2/wok.spec

Lines changed: 48 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name: wok
66
Version: 2.2.0
7-
Release: 2%{?dist}%{?pkvm_release}
7+
Release: 3%{?dist}%{?pkvm_release}
88
Summary: Wok - Webserver Originated from Kimchi
99
BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}
1010
BuildArch: noarch
@@ -24,10 +24,22 @@ Requires: python-psutil >= 0.6.0
2424
Requires: fontawesome-fonts
2525
Requires: open-sans-fonts
2626
Requires: logrotate
27-
BuildRequires: gettext-devel
28-
BuildRequires: libxslt
29-
BuildRequires: openssl
30-
BuildRequires: python-lxml
27+
Requires: policycoreutils
28+
Requires: policycoreutils-python
29+
30+
Requires(post): policycoreutils
31+
Requires(post): policycoreutils-python
32+
Requires(post): selinux-policy-targeted
33+
Requires(postun): policycoreutils
34+
Requires(postun): policycoreutils-python
35+
Requires(postun): selinux-policy-targeted
36+
37+
BuildRequires: gettext-devel
38+
BuildRequires: libxslt
39+
BuildRequires: openssl
40+
BuildRequires: python-lxml
41+
BuildRequires: selinux-policy-devel
42+
BuildRequires: policycoreutils-devel
3143

3244
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
3345
%global with_systemd 1
@@ -65,6 +77,8 @@ Wok is Webserver Originated from Kimchi.
6577
%build
6678
./autogen.sh --system
6779
make
80+
cd src/selinux
81+
make -f /usr/share/selinux/devel/Makefile
6882

6983

7084
%install
@@ -85,7 +99,8 @@ install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services
8599
# Install script to help open port in firewalld
86100
install -Dm 0744 src/wok-firewalld.sh %{buildroot}%{_datadir}/wok/utils/wok-firewalld.sh
87101

88-
102+
# Install SELinux policy
103+
install -Dm 0744 src/selinux/wokd.pp %{buildroot}%{_datadir}/wok/selinux/wokd.pp
89104

90105
%post
91106
if [ $1 -eq 1 ] ; then
@@ -97,6 +112,8 @@ if [ $1 -eq 1 ] ; then
97112
%{_datadir}/wok/utils/wok-firewalld.sh public add wokd
98113
fi
99114

115+
# Install SELinux policy
116+
semodule -i %{_datadir}/wok/selinux/wokd.pp
100117

101118
%preun
102119

@@ -117,6 +134,10 @@ exit 0
117134
if [ "$1" -ge 1 ] ; then
118135
/bin/systemctl try-restart wokd.service >/dev/null 2>&1 || :
119136
fi
137+
if [ $1 -eq 0 ]; then
138+
# Remove the SELinux policy, only when uninstall the package
139+
semodule -r wokd
140+
fi
120141
exit 0
121142

122143
%clean
@@ -157,55 +178,24 @@ rm -rf $RPM_BUILD_ROOT
157178
%endif
158179

159180
%changelog
160-
* Wed Aug 24 2016 <baseuser@ibm.com>
161-
Log from git:
162-
- 520838dc93b4fabc2141555b858d5513a32b2c41 Merge remote-tracking branch 'upstream/master' into powerkvm-v3.1.1
163-
- 885a817f2c09acdb80a715bf337849eb7780d35c Status label on user log #145
164-
- 8ceffbd0b9e4885fbf3ad754aed997fa00b1050c Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
165-
- 2336f97ca7a0dda708b83d539f17c7c946e54999 Issue #155: 'make clean' does not revert its changes from 'make rpm'
166-
- eaf780c895f510fac4c3fdf75659b0958c7c85b3 model.py: use the new 'get_all_model_instances' utils function
167-
- 2dfb1f8ddccbbf40d05d0cc48f74cbb6f318a5f0 wok/utils.py: adding utility 'get model instances' methods
168-
- bc9406570d30c66270516ae9209f00b33fc78cef Update tests
169-
- 09d1e4e3d8867b4dd2fe082f28fd0db12768548b Fix issue #140 - Add original exception to user request log message
170-
- 86f200ef33dee30aaf01f5a62a4db99791ee59d0 Add selinux/wokd.te describing the SELinux policy to allow httpd context and allow nginx start up with no errors.
171-
- bab46edd4206a8e3c0516209b06f8aef11035316 Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
172-
- e9e6d48c98278d53e3a61a36397df4eb9f2e0739 Fix ascii_dict and utf8_dict
173-
- 9bc2c489e50c518a9eb8caaccdc245139aed518b Update tests
174-
- 7297cba20adec34626b331343de24a29370605d2 Fix issue with converting message to unicode
175-
- b741558fc840e5ebb89732e7d7f60ac1b55b5f7c Issue #142 - Translate request log at reading-time
176-
- b1df9ec0ee4f251506c29a3c856b7ecb4efe427a Add option to get untranslated message text
177-
- 408e45f17df09dd65891520109eb6d1dbd772774 Isolate string utils in order to avoid cyclic import
178-
- 7ca7cb1c068b3484a25f48f9d955659cbdcd4145 Adding close callback support for wok.confirm dialog
179-
- 5d872fcf38836cf9307c2e3306e6751d1786a33d Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
180-
- bfa4fc7714acce8a13e3f81a7e40ca82e5a117a1 Externalise the tab names and locale list
181-
- b2ae4d8e9e68d1d220370028cefd2048da81f185 Calendar per locale setting in User Log Advanced search
182-
- b2234a93eb9dcf9675c184b8c2c3ac598a9903db Externalise request types in advanced search panel of user activity log
183-
- ca62ba31d5a12c38a121d04067c3dfce1dd351cf Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
184-
- 4cbb1b93d62fb0b3ac0a2d5ece89d9b01f710b61 Use system's nginx proxy service.
185-
- 23d785c655059f8b6b1bb5bf9a4d9428921cf586 User session timeout alert (UI)
186-
- 925624df62ed911d19f9125e72395cab42821a4d Kimchi kills Wokd due to sys.exit() calls in files networks.py and storagepools.py
187-
- 158e44fa4b5ea35ba316644089b99220261e76b5 Issue #133: Kimchi is logging out due to session timeout even when user is typing or using the webpage
188-
- b29555afde85a276266256f3562debbabdec7c06 Move constant from auth.py to template.py
189-
- 5354ce2e97d09092afce4ee7fc75b0dbb24da56f Issue 136: Changes for User Log UI
190-
- 01e2af1ffcda53333887163b3b99ae31a48cd064 Fixes loading message position inside panel-groups
191-
- accf63a89d2f4277cff18399277f344d0c6f1169 Added cursor for tasks in progress
192-
- 4c61122711b29a8880509c72a33839e8faa6754b Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
193-
- f0c4b4465e801b9850e047656dee8d19dbc03ec2 Use callback instead of log file for run_command output
194-
- e61e8087bddbed973b6260316aaa10f6878b207b Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
195-
- 8131d34e33bd47dd21e69776017a9e694d85ee3b Added DataTables.net JS minified files
196-
- a96124cf508f4b9f8f8e7dee9acaa5bcd688dd9d Added Moment.JS file with locales
197-
- f2465b5b7835b0373137e164f0b99560c550cfca Initial commit for Datatables.net and Moment.JS
198-
- b26abf2201b0de2d38e28b372a8bacdbbc63cf3c Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
199-
- 487bf95ed7829b1301a99025845870fc0dd9cd0d Make sure all log messages have required parameters
200-
- 35454b291e8bc82a389c89315c3a90bec2d4e4b3 Fix PEP8 issue
201-
- 20c9ccc52160917f98794d97ada880067375b37d Issue #116:No indication of debug reports being generated(Gingerbase)
202-
- e2c50250617ede4192ba8c25e70a6ac7de4f4948 Issue #79: All error messages should keep on UI until user dismiss it
203-
- 5843b3134268f6093033d80140b18e67a1615530 Add status code to request log message
204-
- 684c19ab217a3996966034a5592a9be013a150d4 Log failed user requests
205-
- 6d739341e155b36bac15f8b2528766bdcdfb6697 Log failed login/logout attempts
206-
- 91730f7398bd8198f7f4499733bc60aaf08ec941 Use status code 200 for PUT requests on resource
207-
- 55a1d9123b11501b33aab7fb929d051cc8b4110f Parse request before authorization check
208-
- 222c4c6b5643c7be28729a3e4952ab942dadbd51 Revert "Use past verbs"
209-
- fe068e11b05fe45a5b0054b8145c3b7dd7add019 Update ChangeLog, VERSION and .po files for 2.2 release
210-
- 50fdc25f9fb66e3ff8a2fb1959fbb4e21c6d47de Merge remote-tracking branch 'upstream/master' into openpower-v3.1.1
211-
- 0e57dfe9ebfdad518bb86c464f620b0de942e51d Github #138: fix loadash Makefile.am
181+
* Thu Sep 01 2016 Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> - 2.2.0-3.pkvm3_1_1
182+
- Build August, 31st, 2016
183+
184+
* Thu Aug 4 2016 Paulo Vital <pvital@linux.vnet.ibm.com> 2.3
185+
- Add SELinux policy to allow http context
186+
187+
* Fri Jun 19 2015 Lucio Correia <luciojhc@linux.vnet.ibm.com> 2.0
188+
- Rename to wokd
189+
- Remove kimchi specifics
190+
191+
* Thu Feb 26 2015 Frédéric Bonnard <frediz@linux.vnet.ibm.com> 1.4.0
192+
- Add man page for kimchid
193+
194+
* Tue Feb 11 2014 Crístian Viana <vianac@linux.vnet.ibm.com> 1.1.0
195+
- Add help pages and XSLT dependency
196+
197+
* Tue Jul 16 2013 Adam Litke <agl@us.ibm.com> 0.1.0-1
198+
- Adapted for autotools build
199+
200+
* Thu Apr 04 2013 Aline Manera <alinefm@br.ibm.com> 0.0-1
201+
- First build

wok/wok.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package:
22
name: 'wok'
33
clone_url: 'https://github.com/open-power-host-os/wok.git'
44
branch: 'powerkvm-v3.1.1'
5-
commit_id: '520838d'
5+
commit_id: '240f449'
66
expects_source: 'wok'
77
files:
88
centos:

0 commit comments

Comments
 (0)