From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/openntpd/Makefile | 10 +++++----- package/openntpd/files/ntpd.init | 4 +++- package/openntpd/files/openntpd.conffiles | 1 + package/openntpd/files/openntpd.postinst | 7 +++++++ package/openntpd/ipkg/openntpd.conffiles | 1 - package/openntpd/ipkg/openntpd.control | 7 ------- package/openntpd/ipkg/openntpd.postinst | 7 ------- 7 files changed, 16 insertions(+), 21 deletions(-) create mode 100644 package/openntpd/files/openntpd.conffiles create mode 100644 package/openntpd/files/openntpd.postinst delete mode 100644 package/openntpd/ipkg/openntpd.conffiles delete mode 100644 package/openntpd/ipkg/openntpd.control delete mode 100644 package/openntpd/ipkg/openntpd.postinst (limited to 'package/openntpd') diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile index 75ad3c2c0..96c425866 100644 --- a/package/openntpd/Makefile +++ b/package/openntpd/Makefile @@ -9,15 +9,17 @@ PKG_NAME:= openntpd PKG_VERSION:= 3.9p1 PKG_RELEASE:= 17 PKG_MD5SUM:= afc34175f38d08867c1403d9008600b3 - -MASTER_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ +PKG_DESCR:= NTP server daemon +PKG_SECTION:= net +PKG_URL:= http://www.openntpd.org +PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenNTPD/ \ ftp://ftp.fr.openbsd.org/pub/OpenBSD/OpenNTPD/ \ ftp://ftp.sunet.se/pub/OpenBSD/OpenNTPD/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENNTPD,openntpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENNTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-privsep-user=ntp \ @@ -27,8 +29,6 @@ BUILD_STYLE:= auto do-install: ${INSTALL_DIR} ${IDIR_OPENNTPD}/etc ${INSTALL_DATA} ./files/ntpd.conf ${IDIR_OPENNTPD}/etc/ - ${INSTALL_DIR} ${IDIR_OPENNTPD}/etc/init.d - ${INSTALL_DATA} ./files/ntpd.init ${IDIR_OPENNTPD}/etc/init.d/ntpd ${INSTALL_DIR} ${IDIR_OPENNTPD}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/ntpd ${IDIR_OPENNTPD}/usr/sbin/ diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init index 2eab0668c..42e068860 100644 --- a/package/openntpd/files/ntpd.init +++ b/package/openntpd/files/ntpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 55 +#PKG openntpd +#INIT 55 + . /etc/rc.conf case $1 in diff --git a/package/openntpd/files/openntpd.conffiles b/package/openntpd/files/openntpd.conffiles new file mode 100644 index 000000000..81306c3c9 --- /dev/null +++ b/package/openntpd/files/openntpd.conffiles @@ -0,0 +1 @@ +/etc/ntpd.conf diff --git a/package/openntpd/files/openntpd.postinst b/package/openntpd/files/openntpd.postinst new file mode 100644 index 000000000..53bc8c387 --- /dev/null +++ b/package/openntpd/files/openntpd.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group ntp $gid +add_user ntp $(get_next_uid) $gid /tmp/.ntp +add_service ntp 123/udp +add_rcconf 'e.g. "-s"' ntpd_flags diff --git a/package/openntpd/ipkg/openntpd.conffiles b/package/openntpd/ipkg/openntpd.conffiles deleted file mode 100644 index 81306c3c9..000000000 --- a/package/openntpd/ipkg/openntpd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/ntpd.conf diff --git a/package/openntpd/ipkg/openntpd.control b/package/openntpd/ipkg/openntpd.control deleted file mode 100644 index 05e16a888..000000000 --- a/package/openntpd/ipkg/openntpd.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: openntpd -Priority: optional -Section: net -Description: OpenNTPD is a FREE, easy to use implementation of NTP - (the Network Time Protocol). It provides the ability to sync the - local clock to remote NTP servers and can act as NTP server itself, - redistributing the local clock. diff --git a/package/openntpd/ipkg/openntpd.postinst b/package/openntpd/ipkg/openntpd.postinst deleted file mode 100644 index 53bc8c387..000000000 --- a/package/openntpd/ipkg/openntpd.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group ntp $gid -add_user ntp $(get_next_uid) $gid /tmp/.ntp -add_service ntp 123/udp -add_rcconf 'e.g. "-s"' ntpd_flags -- cgit v1.2.3