From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 27 Oct 2011 10:19:14 +0000 (+0000)
Subject: [packages] openntpd: remove/restore busybox ntpd on install/remove, relocate to ... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d579b7850ef491655bb7a93e5696d59d0058d44f;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] openntpd: remove/restore busybox ntpd on install/remove, relocate to /sbin to prevent clash with busybox


SVN-Revision: 28620
---

diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 980d631f9e..d6c139cc95 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openntpd
 PKG_VERSION:=3.9p1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
@@ -50,8 +50,8 @@ define Build/Compile
 endef
 
 define Package/openntpd/install	
-	$(INSTALL_DIR) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpd $(1)/sbin/
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) ./files/ntpd.conf $(1)/etc/
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -60,4 +60,16 @@ define Package/openntpd/install
 	$(INSTALL_BIN) ./files/ntpd.hotplug $(1)/etc/hotplug.d/iface/20-ntpd
 endef
 
+define Package/openntpd/postinst
+#!/bin/sh
+[ -L "$${IPKG_INSTROOT}/usr/sbin/ntpd" ] && rm -f "$${IPKG_INSTROOT}/usr/sbin/ntpd"
+exit 0
+endef
+
+define Package/openntpd/postrm
+#!/bin/sh
+/bin/busybox ntpd -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/sbin/ntpd
+exit 0
+endef
+
 $(eval $(call BuildPackage,openntpd))