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/nfs-utils/Makefile | 28 ++++++++++++++++++---------- package/nfs-utils/files/nfs-utils.postinst | 9 +++++++++ package/nfs-utils/files/nfsd.init | 4 +++- package/nfs-utils/ipkg/nfs-utils.control | 4 ---- package/nfs-utils/ipkg/nfs-utils.postinst | 9 --------- 5 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 package/nfs-utils/files/nfs-utils.postinst delete mode 100644 package/nfs-utils/ipkg/nfs-utils.control delete mode 100644 package/nfs-utils/ipkg/nfs-utils.postinst (limited to 'package/nfs-utils') diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 6d4c901b4..bb7244a7e 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -9,21 +9,35 @@ PKG_NAME:= nfs-utils PKG_VERSION:= 1.1.6 PKG_RELEASE:= 1 PKG_MD5SUM:= b0d1b8ec5c8c081a340cfc77bb8670cd -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} +PKG_DESCR:= Utilities for NFS kernel server implementation +PKG_DEPENDS:= portmap +PKG_URL:= http://sourceforge.net/projects/nfs +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y) +PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue +endif + +ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y) +PKG_DEPENDS+= heimdal-libs libevent libnfsidmap librpcsecgss libcom_err +endif + +ifeq (${ADK_IPV6},y) +PKG_DEPENDS+= libtirpc +endif + +$(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKG_DEPENDS:= portmap, CONFIGURE_STYLE= autotool gnu ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y) CONFIGURE_ARGS+= --enable-nfsv4 \ --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \ --enable-gss -PKG_DEPENDS+= krb5-libs, libevent, libnfsidmap, librpcsecgss, libcom_err, libgssglue CONFIGURE_ENV+= LIBS="-lrpcsecgss" endif @@ -31,7 +45,6 @@ ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y) CONFIGURE_ARGS+= --enable-nfsv4 \ --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \ --enable-gss -PKG_DEPENDS+= heimdal-libs, libevent, libnfsidmap, librpcsecgss, libcom_err CONFIGURE_ENV+= LIBS="-lrpcsecgss" endif @@ -48,7 +61,6 @@ INSTALL_STYLE= auto TCPPFLAGS+= -I${LINUX_DIR}/include ifeq (${ADK_IPV6},y) -PKG_DEPENDS+= , libtirpc CONFIGURE_ARGS+= --enable-tirpc \ --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc endif @@ -58,10 +70,7 @@ post-install: ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc/init.d ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin - ${INSTALL_BIN} ./files/nfsd.init \ - ${IDIR_NFS_UTILS}/etc/init.d/nfs-server ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/ @@ -72,6 +81,5 @@ ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y) ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd ${IDIR_NFS_UTILS}/usr/sbin/ endif - echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_NFS_UTILS}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst new file mode 100644 index 000000000..bfb7481d0 --- /dev/null +++ b/package/nfs-utils/files/nfs-utils.postinst @@ -0,0 +1,9 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf "kernel nfs server" nfs_server NO +add_rcconf "kernel nfs server version" nfs_server_version 3 +add_service nfs 2049/tdp +add_service nfs 2049/udp +gid=$(get_next_gid) +add_group nfs $gid +add_user nfs $(get_next_uid) $gid /var/lib/nfs diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init index 8ce40e633..af8a4b94a 100644 --- a/package/nfs-utils/files/nfsd.init +++ b/package/nfs-utils/files/nfsd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 70 +#PKG nfs-utils +#INIT 70 + . /etc/rc.conf case $1 in diff --git a/package/nfs-utils/ipkg/nfs-utils.control b/package/nfs-utils/ipkg/nfs-utils.control deleted file mode 100644 index f8c3f1f31..000000000 --- a/package/nfs-utils/ipkg/nfs-utils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: nfs-utils -Section: net -Priority: optional -Description: Utilities for NFS kernel server diff --git a/package/nfs-utils/ipkg/nfs-utils.postinst b/package/nfs-utils/ipkg/nfs-utils.postinst deleted file mode 100644 index bfb7481d0..000000000 --- a/package/nfs-utils/ipkg/nfs-utils.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf "kernel nfs server" nfs_server NO -add_rcconf "kernel nfs server version" nfs_server_version 3 -add_service nfs 2049/tdp -add_service nfs 2049/udp -gid=$(get_next_gid) -add_group nfs $gid -add_user nfs $(get_next_uid) $gid /var/lib/nfs -- cgit v1.2.3