From 79f4b22f3e312ac6e350eb87bdbc4916eb0a2b14 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Tue, 23 Jul 2019 17:31:47 +1000 Subject: [PATCH] Add back CentOS 6 install & uninstall to Makefile (#601) * Re-implement PR #353 which somehow got lost along the way * Update CentOS 6 build instructions --- Makefile.in | 12 +++++++++++- docs/INSTALL.md | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 95cc877d..9f061dda 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,7 @@ DOCFILES = README.md config LICENSE CHANGELOG.md docs/Docker.md docs/INSTALL.md ifneq ("$(wildcard /etc/redhat-release)","") RHEL = $(shell cat /etc/redhat-release | grep -E "(Red Hat Enterprise Linux Server|CentOS)" | wc -l) -RHEL_VERSION = $(shell rpm --eval "%{centos_ver}") +RHEL_VERSION = $(shell rpm --eval "%{rhel}") else RHEL = 0 RHEL_VERSION = 0 @@ -113,6 +113,11 @@ ifeq ($(RHEL),1) else $(INSTALL) -m 0644 $(system_unit_files) $(DESTDIR)$(systemdsystemunitdir) $(INSTALL) -m 0644 $(user_unit_files) $(DESTDIR)$(systemduserunitdir) +endif +else +ifeq ($(RHEL_VERSION),6) + install -D contrib/init.d/onedrive.init $(DESTDIR)/etc/init.d/onedrive + install -D contrib/init.d/onedrive_service.sh $(DESTDIR)$(bindir)/onedrive_service.sh endif endif ifeq ($(COMPLETIONS),yes) @@ -132,6 +137,11 @@ else rm -f $(DESTDIR)$(systemdsystemunitdir)/onedrive*.service rm -f $(DESTDIR)$(systemduserunitdir)/onedrive*.service endif +else +ifeq ($(RHEL_VERSION),6) + rm -f $(DESTDIR)/etc/init.d/onedrive + rm -f $(DESTDIR)$(bindir)/onedrive_service.sh +endif endif for i in $(DOCFILES) ; do rm -f $(DESTDIR)$(docdir)/$$i ; done ifeq ($(COMPLETIONS),yes) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 6bda98c4..69f2bd54 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -78,11 +78,11 @@ sudo yum install libnotify-devel In addition to the above requirements, the `sqlite` version used on CentOS 6.x / RHEL 6.x needs to be upgraded. Use the following instructions to update your version of `sqlite` so that it can support the client: ```text sudo yum -y update -sudo yum -y install epel-release, wget +sudo yum -y install epel-release wget sudo yum -y install mock wget https://kojipkgs.fedoraproject.org//packages/sqlite/3.7.15.2/2.fc19/src/sqlite-3.7.15.2-2.fc19.src.rpm -sudo mock --rebuild sqlite-3.7.15.2-2.fc19.src.rpm -sudo yum -y upgrade /var/lib/mock/epel-6-{arch}/result/sqlite-* +mock --rebuild sqlite-3.7.15.2-2.fc19.src.rpm +sudo yum -y upgrade /var/lib/mock/epel-6-`arch`/result/sqlite-* ``` ### Dependencies: Fedora > Version 18