Code Review
/
pti
/
rtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
build_inf: fix the script order
[pti/rtp.git]
/
meta-starlingx
/
meta-stx-integ
/
recipes-daemons
/
iscsi-initiator-utils
/
iscsi-initiator-utils_%.bbappend
diff --git
a/meta-starlingx/meta-stx-integ/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend
b/meta-starlingx/meta-stx-integ/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend
index
589d9cd
..
54596f5
100644
(file)
--- a/
meta-starlingx/meta-stx-integ/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend
+++ b/
meta-starlingx/meta-stx-integ/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_%.bbappend
@@
-1,17
+1,13
@@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRCREV_FORMAT = "opendev"
-SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
-S
UBPATH0 = "iscsi-initiator-utils-config
"
-
DSTSUFX0 = "stx-configfiles
"
+inherit stx-metadata
+
+S
TX_REPO = "config-files
"
+
STX_SUBPATH = "iscsi-initiator-utils-config
"
LICENSE_append = "& Apache-2.0"
LIC_FILES_CHKSUM += "\
LICENSE_append = "& Apache-2.0"
LIC_FILES_CHKSUM += "\
- file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=4f3e541126551bf6458a8a6557b1e171 \
- "
-
-SRC_URI += " \
- git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \
+ file://${STX_METADATA_PATH}/centos/iscsi-initiator-utils-config.spec;beginline=1;endline=10;md5=4f3e541126551bf6458a8a6557b1e171 \
"
inherit systemd
"
inherit systemd
@@
-20,21
+16,13
@@
SYSTEMD_SERVICE_${PN}_append = "iscsi-shutdown.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
-do_unpack_append() {
- bb.build.exec_func('do_copy_config_files', d)
-}
-
-do_copy_config_files () {
- cp -pf ${WORKDIR}/stx-configfiles/centos/iscsi-initiator-utils-config.spec ${S}/stx-configfiles-LICENSE
-}
-
do_install_append() {
install -d ${D}/${libdir}/tmpfiles.d
install -d ${D}/${sysconfdir}/systemd/system
do_install_append() {
install -d ${D}/${libdir}/tmpfiles.d
install -d ${D}/${sysconfdir}/systemd/system
- install -m 0644 ${
WORKDIR}/stx-configfiles
/files/iscsi-cache.volatiles ${D}/${libdir}/tmpfiles.d/iscsi-cache.conf
- install -m 0644 ${
WORKDIR}/stx-configfiles
/files/iscsi-shutdown.service ${D}/${sysconfdir}/systemd/system
- install -m 0644 ${
WORKDIR}/stx-configfiles
/files/iscsid.conf ${D}/${sysconfdir}/iscsi/iscsid.conf
+ install -m 0644 ${
STX_METADATA_PATH}
/files/iscsi-cache.volatiles ${D}/${libdir}/tmpfiles.d/iscsi-cache.conf
+ install -m 0644 ${
STX_METADATA_PATH}
/files/iscsi-shutdown.service ${D}/${sysconfdir}/systemd/system
+ install -m 0644 ${
STX_METADATA_PATH}
/files/iscsid.conf ${D}/${sysconfdir}/iscsi/iscsid.conf
rm -rf ${D}/${nonarch_base_libdir}/
}
rm -rf ${D}/${nonarch_base_libdir}/
}