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/avahi/Makefile | 31 +++++++++++++++--------------- package/avahi/files/avahi-daemon.conffiles | 3 +++ package/avahi/files/avahi-daemon.init | 3 ++- package/avahi/files/avahi-daemon.postinst | 6 ++++++ package/avahi/ipkg/avahi-daemon.conffiles | 3 --- package/avahi/ipkg/avahi-daemon.control | 5 ----- package/avahi/ipkg/avahi-daemon.postinst | 6 ------ package/avahi/ipkg/avahi-dnsconfd.control | 5 ----- package/avahi/ipkg/libavahi.control | 4 ---- 9 files changed, 26 insertions(+), 40 deletions(-) create mode 100644 package/avahi/files/avahi-daemon.conffiles create mode 100644 package/avahi/files/avahi-daemon.postinst delete mode 100644 package/avahi/ipkg/avahi-daemon.conffiles delete mode 100644 package/avahi/ipkg/avahi-daemon.control delete mode 100644 package/avahi/ipkg/avahi-daemon.postinst delete mode 100644 package/avahi/ipkg/avahi-dnsconfd.control delete mode 100644 package/avahi/ipkg/libavahi.control (limited to 'package/avahi') diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 3397dc146..83834b872 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -6,22 +6,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi -PKG_VERSION:= 0.6.16 -PKG_RELEASE:= 6 -PKG_MD5SUM:= 3cbc460bbd55bae35f7b57443c063640 -MASTER_SITES:= http://avahi.org/download/ +PKG_VERSION:= 0.6.25 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e +PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon +PKG_SECTION:= net +PKG_DEPENDS:= libavahi libdaemon libexpat +PKG_URL:= http://avahi.org +PKG_SITES:= http://avahi.org/download/ +PKG_DEPENDS_1:= libavahi libdaemon avahi-daemon +PKG_DESCR_1:= Unicast DNS server from mDNS/DNS-SD configuration daemon +PKG_DESCR_2:= DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library +PKG_SECTION_2:= libs include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2})) -TCFLAGS+= -DNDEBUG CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= --disable-glib \ --disable-qt3 \ --disable-qt4 \ @@ -50,8 +54,6 @@ CONFIGURE_ARGS+= --disable-glib \ --with-avahi-group=avahi BUILD_STYLE= auto INSTALL_STYLE= auto -#XXX maybe unneeded? -#XAKE_FLAGS+= PKG_CONFIG_PATH=${STAGING_DIR}/usr/lib/pkgconfig post-install: # avahi daemon @@ -62,9 +64,6 @@ post-install: ${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service ${INSTALL_DATA} ./files/service-ssh \ ${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service - ${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/init.d - ${INSTALL_BIN} ./files/avahi-daemon.init \ - ${IDIR_AVAHI_DAEMON}/etc/init.d/avahi-daemon ${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin ${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/ # avahi dnsconfd diff --git a/package/avahi/files/avahi-daemon.conffiles b/package/avahi/files/avahi-daemon.conffiles new file mode 100644 index 000000000..46379ed96 --- /dev/null +++ b/package/avahi/files/avahi-daemon.conffiles @@ -0,0 +1,3 @@ +/etc/avahi/avahi-daemon.conf +/etc/avahi/services/http.service +/etc/avahi/services/ssh.service diff --git a/package/avahi/files/avahi-daemon.init b/package/avahi/files/avahi-daemon.init index 06d0863fc..79170b840 100644 --- a/package/avahi/files/avahi-daemon.init +++ b/package/avahi/files/avahi-daemon.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG avahi-daemon +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/avahi/files/avahi-daemon.postinst b/package/avahi/files/avahi-daemon.postinst new file mode 100644 index 000000000..0e3e13912 --- /dev/null +++ b/package/avahi/files/avahi-daemon.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group avahi $gid +add_user avahi $(get_next_uid) $gid /tmp +add_rcconf avahi avahi NO diff --git a/package/avahi/ipkg/avahi-daemon.conffiles b/package/avahi/ipkg/avahi-daemon.conffiles deleted file mode 100644 index 46379ed96..000000000 --- a/package/avahi/ipkg/avahi-daemon.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/avahi/avahi-daemon.conf -/etc/avahi/services/http.service -/etc/avahi/services/ssh.service diff --git a/package/avahi/ipkg/avahi-daemon.control b/package/avahi/ipkg/avahi-daemon.control deleted file mode 100644 index f68a690fe..000000000 --- a/package/avahi/ipkg/avahi-daemon.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: avahi-daemon -Priority: optional -Section: net -Depends: libavahi, libdaemon, libexpat -Description: an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon) diff --git a/package/avahi/ipkg/avahi-daemon.postinst b/package/avahi/ipkg/avahi-daemon.postinst deleted file mode 100644 index 0e3e13912..000000000 --- a/package/avahi/ipkg/avahi-daemon.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group avahi $gid -add_user avahi $(get_next_uid) $gid /tmp -add_rcconf avahi avahi NO diff --git a/package/avahi/ipkg/avahi-dnsconfd.control b/package/avahi/ipkg/avahi-dnsconfd.control deleted file mode 100644 index 1213a0e7b..000000000 --- a/package/avahi/ipkg/avahi-dnsconfd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: avahi-dnsconfd -Priority: optional -Section: net -Depends: libavahi, libdaemon, avahi-daemon -Description: an Unicast DNS server from mDNS/DNS-SD configuration daemon diff --git a/package/avahi/ipkg/libavahi.control b/package/avahi/ipkg/libavahi.control deleted file mode 100644 index 4912296bc..000000000 --- a/package/avahi/ipkg/libavahi.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libavahi -Priority: optional -Section: libs -Description: an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library) -- cgit v1.2.3