starlingx/meta-starlingx
Code Issues Proposed changes

iptables: update for stx 5.0

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

* remove do_copy_config_files since it's not
  needed after using stx-metadata

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ia1793b9f4000da489ccbda4deb97dd719a10b2fe
This commit is contained in:
Jackie Huang 2021-06-03 15:57:33 +08:00
parent 8a4381b420
commit fae0aac0c2
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-stx-integ/recipes-extended/iptables/iptables_%.bbappend
View File

@ -1,25 +1,13 @@
SRCREV_FORMAT = "opendev" inherit stx-metadata
SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
SUBPATH0 = "iptables-config" STX_REPO = "config-files"
DSTSUFX0 = "stx-configfiles" STX_SUBPATH = "iptables-config"
LICENSE_append = "& Apache-2.0" LICENSE_append = "& Apache-2.0"
LIC_FILES_CHKSUM += "\ LIC_FILES_CHKSUM += "\
file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
" "
SRC_URI += " \
git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
"
do_unpack_append() {
bb.build.exec_func('do_copy_config_files', d)
}
do_copy_config_files () {
cp -pf ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE
}
inherit systemd inherit systemd
SYSTEMD_PACKAGES += "${PN}" SYSTEMD_PACKAGES += "${PN}"
SYSETMD_SERVICE_${PN}_append = "iptables.service ip6tables.service" SYSETMD_SERVICE_${PN}_append = "iptables.service ip6tables.service"
@ -28,6 +16,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
do_install_append() { do_install_append() {
install -d -m0755 ${D}/${sysconfdir}/sysconfig install -d -m0755 ${D}/${sysconfdir}/sysconfig
install -m 600 ${WORKDIR}/${DSTSUFX0}/files/iptables.rules ${D}/${sysconfdir}/sysconfig/iptables install -m 600 ${STX_METADATA_PATH}/files/iptables.rules ${D}/${sysconfdir}/sysconfig/iptables
install -m 600 ${WORKDIR}/${DSTSUFX0}/files/ip6tables.rules ${D}/${sysconfdir}/sysconfig/ip6tables install -m 600 ${STX_METADATA_PATH}/files/ip6tables.rules ${D}/${sysconfdir}/sysconfig/ip6tables
} }