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/lighttpd/Makefile | 54 +++++++++++----------- package/lighttpd/files/lighttpd.conffiles | 1 + package/lighttpd/files/lighttpd.init | 4 +- package/lighttpd/files/lighttpd.postinst | 4 ++ .../lighttpd/ipkg/lighttpd-mod-accesslog.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-alias.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-auth.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-cgi.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-evasive.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-expire.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-fastcgi.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-proxy.control | 5 -- .../lighttpd/ipkg/lighttpd-mod-redirect.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-rewrite.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-setenv.control | 5 -- .../ipkg/lighttpd-mod-simple-vhost.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-ssi.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-status.control | 5 -- .../lighttpd/ipkg/lighttpd-mod-usertrack.control | 5 -- package/lighttpd/ipkg/lighttpd-mod-webdav.control | 5 -- package/lighttpd/ipkg/lighttpd.conffiles | 1 - package/lighttpd/ipkg/lighttpd.control | 5 -- package/lighttpd/ipkg/lighttpd.postinst | 4 -- 23 files changed, 34 insertions(+), 119 deletions(-) create mode 100644 package/lighttpd/files/lighttpd.conffiles create mode 100644 package/lighttpd/files/lighttpd.postinst delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-accesslog.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-alias.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-auth.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-cgi.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-evasive.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-expire.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-fastcgi.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-proxy.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-redirect.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-rewrite.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-setenv.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-simple-vhost.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-ssi.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-status.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-usertrack.control delete mode 100644 package/lighttpd/ipkg/lighttpd-mod-webdav.control delete mode 100644 package/lighttpd/ipkg/lighttpd.conffiles delete mode 100644 package/lighttpd/ipkg/lighttpd.control delete mode 100644 package/lighttpd/ipkg/lighttpd.postinst (limited to 'package/lighttpd') diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 3971cea45..467200e37 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,10 +9,18 @@ PKG_NAME:= lighttpd PKG_VERSION:= 1.4.22 PKG_RELEASE:= 1 PKG_MD5SUM:= 949c33a81e83f7718a47280bef21b90c -MASTER_SITES:= http://www.lighttpd.net/download/ +PKG_DESCR:= a flexible and lightweight web server +PKG_SECTION:= net +PKG_DEPENDS:= libxml2 libsqlite libpcre +PKG_URL:= http://www.lighttpd.net +PKG_SITES:= http://www.lighttpd.net/download/ include $(TOPDIR)/mk/package.mk +ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) +PKG_DEPENDS+= libopenssl +endif + define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install @@ -23,23 +31,23 @@ ${2}-install: endef -$(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_ACCESSLOG,lighttpd-mod-accesslog,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_ACCESSLOG,lighttpd-mod-accesslog,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ACCESSLOG,accesslog)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias)) @@ -84,21 +92,11 @@ endif post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} install -m0755 -d $(IDIR_LIGHTTPD)/etc install -m0644 ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/ - install -m0755 -d $(IDIR_LIGHTTPD)/etc/init.d - install -m0644 ./files/lighttpd.init \ - $(IDIR_LIGHTTPD)/etc/init.d/lighttpd install -m0755 -d $(IDIR_LIGHTTPD)/usr/lib/lighttpd for m in dirlisting indexfile staticfile; do \ $(CP) $(WRKINST)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ done install -m0755 -d $(IDIR_LIGHTTPD)/usr/sbin $(CP) $(WRKINST)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/ -ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) - echo 'Depends: libxml2, libsqlite, libpcre, openssl' \ - >>${IDIR_LIGHTTPD}/CONTROL/control -else - echo 'Depends: libxml2, libsqlite, libpcre' \ - >>${IDIR_LIGHTTPD}/CONTROL/control -endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lighttpd/files/lighttpd.conffiles b/package/lighttpd/files/lighttpd.conffiles new file mode 100644 index 000000000..e90f8e19d --- /dev/null +++ b/package/lighttpd/files/lighttpd.conffiles @@ -0,0 +1 @@ +/etc/lighttpd.conf diff --git a/package/lighttpd/files/lighttpd.init b/package/lighttpd/files/lighttpd.init index f8edbe10a..cdfd3183d 100644 --- a/package/lighttpd/files/lighttpd.init +++ b/package/lighttpd/files/lighttpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG lighttpd +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/lighttpd/files/lighttpd.postinst b/package/lighttpd/files/lighttpd.postinst new file mode 100644 index 000000000..dbf355c4b --- /dev/null +++ b/package/lighttpd/files/lighttpd.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf lighttpd lighttpd NO +add_rcconf lighttpd_flags lighttpd_flags "-f /etc/lighttpd.conf" diff --git a/package/lighttpd/ipkg/lighttpd-mod-accesslog.control b/package/lighttpd/ipkg/lighttpd-mod-accesslog.control deleted file mode 100644 index 640122652..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-accesslog.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-accesslog -Priority: optional -Section: net -Description: an access logging module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-alias.control b/package/lighttpd/ipkg/lighttpd-mod-alias.control deleted file mode 100644 index c1e12e373..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-alias.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-alias -Priority: optional -Section: net -Description: a directory alias module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-auth.control b/package/lighttpd/ipkg/lighttpd-mod-auth.control deleted file mode 100644 index 179501fbf..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-auth -Priority: optional -Section: net -Description: an authentication module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-cgi.control b/package/lighttpd/ipkg/lighttpd-mod-cgi.control deleted file mode 100644 index 18c574a9b..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-cgi.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-cgi -Priority: optional -Section: net -Description: a CGI module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-evasive.control b/package/lighttpd/ipkg/lighttpd-mod-evasive.control deleted file mode 100644 index dd00165ea..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-evasive.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-evasive -Priority: optional -Section: net -Description: Evasive module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-expire.control b/package/lighttpd/ipkg/lighttpd-mod-expire.control deleted file mode 100644 index 8d5c5546c..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-expire.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-expire -Priority: optional -Section: net -Description: Expire module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-fastcgi.control b/package/lighttpd/ipkg/lighttpd-mod-fastcgi.control deleted file mode 100644 index 123e9b636..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-fastcgi.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-fastcgi -Priority: optional -Section: net -Description: FASTCGI module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-proxy.control b/package/lighttpd/ipkg/lighttpd-mod-proxy.control deleted file mode 100644 index 5578d1a53..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-proxy.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-proxy -Priority: optional -Section: net -Description: a proxy module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-redirect.control b/package/lighttpd/ipkg/lighttpd-mod-redirect.control deleted file mode 100644 index 80f3a574c..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-redirect.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-redirect -Priority: optional -Section: net -Description: an url redirection module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-rewrite.control b/package/lighttpd/ipkg/lighttpd-mod-rewrite.control deleted file mode 100644 index 19c5b1a76..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-rewrite.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-rewrite -Priority: optional -Section: net -Description: an url rewriting module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-setenv.control b/package/lighttpd/ipkg/lighttpd-mod-setenv.control deleted file mode 100644 index 0506b7a4c..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-setenv.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-setenv -Priority: optional -Section: net -Description: an environment variable setting module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-simple-vhost.control b/package/lighttpd/ipkg/lighttpd-mod-simple-vhost.control deleted file mode 100644 index 58550e124..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-simple-vhost.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-simple-vhost -Priority: optional -Section: net -Description: a simple virtual hosting module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-ssi.control b/package/lighttpd/ipkg/lighttpd-mod-ssi.control deleted file mode 100644 index 266d4ea68..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-ssi.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-ssi -Priority: optional -Section: net -Description: SSI module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-status.control b/package/lighttpd/ipkg/lighttpd-mod-status.control deleted file mode 100644 index 081d21c4e..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-status.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-status -Priority: optional -Section: net -Description: a server status display module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-usertrack.control b/package/lighttpd/ipkg/lighttpd-mod-usertrack.control deleted file mode 100644 index 32a0e79a0..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-usertrack.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-usertrack -Priority: optional -Section: net -Description: an user tracking module for lighttpd -Depends: lighttpd diff --git a/package/lighttpd/ipkg/lighttpd-mod-webdav.control b/package/lighttpd/ipkg/lighttpd-mod-webdav.control deleted file mode 100644 index ebc52b58f..000000000 --- a/package/lighttpd/ipkg/lighttpd-mod-webdav.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd-mod-webdav -Priority: optional -Section: net -Depends: lighttpd, libxml2, libsqlite -Description: a webdav module for lighttpd diff --git a/package/lighttpd/ipkg/lighttpd.conffiles b/package/lighttpd/ipkg/lighttpd.conffiles deleted file mode 100644 index e90f8e19d..000000000 --- a/package/lighttpd/ipkg/lighttpd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/lighttpd.conf diff --git a/package/lighttpd/ipkg/lighttpd.control b/package/lighttpd/ipkg/lighttpd.control deleted file mode 100644 index 788aa07e1..000000000 --- a/package/lighttpd/ipkg/lighttpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lighttpd -Priority: optional -Section: net -Description: a flexible and lightweight web server, - built with SSL support. diff --git a/package/lighttpd/ipkg/lighttpd.postinst b/package/lighttpd/ipkg/lighttpd.postinst deleted file mode 100644 index dbf355c4b..000000000 --- a/package/lighttpd/ipkg/lighttpd.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf lighttpd lighttpd NO -add_rcconf lighttpd_flags lighttpd_flags "-f /etc/lighttpd.conf" -- cgit v1.2.3