From b898847395231c7b4aebf9cf1738439576f8e204 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 6 Mar 2022 12:28:21 +0100 Subject: [PATCH] chrony: add conflict between without NTS and NTS variant Both packages provide the same files: /usr/bin/chronyc /usr/sbin/chronyd /etc/chrony/chrony.conf /etc/hotplug.d/iface/20-chrony /etc/init.d/chronyd They should not be installed side by side. Signed-off-by: Josef Schlehofer --- net/chrony/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/chrony/Makefile b/net/chrony/Makefile index fc4f052f16..a011b2e068 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chrony PKG_VERSION:=4.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://download.tuxfamily.org/chrony/ @@ -39,6 +39,7 @@ define Package/chrony $(call Package/chrony/Default) TITLE+= (without NTS) VARIANT:=normal + CONFLICTS:=chrony-nts endef define Package/chrony-nts -- 2.30.2