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/ppp/Makefile | 22 +++++++++++++--------- package/ppp/files/ppp-mod-radius.conffiles | 10 ++++++++++ package/ppp/files/ppp.conffiles | 2 ++ package/ppp/ipkg/ppp-mod-chat.control | 5 ----- package/ppp/ipkg/ppp-mod-pppdump.control | 5 ----- package/ppp/ipkg/ppp-mod-pppoa.control | 5 ----- package/ppp/ipkg/ppp-mod-pppoe.control | 5 ----- package/ppp/ipkg/ppp-mod-pppstats.control | 5 ----- package/ppp/ipkg/ppp-mod-pppumts.control | 5 ----- package/ppp/ipkg/ppp-mod-radius.conffiles | 10 ---------- package/ppp/ipkg/ppp-mod-radius.control | 5 ----- package/ppp/ipkg/ppp.conffiles | 2 -- package/ppp/ipkg/ppp.control | 5 ----- 13 files changed, 25 insertions(+), 61 deletions(-) create mode 100644 package/ppp/files/ppp-mod-radius.conffiles create mode 100644 package/ppp/files/ppp.conffiles delete mode 100644 package/ppp/ipkg/ppp-mod-chat.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppdump.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppoa.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppoe.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppstats.control delete mode 100644 package/ppp/ipkg/ppp-mod-pppumts.control delete mode 100644 package/ppp/ipkg/ppp-mod-radius.conffiles delete mode 100644 package/ppp/ipkg/ppp-mod-radius.control delete mode 100644 package/ppp/ipkg/ppp.conffiles delete mode 100644 package/ppp/ipkg/ppp.control (limited to 'package/ppp') diff --git a/package/ppp/Makefile b/package/ppp/Makefile index adf408a45..e24dcdd2c 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -9,18 +9,22 @@ PKG_NAME:= ppp PKG_VERSION:= 2.4.4 PKG_RELEASE:= 16 PKG_MD5SUM:= 183800762e266132218b204dfb428d29 -MASTER_SITES:= ftp://ftp.samba.org/pub/ppp/ +PKG_DESCR:= a PPP (Point-to-Point Protocol) software (with MPPE/MPPC support) +PKG_SECTION:= net +PKG_DEPENDS:= kmod-ppp +PKG_URL:= http://ppp.samba.org +PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,PPP,ppp,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,PPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_IPV6),y) IPV6+=HAVE_INET6="1" diff --git a/package/ppp/files/ppp-mod-radius.conffiles b/package/ppp/files/ppp-mod-radius.conffiles new file mode 100644 index 000000000..2cfa4a146 --- /dev/null +++ b/package/ppp/files/ppp-mod-radius.conffiles @@ -0,0 +1,10 @@ +/etc/radiusclient/dictionary +/etc/radiusclient/dictionary.ascend +/etc/radiusclient/dictionary.compat +/etc/radiusclient/dictionary.merit +/etc/radiusclient/dictionary.microsoft +/etc/radiusclient/issue +/etc/radiusclient/port-id-map +/etc/radiusclient/radiusclient.conf +/etc/radiusclient/realms +/etc/radiusclient/servers diff --git a/package/ppp/files/ppp.conffiles b/package/ppp/files/ppp.conffiles new file mode 100644 index 000000000..8ad17eb43 --- /dev/null +++ b/package/ppp/files/ppp.conffiles @@ -0,0 +1,2 @@ +/etc/ppp/chap-secrets +/etc/ppp/options diff --git a/package/ppp/ipkg/ppp-mod-chat.control b/package/ppp/ipkg/ppp-mod-chat.control deleted file mode 100644 index 43dbdb1e1..000000000 --- a/package/ppp/ipkg/ppp-mod-chat.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: chat -Priority: optional -Section: net -Description: Utility for establishing a connection with the ISP's PPP server (e.g. via Modem) -Depends: ppp diff --git a/package/ppp/ipkg/ppp-mod-pppdump.control b/package/ppp/ipkg/ppp-mod-pppdump.control deleted file mode 100644 index 4a89e152e..000000000 --- a/package/ppp/ipkg/ppp-mod-pppdump.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pppdump -Priority: optional -Section: net -Description: an utility to read PPP record file -Depends: ppp diff --git a/package/ppp/ipkg/ppp-mod-pppoa.control b/package/ppp/ipkg/ppp-mod-pppoa.control deleted file mode 100644 index ce2d5d45f..000000000 --- a/package/ppp/ipkg/ppp-mod-pppoa.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ppp-mod-pppoa -Priority: optional -Section: net -Description: a PPPoA (PPP over ATM) plugin for PPP -Depends: ppp, kmod-pppoa diff --git a/package/ppp/ipkg/ppp-mod-pppoe.control b/package/ppp/ipkg/ppp-mod-pppoe.control deleted file mode 100644 index 7cf49636b..000000000 --- a/package/ppp/ipkg/ppp-mod-pppoe.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ppp-mod-pppoe -Priority: optional -Section: net -Description: a PPPoE (PPP over Ethernet) plugin for PPP -Depends: ppp, kmod-pppoe diff --git a/package/ppp/ipkg/ppp-mod-pppstats.control b/package/ppp/ipkg/ppp-mod-pppstats.control deleted file mode 100644 index 8780b2f87..000000000 --- a/package/ppp/ipkg/ppp-mod-pppstats.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pppstats -Priority: optional -Section: net -Description: an utility to report PPP statistics -Depends: ppp diff --git a/package/ppp/ipkg/ppp-mod-pppumts.control b/package/ppp/ipkg/ppp-mod-pppumts.control deleted file mode 100644 index 178ae2413..000000000 --- a/package/ppp/ipkg/ppp-mod-pppumts.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pppumts -Priority: optional -Section: net -Depends: comgt, chat -Description: Scripts and default configuration files to establish GPRS/UMTS connections diff --git a/package/ppp/ipkg/ppp-mod-radius.conffiles b/package/ppp/ipkg/ppp-mod-radius.conffiles deleted file mode 100644 index 2cfa4a146..000000000 --- a/package/ppp/ipkg/ppp-mod-radius.conffiles +++ /dev/null @@ -1,10 +0,0 @@ -/etc/radiusclient/dictionary -/etc/radiusclient/dictionary.ascend -/etc/radiusclient/dictionary.compat -/etc/radiusclient/dictionary.merit -/etc/radiusclient/dictionary.microsoft -/etc/radiusclient/issue -/etc/radiusclient/port-id-map -/etc/radiusclient/radiusclient.conf -/etc/radiusclient/realms -/etc/radiusclient/servers diff --git a/package/ppp/ipkg/ppp-mod-radius.control b/package/ppp/ipkg/ppp-mod-radius.control deleted file mode 100644 index 0a858da30..000000000 --- a/package/ppp/ipkg/ppp-mod-radius.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ppp-mod-radius -Priority: optional -Section: net -Description: a RADIUS plugin for PPP -Depends: ppp diff --git a/package/ppp/ipkg/ppp.conffiles b/package/ppp/ipkg/ppp.conffiles deleted file mode 100644 index 8ad17eb43..000000000 --- a/package/ppp/ipkg/ppp.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/ppp/chap-secrets -/etc/ppp/options diff --git a/package/ppp/ipkg/ppp.control b/package/ppp/ipkg/ppp.control deleted file mode 100644 index 2ebff521c..000000000 --- a/package/ppp/ipkg/ppp.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ppp -Priority: optional -Section: net -Depends: kmod-ppp -Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support) -- cgit v1.2.3