Package haproxy-config add the haproxy init script file, but,
in the debian package it already contains the script file.
In order to avoid using dpkg-divert on haproxy-config package,
this patch was created to remove the script file from original
debian package.
Test:
PASS: built image successfully
PASS: Installed image successfully (with haproxy)
PASS: Bootstrap and unlock successfull
Story: 2009964
Task: 45036
Signed-off-by: aoliveir <adriano.oliveira@windriver.com>
Change-Id: I93e9fd0d2e80d1fd7f509aebe995547fee502229
This update makes use of the PKG_GITREVCOUNT variable
to auto-version the packages in this repo.
Story: 2007750
Task: 39951
Change-Id: I854419c922b9db4edbbf6f1e987a982ec2ec7b59
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
We can do the similar change like we did in
https://review.openstack.org/#/c/620466/
Since we have duplicated log configuration,we can erase
logrotate.d/dhcp instead of remove the file with the patch.
Deployment test pass and logrotate.d/dhcp file check pass.
Story: 2004452
Task: 28131
Change-Id: Ib22fa073ca4e09af1b25854f0f1c8574f9337f3c
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
Use haproxy-config package to package script and service file for
haproxy package.
Create patches sub-folder and move patches file from haproxy/haproxy
folder to this sub-folder.
Refactor haproxy-service-file.patch &
haproxy-spec-add-init-script.patch
as we use haproxy-config to package related files.
Merged meta_add_support_for_tpm.patch &
spec-add-haproxy-env-var-patch.patch
to spec-include-TiS-changes.patch
(renamed from spec-include-TiS-config.patch) as they just includes
adding source code patches.
Deployment test and ping test between VMs pass
config and script files check pass.
Story: 2003768
Task: 27584
Depends-on: https://review.openstack.org/#/c/614709/
Change-Id: I08fd8aa662533f4ce379f352ba9bab7616c905f5
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
With rpm version < 4.13, patch cmd will create .orig file for fuzzy
patch in default. And this .orig file may lead to rpmbuild failure
"error: Installed (but unpackaged) file(s) found:"
Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611
Story: 2003917
Task: 26968
Change-Id: I8c18a5913e3eabc476c0ad8fdab78b71b574b70c
Signed-off-by: slin14 <shuicheng.lin@intel.com>
Problem:
- Centos 7.5 upgraded haproxys.
- Porting of haproxys patches did not resolve and 'fuzz' in the line
numbers of the patches.
- If haproxy is built by rpm 4.11, or default version of rpm
until 4.14 is compiled, a fuzzy patch results in the creating
of an .orig file.
- Packaging of haproxys failes due to the unexpected, and
unpackaged .orig file
Solution:
Safest solution is to de-fuzz our haproxys patches.
Story: 2003389
Task: 26755
Change-Id: Ice3ebac4e6b7997e87dfeda72353f2bd8ca39447
Signed-off-by: Sun Austin <austin.sun@intel.com>
Fix below linters errors
E010 The "do" should be on same line as for
E010 The "do" should be on same line as while
E011 Then keyword is not on same line as if or elif keyword
E020 Function declaration not in format ^function name {$
Ignore:
E041 Arithmetic expansion using $[ is deprecated for $((
E042 local declaration hides errors
E043 Arithmetic compound has inconsistent return semantics
E044 Use [[ for non-POSIX comparisions
Story: 2003366
Task: 24423
Change-Id: I8b6b72e702d3e89d1813772d6bf16819e28e818c
Signed-off-by: Martin Chen <haochuan.z.chen@intel.com>