| Message ID | 20170518224451.26864-1-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, 2017-05-18 at 15:44 -0700, Joe Stringer wrote: > This is the equivalent change of 2f4f43bfddfd ("rhel: fix the fedora > spec") for the regular openvswitch.spec. From that patch: > > When commit d0c961a99f57 ("lib/automake.mk: don't install runtime > directories") landed, it broke RPM based builds since the requisite > directories were no longer available. This commit adds those > directories back when making RPMs so that the packagemanager can see > them. > > Fixes: d0c961a99f57 ("lib/automake.mk: don't install runtime directories") > Signed-off-by: Joe Stringer <joe@ovn.org> Thanks for fixing this! Acked-by: Greg Rose <gvrose8192@gmail.com> > --- > rhel/openvswitch.spec.in | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in > index 31a535c9f50c..412f3cd9dd21 100644 > --- a/rhel/openvswitch.spec.in > +++ b/rhel/openvswitch.spec.in > @@ -107,7 +107,9 @@ rm \ > (cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la) > (cd "$RPM_BUILD_ROOT" && rm -rf usr/include) > > -install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch > +install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch > +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch > +install -d -m 0755 $RPM_BUILD_ROOT/var/lib/openvswitch > > copy_headers() { > src=$1
On 18 May 2017 at 15:48, Greg Rose <gvrose8192@gmail.com> wrote: > On Thu, 2017-05-18 at 15:44 -0700, Joe Stringer wrote: >> This is the equivalent change of 2f4f43bfddfd ("rhel: fix the fedora >> spec") for the regular openvswitch.spec. From that patch: >> >> When commit d0c961a99f57 ("lib/automake.mk: don't install runtime >> directories") landed, it broke RPM based builds since the requisite >> directories were no longer available. This commit adds those >> directories back when making RPMs so that the packagemanager can see >> them. >> >> Fixes: d0c961a99f57 ("lib/automake.mk: don't install runtime directories") >> Signed-off-by: Joe Stringer <joe@ovn.org> > > Thanks for fixing this! > > Acked-by: Greg Rose <gvrose8192@gmail.com> Thanks, applied.
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index 31a535c9f50c..412f3cd9dd21 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -107,7 +107,9 @@ rm \ (cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la) (cd "$RPM_BUILD_ROOT" && rm -rf usr/include) -install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT/var/lib/openvswitch copy_headers() { src=$1
This is the equivalent change of 2f4f43bfddfd ("rhel: fix the fedora spec") for the regular openvswitch.spec. From that patch: When commit d0c961a99f57 ("lib/automake.mk: don't install runtime directories") landed, it broke RPM based builds since the requisite directories were no longer available. This commit adds those directories back when making RPMs so that the packagemanager can see them. Fixes: d0c961a99f57 ("lib/automake.mk: don't install runtime directories") Signed-off-by: Joe Stringer <joe@ovn.org> --- rhel/openvswitch.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)