chrony: add conflict between without NTS and NTS variant 18001/head
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Sun, 6 Mar 2022 11:28:21 +0000 (12:28 +0100)
committerJosef Schlehofer <pepe.schlehofer@gmail.com>
Sun, 6 Mar 2022 11:28:21 +0000 (12:28 +0100)
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 <pepe.schlehofer@gmail.com>
net/chrony/Makefile

index fc4f052f1641d1129c28d0520f9188046034daf6..a011b2e068cec864c1028c055d49b0b3717f1c32 100644 (file)
@@ -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