X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-extended%2Frabbitmq%2Frabbitmq-server_%25.bbappend;h=e3a9155f8f45e8924f859d75b7aecb82adcd1323;hb=cd382eb0b2f175bc3701754f95201f6ea1512873;hp=c68e133888d910197f48876c1da1df6cfd0815dc;hpb=e0634c6eaf2fe2641a0fb90e84a5defb880b1335;p=pti%2Frtp.git diff --git a/meta-starlingx/meta-stx-integ/recipes-extended/rabbitmq/rabbitmq-server_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-extended/rabbitmq/rabbitmq-server_%.bbappend index c68e133..e3a9155 100644 --- a/meta-starlingx/meta-stx-integ/recipes-extended/rabbitmq/rabbitmq-server_%.bbappend +++ b/meta-starlingx/meta-stx-integ/recipes-extended/rabbitmq/rabbitmq-server_%.bbappend @@ -1,23 +1,13 @@ -SRCREV_FORMAT = "opendev" -SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde" +inherit stx-metadata + +STX_REPO = "config-files" +STX_SUBPATH = "rabbitmq-server-config" + LICENSE_append = " & Apache-2.0" -SUBPATH0 = "rabbitmq-server-config" -DSTSUFX0 = "stx-configfiles" LIC_FILES_CHKSUM += "\ - file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=47a43f492f496b985b830ce47b8c5cec \ + file://${STX_METADATA_PATH}/centos/rabbitmq-server-config.spec;beginline=1;endline=10;md5=47a43f492f496b985b830ce47b8c5cec \ " -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}/stx-configfiles/centos/rabbitmq-server-config.spec ${S}/stx-configfiles-LICENSE -} do_install_append () { @@ -26,16 +16,16 @@ do_install_append () { install -d ${D}/${sysconfdir}/systemd/system install -d ${D}/${sysconfdir}/logrotate.d - install -m 0755 ${WORKDIR}/stx-configfiles/files/rabbitmq-server.ocf \ + install -m 0755 ${STX_METADATA_PATH}/files/rabbitmq-server.ocf \ ${D}/usr/lib/ocf/resource.d/rabbitmq/stx.rabbitmq-server - install -m 0644 ${WORKDIR}/stx-configfiles/files/rabbitmq-server.service.example \ + install -m 0644 ${STX_METADATA_PATH}/files/rabbitmq-server.service.example \ ${D}/${sysconfdir}/systemd/system/rabbitmq-server.service sed -i -e 's/notify/simple/' ${D}/${sysconfdir}/systemd/system/rabbitmq-server.service # Remove lib/systemd/ rm -rf ${D}/${nonarch_base_libdir} - install -m 0644 ${WORKDIR}/stx-configfiles/files/rabbitmq-server.logrotate \ + install -m 0644 ${STX_METADATA_PATH}/files/rabbitmq-server.logrotate \ ${D}/${sysconfdir}/logrotate.d/rabbitmq-server }