X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-core%2Fstx-config-files%2Fconfig-files_1.0.0.bb;h=2002e2d793c1460b86f5e2b9c81174d5bb90e704;hb=ad9bc29d45261de7da7fa689b3693c0388e41a3f;hp=67b0e5e05de6de3ba517796f58c4d2ec2e14cbbe;hpb=246e12d43a4243e407b347d769db6b2f5edfdb55;p=pti%2Frtp.git diff --git a/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb b/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb index 67b0e5e..2002e2d 100644 --- a/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb +++ b/meta-stx/recipes-core/stx-config-files/config-files_1.0.0.bb @@ -49,7 +49,6 @@ SRC_URI = " \ file://util-linux-pam-postlogin.patch \ file://syslog-ng-config-parse-err.patch \ file://syslog-ng-config-systemd-service.patch \ - file://syslog-ng-conf-fix-the-source.patch \ file://syslog-ng-conf-replace-match-with-message.patch \ file://lighttpd-init-script-chroot.patch \ " @@ -147,7 +146,7 @@ RDEPENDS_audit-config += " \ audit-python \ " RDEPENDS_dhclient-config += "dhcp-client" -RDEPENDS_dnsmasq-config += "" +RDEPENDS_dnsmasq-config += "dnsmasq" RDEPENDS_docker-config += "docker-ce logrotate " RDEPENDS_initscripts-config += "initscripts" RDEPENDS_filesystem-scripts += "" @@ -252,8 +251,8 @@ pkg_postinst_ontarget_audit-config() { } pkg_postinst_centos-release-config() { - sed 's/@PLATFORM_RELEASE@/${STX_REL}/' $D${datadir}/starlingx/config-files/centos-release-config/files/issue >> $D${sysconfdir}/issue - sed 's/@PLATFORM_RELEASE@/${STX_REL}/' $D${datadir}/starlingx/config-files/centos-release-config/files/issue.net >> $D${sysconfdir}/issue.net + sed 's/@PLATFORM_RELEASE@/${ORAN_REL}/' $D${datadir}/starlingx/config-files/centos-release-config/files/issue >> $D${sysconfdir}/issue + sed 's/@PLATFORM_RELEASE@/${ORAN_REL}/' $D${datadir}/starlingx/config-files/centos-release-config/files/issue.net >> $D${sysconfdir}/issue.net chmod 644 $D${sysconfdir}/issue chmod 644 $D${sysconfdir}/issue.net } @@ -687,15 +686,6 @@ pkg_postinst_syslog-ng-config() { if [ -z "$D" ]; then systemctl --no-block restart syslog-ng.service fi - -# TODO -#preun: -# %systemd_preun syslog-ng.service -#postun: -# ldconfig -# %systemd_postun_with_restart syslog-ng.service -# systemctl daemon-reload 2>&1 || : -# systemctl try-restart } pkg_postinst_ontarget_systemd-config() {