ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-29 13:34:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux build fixes... may need to be reverted for new Drone CI but needed for old environment

Browse Source
This commit is contained in:
Adam Ierymenko 2022-06-27 17:13:52 -04:00
parent 7ed5bde426
commit 02270e0e3d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make-linux.mk
View File

@ -344,7 +344,7 @@ all: one
.PHONY: one .PHONY: one
one: zerotier-one zerotier-idtool zerotier-cli one: zerotier-one zerotier-idtool zerotier-cli
from_builder: from_builder: FORCE
ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-idtool
ln -sf zerotier-one zerotier-cli ln -sf zerotier-one zerotier-cli

24
zerotier-one.spec
View File

@ -72,36 +72,36 @@ like conventional VPNs or VLANs. It can run on native systems, VMs, or
containers (Docker, OpenVZ, etc.). containers (Docker, OpenVZ, etc.).
%prep %prep
ls -la %if "%{?dist}" != ".el6"
%if 0%{?rhel} && 0%{?rhel} >= 7
rm -rf BUILD BUILDROOT RPMS SRPMS SOURCES rm -rf BUILD BUILDROOT RPMS SRPMS SOURCES
mkdir -p SOURCES
ln -s %{getenv:PWD} %{name}-%{version} ln -s %{getenv:PWD} %{name}-%{version}
mkdir -p SOURCES
tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/* tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/*
rm -f %{name}-%{version} rm -f %{name}-%{version}
cp -a %{getenv:PWD}/* . cp -a %{getenv:PWD}/* .
%endif %endif
%build %build
%if "%{?dist}" == ".el6" %if "%{?dist}" != ".el6"
make RUST_BACKTRACE=full ZT_USE_MINIUPNPC=1 %{?_smp_mflags} from_builder make ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
%else
make RUST_BACKTRACE=full ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
%endif %endif
%pre %pre
/usr/bin/getent passwd zerotier-one || /usr/sbin/useradd -r -d /var/lib/zerotier-one -s /sbin/nologin zerotier-one /usr/bin/getent passwd zerotier-one || /usr/sbin/useradd -r -d /var/lib/zerotier-one -s /sbin/nologin zerotier-one
%install %install
# rm -rf $RPM_BUILD_ROOT %if "%{?dist}" != ".el6"
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_unitdir}
cp %{getenv:PWD}/debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service cp %{getenv:PWD}/debian/zerotier-one.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
%else
%if 0%{?rhel} && 0%{?rhel} <= 6 rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/init.d/ pushd %{getenv:PWD}
make install DESTDIR=$RPM_BUILD_ROOT
popd
mkdir -p $RPM_BUILD_ROOT/etc/init.d
cp %{getenv:PWD}/ext/installfiles/linux/zerotier-one.init.rhel6 $RPM_BUILD_ROOT/etc/init.d/zerotier-one cp %{getenv:PWD}/ext/installfiles/linux/zerotier-one.init.rhel6 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
chmod 700 $RPM_BUILD_ROOT/etc/init.d/${name} chmod 0755 $RPM_BUILD_ROOT/etc/init.d/zerotier-one
%endif %endif
%files %files