From a00649aec457c8f5efff9c58e9506ad7e9a7f05b Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Sat, 16 Sep 2023 13:35:44 +0800 Subject: [PATCH] build --- build/{ => etc/conf.d}/nginx/omc.conf | 0 build/{ => lib}/systemd/crontask.service | 0 build/{ => lib}/systemd/restagent.service | 0 build/{ => lib}/systemd/sshsvc.service | 0 build/{ => usr/local}/omc/.ssh/id_rsa | 0 build/{ => usr/local}/omc/.ssh/id_rsa.pub | 0 build/{ => usr/local}/omc/.ssh/private_key.pem | 0 build/{ => usr/local}/omc/backup/.gitkeep | 0 build/{ => usr/local}/omc/bin/.gitkeep | 0 build/{ => usr/local}/omc/database/.gitkeep | 0 build/{ => usr/local}/omc/etc/certs/ca_cert.pem | 0 .../{ => usr/local}/omc/etc/certs/private_key.pem | 0 build/{ => usr/local}/omc/etc/certs/public_key.pem | 0 build/{ => usr/local}/omc/etc/cm/cm-amf.yaml | 0 build/{ => usr/local}/omc/etc/cm/cm-smf.yaml | 0 build/{ => usr/local}/omc/etc/cm/cm-udm.yaml | 0 build/{ => usr/local}/omc/etc/cm/cm-upf.yaml | 0 build/{ => usr/local}/omc/etc/db/.gitkeep | 0 .../{ => usr/local}/omc/etc/default/crontask.yaml | 0 .../{ => usr/local}/omc/etc/default/restconf.yaml | 0 build/{ => usr/local}/omc/etc/default/sshsvc.yaml | 0 build/{ => usr/local}/omc/etc/default/tasks.yaml | 0 build/{ => usr/local}/omc/etc/schema/cm-schema.xsd | 0 build/{ => usr/local}/omc/etc/schema/pm-schema.xsd | 0 build/{ => usr/local}/omc/htdocs/front/.gitkeep | 0 build/{ => usr/local}/omc/license/.gitkeep | 0 build/{ => usr/local}/omc/log/.gitkeep | 0 build/{ => usr/local}/omc/mmlhome/.gitkeep | 0 build/{ => usr/local}/omc/mmllog/.gitkeep | 0 build/{ => usr/local}/omc/software/.gitkeep | 0 build/{ => usr/local}/omc/upload/.gitkeep | 0 rpmbuild/SPECS/omc.spec | 14 +++++++------- 32 files changed, 7 insertions(+), 7 deletions(-) rename build/{ => etc/conf.d}/nginx/omc.conf (100%) rename build/{ => lib}/systemd/crontask.service (100%) rename build/{ => lib}/systemd/restagent.service (100%) rename build/{ => lib}/systemd/sshsvc.service (100%) rename build/{ => usr/local}/omc/.ssh/id_rsa (100%) rename build/{ => usr/local}/omc/.ssh/id_rsa.pub (100%) rename build/{ => usr/local}/omc/.ssh/private_key.pem (100%) rename build/{ => usr/local}/omc/backup/.gitkeep (100%) rename build/{ => usr/local}/omc/bin/.gitkeep (100%) rename build/{ => usr/local}/omc/database/.gitkeep (100%) rename build/{ => usr/local}/omc/etc/certs/ca_cert.pem (100%) rename build/{ => usr/local}/omc/etc/certs/private_key.pem (100%) rename build/{ => usr/local}/omc/etc/certs/public_key.pem (100%) rename build/{ => usr/local}/omc/etc/cm/cm-amf.yaml (100%) rename build/{ => usr/local}/omc/etc/cm/cm-smf.yaml (100%) rename build/{ => usr/local}/omc/etc/cm/cm-udm.yaml (100%) rename build/{ => usr/local}/omc/etc/cm/cm-upf.yaml (100%) rename build/{ => usr/local}/omc/etc/db/.gitkeep (100%) rename build/{ => usr/local}/omc/etc/default/crontask.yaml (100%) rename build/{ => usr/local}/omc/etc/default/restconf.yaml (100%) rename build/{ => usr/local}/omc/etc/default/sshsvc.yaml (100%) rename build/{ => usr/local}/omc/etc/default/tasks.yaml (100%) rename build/{ => usr/local}/omc/etc/schema/cm-schema.xsd (100%) rename build/{ => usr/local}/omc/etc/schema/pm-schema.xsd (100%) rename build/{ => usr/local}/omc/htdocs/front/.gitkeep (100%) rename build/{ => usr/local}/omc/license/.gitkeep (100%) rename build/{ => usr/local}/omc/log/.gitkeep (100%) rename build/{ => usr/local}/omc/mmlhome/.gitkeep (100%) rename build/{ => usr/local}/omc/mmllog/.gitkeep (100%) rename build/{ => usr/local}/omc/software/.gitkeep (100%) rename build/{ => usr/local}/omc/upload/.gitkeep (100%) diff --git a/build/nginx/omc.conf b/build/etc/conf.d/nginx/omc.conf similarity index 100% rename from build/nginx/omc.conf rename to build/etc/conf.d/nginx/omc.conf diff --git a/build/systemd/crontask.service b/build/lib/systemd/crontask.service similarity index 100% rename from build/systemd/crontask.service rename to build/lib/systemd/crontask.service diff --git a/build/systemd/restagent.service b/build/lib/systemd/restagent.service similarity index 100% rename from build/systemd/restagent.service rename to build/lib/systemd/restagent.service diff --git a/build/systemd/sshsvc.service b/build/lib/systemd/sshsvc.service similarity index 100% rename from build/systemd/sshsvc.service rename to build/lib/systemd/sshsvc.service diff --git a/build/omc/.ssh/id_rsa b/build/usr/local/omc/.ssh/id_rsa similarity index 100% rename from build/omc/.ssh/id_rsa rename to build/usr/local/omc/.ssh/id_rsa diff --git a/build/omc/.ssh/id_rsa.pub b/build/usr/local/omc/.ssh/id_rsa.pub similarity index 100% rename from build/omc/.ssh/id_rsa.pub rename to build/usr/local/omc/.ssh/id_rsa.pub diff --git a/build/omc/.ssh/private_key.pem b/build/usr/local/omc/.ssh/private_key.pem similarity index 100% rename from build/omc/.ssh/private_key.pem rename to build/usr/local/omc/.ssh/private_key.pem diff --git a/build/omc/backup/.gitkeep b/build/usr/local/omc/backup/.gitkeep similarity index 100% rename from build/omc/backup/.gitkeep rename to build/usr/local/omc/backup/.gitkeep diff --git a/build/omc/bin/.gitkeep b/build/usr/local/omc/bin/.gitkeep similarity index 100% rename from build/omc/bin/.gitkeep rename to build/usr/local/omc/bin/.gitkeep diff --git a/build/omc/database/.gitkeep b/build/usr/local/omc/database/.gitkeep similarity index 100% rename from build/omc/database/.gitkeep rename to build/usr/local/omc/database/.gitkeep diff --git a/build/omc/etc/certs/ca_cert.pem b/build/usr/local/omc/etc/certs/ca_cert.pem similarity index 100% rename from build/omc/etc/certs/ca_cert.pem rename to build/usr/local/omc/etc/certs/ca_cert.pem diff --git a/build/omc/etc/certs/private_key.pem b/build/usr/local/omc/etc/certs/private_key.pem similarity index 100% rename from build/omc/etc/certs/private_key.pem rename to build/usr/local/omc/etc/certs/private_key.pem diff --git a/build/omc/etc/certs/public_key.pem b/build/usr/local/omc/etc/certs/public_key.pem similarity index 100% rename from build/omc/etc/certs/public_key.pem rename to build/usr/local/omc/etc/certs/public_key.pem diff --git a/build/omc/etc/cm/cm-amf.yaml b/build/usr/local/omc/etc/cm/cm-amf.yaml similarity index 100% rename from build/omc/etc/cm/cm-amf.yaml rename to build/usr/local/omc/etc/cm/cm-amf.yaml diff --git a/build/omc/etc/cm/cm-smf.yaml b/build/usr/local/omc/etc/cm/cm-smf.yaml similarity index 100% rename from build/omc/etc/cm/cm-smf.yaml rename to build/usr/local/omc/etc/cm/cm-smf.yaml diff --git a/build/omc/etc/cm/cm-udm.yaml b/build/usr/local/omc/etc/cm/cm-udm.yaml similarity index 100% rename from build/omc/etc/cm/cm-udm.yaml rename to build/usr/local/omc/etc/cm/cm-udm.yaml diff --git a/build/omc/etc/cm/cm-upf.yaml b/build/usr/local/omc/etc/cm/cm-upf.yaml similarity index 100% rename from build/omc/etc/cm/cm-upf.yaml rename to build/usr/local/omc/etc/cm/cm-upf.yaml diff --git a/build/omc/etc/db/.gitkeep b/build/usr/local/omc/etc/db/.gitkeep similarity index 100% rename from build/omc/etc/db/.gitkeep rename to build/usr/local/omc/etc/db/.gitkeep diff --git a/build/omc/etc/default/crontask.yaml b/build/usr/local/omc/etc/default/crontask.yaml similarity index 100% rename from build/omc/etc/default/crontask.yaml rename to build/usr/local/omc/etc/default/crontask.yaml diff --git a/build/omc/etc/default/restconf.yaml b/build/usr/local/omc/etc/default/restconf.yaml similarity index 100% rename from build/omc/etc/default/restconf.yaml rename to build/usr/local/omc/etc/default/restconf.yaml diff --git a/build/omc/etc/default/sshsvc.yaml b/build/usr/local/omc/etc/default/sshsvc.yaml similarity index 100% rename from build/omc/etc/default/sshsvc.yaml rename to build/usr/local/omc/etc/default/sshsvc.yaml diff --git a/build/omc/etc/default/tasks.yaml b/build/usr/local/omc/etc/default/tasks.yaml similarity index 100% rename from build/omc/etc/default/tasks.yaml rename to build/usr/local/omc/etc/default/tasks.yaml diff --git a/build/omc/etc/schema/cm-schema.xsd b/build/usr/local/omc/etc/schema/cm-schema.xsd similarity index 100% rename from build/omc/etc/schema/cm-schema.xsd rename to build/usr/local/omc/etc/schema/cm-schema.xsd diff --git a/build/omc/etc/schema/pm-schema.xsd b/build/usr/local/omc/etc/schema/pm-schema.xsd similarity index 100% rename from build/omc/etc/schema/pm-schema.xsd rename to build/usr/local/omc/etc/schema/pm-schema.xsd diff --git a/build/omc/htdocs/front/.gitkeep b/build/usr/local/omc/htdocs/front/.gitkeep similarity index 100% rename from build/omc/htdocs/front/.gitkeep rename to build/usr/local/omc/htdocs/front/.gitkeep diff --git a/build/omc/license/.gitkeep b/build/usr/local/omc/license/.gitkeep similarity index 100% rename from build/omc/license/.gitkeep rename to build/usr/local/omc/license/.gitkeep diff --git a/build/omc/log/.gitkeep b/build/usr/local/omc/log/.gitkeep similarity index 100% rename from build/omc/log/.gitkeep rename to build/usr/local/omc/log/.gitkeep diff --git a/build/omc/mmlhome/.gitkeep b/build/usr/local/omc/mmlhome/.gitkeep similarity index 100% rename from build/omc/mmlhome/.gitkeep rename to build/usr/local/omc/mmlhome/.gitkeep diff --git a/build/omc/mmllog/.gitkeep b/build/usr/local/omc/mmllog/.gitkeep similarity index 100% rename from build/omc/mmllog/.gitkeep rename to build/usr/local/omc/mmllog/.gitkeep diff --git a/build/omc/software/.gitkeep b/build/usr/local/omc/software/.gitkeep similarity index 100% rename from build/omc/software/.gitkeep rename to build/usr/local/omc/software/.gitkeep diff --git a/build/omc/upload/.gitkeep b/build/usr/local/omc/upload/.gitkeep similarity index 100% rename from build/omc/upload/.gitkeep rename to build/usr/local/omc/upload/.gitkeep diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index 4bff772..a6edade 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -17,15 +17,15 @@ Group: Applications/Communications AGrandTech's 5GC OMC %prep -rm -rf ${RPM_BUILD_ROOT}/etc -rm -rf ${RPM_BUILD_ROOT}/lib -rm -rf ${RPM_BUILD_ROOT}/usr +rm -rf ${RPM_BUILD_ROOT}/* +#rm -rf ${RPM_BUILD_ROOT}/lib +#rm -rf ${RPM_BUILD_ROOT}/usr mkdir -p ${RPM_BUILD_ROOT} cd ${RPM_BUILD_ROOT} -mkdir -p usr/local/omc/ -mkdir -p usr/local/db/ -mkdir -p etc/nginx/conf.d -mkdir -p lib/systemd/system/ +#mkdir -p usr/local/omc/ +#mkdir -p usr/local/db/ +#mkdir -p etc/nginx/conf.d +#mkdir -p lib/systemd/system/ #cd ${RPM_BUILD_DIR} cp -rf ${RPM_BUILD_DIR}/* ${RPM_BUILD_ROOT}/