Ryan Harper has posted comments on this change.
Change subject: Change vdsmrepo to something non-rhev specific
......................................................................
Patch Set 2: (1 inline comment)
....................................................
File vdsm.spec.in
Line 451: %dir %attr(0775, root, root)
%{_sharedstatedir}/%{vdsm_name}/repository
Ah, now I remember. Because rpm can't expand the Makefile variables.
RPM build errors:
File must begin with "/": ${sharedstatedir}/vdsm/repository
make: *** [rpm] Error 1
Maybe some makefile magic can help...
for now, in the makefile, we have:
vdsmrepo = ${sharedstatedir}/vdsm/repository
and then
PATHSUBST = sed \
-e "s,[@]BACKUPDIR[@],$(vdsmbackupdir),g" \
-e "s,[@]CONFDIR[@],$(vdsmconfdir),g" \
-e "s,[@]HOOKSDIR[@],$(vdsmhooksdir),g" \
-e "s,[@]LIBEXECDIR[@],$(vdsmexecdir),g" \
-e "s,[@]POOLSDIR[@],$(vdsmpoolsdir),g" \
-e "s,[@]TRUSTSTORE[@],$(vdsmtsdir),g" \
-e "s,[@]VDSMDIR[@],$(vdsmdir),g" \
-e "s,[@]VDSMLIBDIR[@],$(vdsmlibdir),g" \
-e "s,[@]VDSMLOGDIR[@],$(vdsmlogdir),g" \
-e "s,[@]VDSMREPO[@],$(vdsmrepo),g" \
-e "s,[@]VDSMRUNDIR[@],$(vdsmrundir),g"
make failthfully replaces @VDSMREPO@ wtih the exact string in the specfile;
I'm not sure we can bridge this gap since sharedstatedir is a property of the
environment during install; not build (specfile generation time).
In any case, this is why I switched the %files section. Definitely should have
included the background in the commit message.
--
To view, visit http://gerrit.ovirt.org/3286
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I080a161f6338d341c986e0aaa2270a90be10891f
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <[email protected]>
Gerrit-Reviewer: Adam Litke <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Douglas Schilling Landgraf <[email protected]>
Gerrit-Reviewer: Mark Wu <[email protected]>
Gerrit-Reviewer: Ryan Harper <[email protected]>
Gerrit-Reviewer: Saggi Mizrahi <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/vdsm-patches
