starlingx/meta-starlingx
Code Issues Proposed changes

haproxy: update for stx 5.0

Browse Source 
* inherit stx-metadata to help install updated files
  from stx 'config-files' repo

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ida9ce74bae3e0a965f44e80fa485c03dff9fd7c4
This commit is contained in:
Jackie Huang
2021-06-03 15:57:33 +08:00
parent e3a5e773bd
commit 8e94bc2a1e
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta-stx-integ/recipes-connectivity/haproxy/haproxy.inc
View File

@@ -22,17 +22,16 @@ DEPENDS = "libpcre openssl zlib"
MAJOR_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" MAJOR_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
SRCREV_FORMAT = "opendev" inherit stx-metadata
SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
SUBPATH0 = "haproxy-config" STX_REPO = "config-files"
DSTSUFX0 = "stx-configfiles" STX_SUBPATH = "haproxy-config"
SRC_URI = "\ SRC_URI = "\
git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
https://www.haproxy.org/download/${MAJOR_VER}/src/haproxy-${PV}.tar.gz \ https://www.haproxy.org/download/${MAJOR_VER}/src/haproxy-${PV}.tar.gz \
file://haproxy.service \ file://haproxy.service \
file://haproxy.cfg \ file://haproxy.cfg \
" "
inherit systemd useradd inherit systemd useradd
@@ -98,9 +97,9 @@ do_install() {
install -D -m 755 contrib/iprange/iprange ${D}${bindir}/iprange install -D -m 755 contrib/iprange/iprange ${D}${bindir}/iprange
install -d -m 755 ${D}/${sysconfdir}/haproxy/errors/ install -d -m 755 ${D}/${sysconfdir}/haproxy/errors/
install -m 755 ${WORKDIR}/stx-configfiles/files/503.http ${D}/${sysconfdir}/haproxy/errors/503.http install -m 755 ${STX_METADATA_PATH}/files/503.http ${D}/${sysconfdir}/haproxy/errors/503.http
install -p -D -m 0755 ${WORKDIR}/stx-configfiles/files/haproxy.sh ${D}/${sysconfdir}/init.d/haproxy install -p -D -m 0755 ${STX_METADATA_PATH}/files/haproxy.sh ${D}/${sysconfdir}/init.d/haproxy
} }
DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit" DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"