From 144d3e437623f2ee86d445669558612870e5dbc6 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Jan 23 2017 18:45:18 +0000 Subject: fix cni paths for non-x86_64 arches --- diff --git a/origin.spec b/origin.spec index a3c113b..6a4e3ee 100644 --- a/origin.spec +++ b/origin.spec @@ -1619,9 +1619,9 @@ install -p -m 755 _output/local/bin/${PLATFORM}/extended.test %{buildroot}%{_lib %if 0%{?make_redistributable} # Install client executable for windows and mac install -d %{buildroot}%{_datadir}/%{name}/{linux,macosx,windows} -install -p -m 755 _output/local/bin/linux/amd64/oc %{buildroot}%{_datadir}/%{name}/linux/oc -install -p -m 755 _output/local/bin/darwin/amd64/oc %{buildroot}/%{_datadir}/%{name}/macosx/oc -install -p -m 755 _output/local/bin/windows/amd64/oc.exe %{buildroot}/%{_datadir}/%{name}/windows/oc.exe +install -p -m 755 _output/local/bin/linux/*/oc %{buildroot}%{_datadir}/%{name}/linux/oc +install -p -m 755 _output/local/bin/darwin/*/oc %{buildroot}/%{_datadir}/%{name}/macosx/oc +install -p -m 755 _output/local/bin/windows/*/oc.exe %{buildroot}/%{_datadir}/%{name}/windows/oc.exe %endif # Install pod @@ -1691,9 +1691,9 @@ pushd pkg/sdn/plugin/bin install -p -m 0755 openshift-sdn-ovs %{buildroot}%{_bindir}/openshift-sdn-ovs popd install -d -m 0755 %{buildroot}/opt/cni/bin -install -p -m 0755 _output/local/bin/linux/amd64/sdn-cni-plugin %{buildroot}/opt/cni/bin/openshift-sdn -install -p -m 0755 _output/local/bin/linux/amd64/host-local %{buildroot}/opt/cni/bin -install -p -m 0755 _output/local/bin/linux/amd64/loopback %{buildroot}/opt/cni/bin +install -p -m 0755 _output/local/bin/linux/*/sdn-cni-plugin %{buildroot}/opt/cni/bin/openshift-sdn +install -p -m 0755 _output/local/bin/linux/*/host-local %{buildroot}/opt/cni/bin +install -p -m 0755 _output/local/bin/linux/*/loopback %{buildroot}/opt/cni/bin install -d -m 0755 %{buildroot}%{_unitdir}/%{name}-node.service.d install -p -m 0644 contrib/systemd/openshift-sdn-ovs.conf %{buildroot}%{_unitdir}/%{name}-node.service.d/openshift-sdn-ovs.conf