Fix default location where sfcbrepos is looking for schema files
(cherry picked from commit 6394cf3d25e81a805c124154294d01f5eab4e74f)
This commit is contained in:
parent
d0717552d7
commit
2ed6bb15b0
44
sblim-sfcb-1.4.9-sfcbrepos-schema-location.patch
Normal file
44
sblim-sfcb-1.4.9-sfcbrepos-schema-location.patch
Normal file
@ -0,0 +1,44 @@
|
||||
diff --git a/man/sfcbrepos.1.pre.in b/man/sfcbrepos.1.pre.in
|
||||
index aa910c2..3c6e96a 100644
|
||||
--- a/man/sfcbrepos.1.pre.in
|
||||
+++ b/man/sfcbrepos.1.pre.in
|
||||
@@ -26,7 +26,7 @@ Supported command line options are:
|
||||
.TP
|
||||
\fB\-c\fR \fIschemadir\fR
|
||||
Path to obtain the CIM Schema classes.
|
||||
-Default is \fI@datadir@/sfcb\fR
|
||||
+Default is \fI@datadir@/mof/cim-current\fR
|
||||
.TP
|
||||
\fB\-s\fR \fIstagingdir\fR
|
||||
Path to sfcb staging area containing class MOFs and registration files
|
||||
@@ -65,7 +65,7 @@ Default is \fIauto\fR, which will auto-detect based on the contents of the
|
||||
Display usage information and exit.
|
||||
.SH FILES
|
||||
.TP
|
||||
-\fI@datadir@/sfcb/CIM/CIM_Schema.mof\fR
|
||||
+\fI@datadir@/mof/cim-current/CIM_Schema.mof\fR
|
||||
CIM Schema
|
||||
.TP
|
||||
\fI@localstatedir@/lib/sfcb/registration/providerRegister\fR
|
||||
diff --git a/sfcbrepos.sh.in b/sfcbrepos.sh.in
|
||||
index 71a6c38..344e47b 100644
|
||||
--- a/sfcbrepos.sh.in
|
||||
+++ b/sfcbrepos.sh.in
|
||||
@@ -59,7 +59,7 @@ then
|
||||
echo -e "\t-X create repository in non-native format as specifed by argument"
|
||||
echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
|
||||
echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
|
||||
- echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
|
||||
+ echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/mof/cim-current]"
|
||||
echo -e "\t-t create tiny class repository by omitting inheritance information"
|
||||
echo -e "\t-z compress repository with gzip"
|
||||
echo
|
||||
@@ -99,7 +99,7 @@ fi
|
||||
|
||||
if [ -z "$cimschemadir" ]
|
||||
then
|
||||
- cimschemadir=${DESTDIR}@datadir@/sfcb/CIM
|
||||
+ cimschemadir=${DESTDIR}@datadir@/mof/cim-current
|
||||
fi
|
||||
|
||||
if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&
|
||||
@ -2,7 +2,7 @@ Name: sblim-sfcb
|
||||
Summary: Small Footprint CIM Broker (SFCB)
|
||||
URL: http://sblim.sourceforge.net/wiki/index.php/Sfcb
|
||||
Version: 1.4.9
|
||||
Release: 14
|
||||
Release: 15
|
||||
License: EPL
|
||||
|
||||
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
|
||||
@ -13,6 +13,7 @@ Patch1: sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
|
||||
Patch2: sblim-sfcb-1.4.9-fix-ftbfs.patch
|
||||
Patch3: sblim-sfcb-1.4.9-fix-null-deref.patch
|
||||
Patch4: sblim-sfcb-1.4.9-fix-null-content-type-crash.patch
|
||||
Patch5: sblim-sfcb-1.4.9-sfcbrepos-schema-location.patch
|
||||
|
||||
Provides: cim-server = 0
|
||||
Requires: cim-schema sblim-sfcCommon
|
||||
@ -88,5 +89,8 @@ fi;
|
||||
%files -f _pkg_list
|
||||
|
||||
%changelog
|
||||
* Tue Mar 16 2021 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.4.9-15
|
||||
- Fix default location where sfcbrepos is looking for schema files
|
||||
|
||||
* Fri Feb 14 2020 Senlin Xia <xiasenlin1@huawei.com> - 1.4.9-14
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user