X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3f5c61219e3ea85f757cf1b8896a4ecd88507248..c3e19568059a4f8c36eeb962f60c2375ed351399:/openwrt/package/ppp/Makefile

diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile
index b246a3db3..e1c3907ce 100644
--- a/openwrt/package/ppp/Makefile
+++ b/openwrt/package/ppp/Makefile
@@ -1,147 +1,125 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := ppp
-PKG_VERSION := 2.4.3
-PKG_RELEASE := 3
-
-PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-
-PKG_PPP := $(PACKAGE_DIR)/ppp_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_PPP_PPPOE_PLUGIN := $(PACKAGE_DIR)/ppp-pppoe-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_PPP_RADIUS_PLUGIN := $(PACKAGE_DIR)/ppp-radius-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_PPPSTATS := $(PACKAGE_DIR)/pppstats_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_PPPDUMP := $(PACKAGE_DIR)/pppdump_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-I_PPP := $(PKG_BUILD_DIR)/ipkg/ppp
-I_PPP_PPPOE_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-pppoe-plugin
-I_PPP_RADIUS_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-radius-plugin
-I_PPPDUMP := $(PKG_BUILD_DIR)/ipkg/pppdump
-I_PPPSTATS := $(PKG_BUILD_DIR)/ipkg/pppstats
-
-TARGETS := $(PKG_PPP)
-ifneq ($(BR2_PACKAGE_PPP_PPPOE),)
-TARGETS += $(PKG_PPP_PPPOE_PLUGIN)
-endif
-ifneq ($(BR2_PACKAGE_PPP_RADIUS),)
-TARGETS += $(PKG_PPP_RADIUS_PLUGIN)
-endif
-ifneq ($(BR2_PACKAGE_PPPDUMP),)
-TARGETS += $(PKG_PPPDUMP)
-endif
-ifneq ($(BR2_PACKAGE_PPPSTATS),)
-TARGETS += $(PKG_PPPSTATS)
-endif
-
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
-
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch
-	touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
-	(cd $(PKG_BUILD_DIR); \
-	rm -f config.cache; \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	./configure \
-	 --target=$(GNU_TARGET_NAME) \
-	 --host=$(GNU_TARGET_NAME) \
-	 --build=$(GNU_HOST_NAME) \
-	 --prefix=/usr \
-	 --exec-prefix=/usr \
-	 --bindir=/usr/bin \
-	 --datadir=/usr/share \
-	 --infodir=/usr/share/info \
-	 --libexecdir=/usr/lib \
-	 --localstatedir=/var \
-	 --mandir=/usr/share/man \
-	 --sbindir=/usr/sbin \
-	 --sysconfdir=/etc \
-	 $(DISABLE_NLS))
-	touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/pppd/pppd $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so: $(PKG_BUILD_DIR)/.configured
+PKG_NAME:=ppp
+PKG_VERSION:=2.4.3
+PKG_RELEASE:=4
+PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
+
+PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+define PKG_mod_template
+
+$$(IPKG_$(1)):
+	install -d -m0755 $$(IDIR_$(1))/usr/lib/pppd/$(PKG_VERSION)
+	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/$(2).so \
+		$$(IDIR_$(1))/usr/lib/pppd/$(PKG_VERSION)/
+	$(RSTRIP) $$(IDIR_$(1))
+	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+
+endef
+
+$(eval $(call PKG_template,PPP,ppp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,CHAT,chat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PPPDUMP,pppdump,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PPPSTATS,pppstats,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(eval $(call PKG_mod_template,PPP_MOD_PPPOE,rp-pppoe))
+$(eval $(call PKG_mod_template,PPP_MOD_RADIUS,radius))
+
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		./configure \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/bin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
+	)
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)/usr
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-	  CC=$(TARGET_CC) \
-	  COPTS="$(TARGET_CFLAGS)" \
-	 all
-
-$(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd
-	mkdir -p $(I_PPP)
-	cp -af ./ipkg/ppp/* $(I_PPP)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP) control/ppp.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
-	mkdir -p $(I_PPP)/usr/sbin
-	cp -af $(PKG_BUILD_DIR)/pppd/pppd $(I_PPP)/usr/sbin/
-	$(STRIP) $(I_PPP)/usr/sbin/*
-	mkdir -p $(I_PPP)/usr/lib/pppd
-	cp $(PKG_BUILD_DIR)/pppd/plugins/*.so $(I_PPP)/usr/lib/pppd/
-	$(STRIP) $(I_PPP)/usr/lib/pppd/*.so
-	mkdir -p $(I_PPP)/$(MODULES_SUBDIR)
-	cp $(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(I_PPP)/$(MODULES_SUBDIR)
-	cp $(MODULES_DIR)/kernel/drivers/net/ppp_deflate.o $(I_PPP)/$(MODULES_SUBDIR)
-	cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR)
-	$(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR)
+		CC=$(TARGET_CC) \
+		COPTS="$(TARGET_CFLAGS)" \
+		DESTDIR="$(PKG_INSTALL_DIR)/usr" \
+		all install
+	touch $@
+
+$(IPKG_PPP):
+	install -d -m0755 $(IDIR_PPP)/etc/ppp
+	ln -sf /tmp/resolv.conf $(IDIR_PPP)/etc/ppp/resolv.conf
+	install -m0600 ./files/etc/ppp/chap-secrets $(IDIR_PPP)/etc/ppp/
+	install -m0644 ./files/etc/ppp/options $(IDIR_PPP)/etc/ppp/
+	install -d -m0755 $(IDIR_PPP)/etc/ppp/peers
+	install -m0644 ./files/etc/ppp/peers/sample $(IDIR_PPP)/etc/ppp/peers/
+	install -d -m0755 $(IDIR_PPP)/usr/sbin
+	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/
+	install -d -m0755 $(IDIR_PPP)/usr/lib/pppd
+	$(RSTRIP) $(IDIR_PPP)
+	$(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
 	
-$(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
-	cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \
-		$(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
-	$(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/*/*.so
-	mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
-	cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
-	$(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR)
-
-$(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius
-	cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \
-	  $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius/
-	$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so
-	$(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR)
-
-$(PKG_PPPDUMP): $(PKG_PPP)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(I_PPPDUMP)/usr/sbin
-	cp -af $(PKG_BUILD_DIR)/pppdump/pppdump $(I_PPPDUMP)/usr/sbin/
-	$(STRIP) $(I_PPPDUMP)/usr/sbin/*
-	$(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR)
-
-$(PKG_PPPSTATS): $(PKG_PPP)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(I_PPPSTATS)/usr/sbin
-	cp -af $(PKG_BUILD_DIR)/pppstats/pppstats $(I_PPPSTATS)/usr/sbin/
-	$(STRIP) $(I_PPPSTATS)/usr/sbin/*
-	$(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR)
-
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(TARGETS)
-install: compile
-	$(IPKG) install $(PKG_PPP)
-ifeq ($(BR2_PACKAGE_PPP_PPPOE),y)
-	$(IPKG) install $(PKG_PPP_PPPOE_PLUGIN)
-endif
-ifeq ($(BR2_PACKAGE_PPP_RADIUS),y)
-	$(IPKG) install $(PKG_PPP_RADIUS_PLUGIN)
-endif
-ifeq ($(BR2_PACKAGE_PPPDUMP),y)
-	$(IPKG) install $(PKG_PPPDUMP)
-endif
-ifeq ($(BR2_PACKAGE_PPPSTATS),y)
-	$(IPKG) install $(PKG_PPPSTATS)
-endif
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_PPP) $(PKG_PPP_PPPOE_PLUGIN) $(PKG_PPP_RADIUS_PLUGIN) $(PKG_PPPSTATS) $(PKG_PPPDUMP)
+$(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe:
+	install -d -m0755 $(IDIR_PPP_MOD_PPPOE)/etc/init.d
+	install -m0755 ./files/pppoe.init $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe
+
+$(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe
+
+$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf:
+
+	install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp
+	install -m644 ./files/etc/ppp/radius.conf $(IDIR_PPP_MOD_RADIUS)/etc/ppp/
+	install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius
+	install -m644 ./files/etc/ppp/radius/dictionary* \
+		$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius/
+	install -m600 ./files/etc/ppp/radius/servers \
+		$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius/
+
+$(IPKG_PPP_MOD_RADIUS): $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf
+
+$(IPKG_CHAT):
+	install -d -m0755 $(IDIR_CHAT)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/
+	$(RSTRIP) $(IDIR_CHAT)
+	$(IPKG_BUILD) $(IDIR_CHAT) $(PACKAGE_DIR)
+
+$(IPKG_PPPDUMP):
+	install -d -m0755 $(IDIR_PPPDUMP)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/
+	$(RSTRIP) $(IDIR_PPPDUMP)
+	$(IPKG_BUILD) $(IDIR_PPPDUMP) $(PACKAGE_DIR)
+
+$(IPKG_PPPSTATS): $(IPKG_PPP)
+	install -d -m0755 $(IDIR_PPPSTATS)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/
+	$(RSTRIP) $(IDIR_PPPSTATS)
+	$(IPKG_BUILD) $(IDIR_PPPSTATS) $(PACKAGE_DIR)
+