Add package install dependencies (don't install a package if it's already installed)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@315 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Nicolas Thill 2005-03-06 12:03:54 +00:00
parent f03c7796ad
commit 95ab18e175
14 changed files with 126 additions and 64 deletions

View File

@ -34,10 +34,13 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/arptables
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/arptables.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.unpacked prepare: $(PKG_BUILD_DIR)/.unpacked
compile: $(PKG_IPK) compile: $(PKG_IPK)
install: install: $(IPKG_STATE_DIR)/info/arptables.list
$(IPKG) install $(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -60,10 +60,13 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/brctl/brctl
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/bridge.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(PKG_IPK) compile: $(PKG_IPK)
install: install: $(IPKG_STATE_DIR)/info/bridge.list
$(IPKG) install $(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -35,11 +35,14 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/src/$(PKG_NAME)
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/dnsmasq.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(PKG_IPK) compile: $(PKG_IPK)
install: install: $(IPKG_STATE_DIR)/info/dnsmasq.list
$(IPKG) install $(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(PKG_IPK) rm -f $(PKG_IPK)

View File

@ -69,11 +69,14 @@ $(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
chmod a+x $(DROPBEAR_IPK_DIR)/etc/init.d/S50dropbear chmod a+x $(DROPBEAR_IPK_DIR)/etc/init.d/S50dropbear
$(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/dropbear.list: $(PACKAGE_DIR)/$(DROPBEAR_IPK)
$(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK)
source: $(DL_DIR)/$(DROPBEAR_SOURCE) source: $(DL_DIR)/$(DROPBEAR_SOURCE)
prepare: $(DROPBEAR_DIR)/.patched prepare: $(DROPBEAR_DIR)/.patched
compile: $(PACKAGE_DIR)/$(DROPBEAR_IPK) compile: $(PACKAGE_DIR)/$(DROPBEAR_IPK)
install: compile install: $(IPKG_STATE_DIR)/info/dropbear.list
$(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK)
clean: clean:
rm -rf $(DROPBEAR_DIR) rm -rf $(DROPBEAR_DIR)
rm -f $(PACKAGE_DIR)/$(DROPBEAR_IPK) rm -f $(PACKAGE_DIR)/$(DROPBEAR_IPK)

View File

@ -34,10 +34,13 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/ebtables
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/ebtables.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.unpacked prepare: $(PKG_BUILD_DIR)/.unpacked
compile: $(PKG_IPK) compile: $(PKG_IPK)
install: install: $(IPKG_STATE_DIR)/info/ebtables.list
$(IPKG) install $(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -1,6 +1,6 @@
############################################################# #############################################################
# #
# ebtables # iproute2
# #
############################################################# #############################################################
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
@ -53,6 +53,9 @@ $(PKG_IP): $(PKG_BUILD_DIR)/ip/ip $(PACKAGE_DIR)
$(STRIP) $(PKG_IP_DIR)/usr/sbin/* $(STRIP) $(PKG_IP_DIR)/usr/sbin/*
$(IPKG_BUILD) $(PKG_IP_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IP_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/ip.list: $(PKG_IP)
$(IPKG) install $(PKG_IP)
$(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR) $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_TC_DIR) tc.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_TC_DIR) tc.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_TC_DIR)/usr/sbin mkdir -p $(PKG_TC_DIR)/usr/sbin
@ -60,6 +63,9 @@ $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR)
$(STRIP) $(PKG_TC_DIR)/usr/sbin/* $(STRIP) $(PKG_TC_DIR)/usr/sbin/*
$(IPKG_BUILD) $(PKG_TC_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_TC_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/tc.list: $(PKG_TC)
$(IPKG) install $(PKG_TC)
$(PACKAGE_DIR): $(PACKAGE_DIR):
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
@ -71,17 +77,17 @@ ifneq ($(BR2_PACKAGE_IPROUTE2_TC),)
TARGETS += $(PKG_TC) TARGETS += $(PKG_TC)
endif endif
ifeq ($(BR2_PACKAGE_IPROUTE2_IP),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip.list
endif
ifeq ($(BR2_PACKAGE_IPROUTE2_TC),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/tc.list
endif
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(TARGETS) compile: $(TARGETS)
install: install: $(INSTALL_TARGETS)
ifeq ($(BR2_PACKAGE_IPROUTE2_IP),y)
$(IPKG) install $(PKG_IP)
endif
ifeq ($(BR2_PACKAGE_IPROUTE2_TC),y)
$(IPKG) install $(PKG_TC)
endif
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -28,6 +28,14 @@ ifneq ($(BR2_PACKAGE_IP6TABLES),)
TARGETS += $(PKG_IP6T) TARGETS += $(PKG_IP6T)
endif endif
INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
endif
ifeq ($(BR2_PACKAGE_IP6TABLES),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list
endif
$(DL_DIR)/$(PKG_SOURCE_FILE): $(DL_DIR)/$(PKG_SOURCE_FILE):
mkdir -p $(DL_DIR) mkdir -p $(DL_DIR)
$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
@ -58,6 +66,9 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT)
$(IPKG) install $(PKG_IPT)
$(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables
@ -67,6 +78,9 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
$(IPKG) install $(PKG_IPT_EXTRA)
$(PKG_IP6T): $(PKG_BUILD_DIR)/iptables $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(I_IP6T)/usr/sbin mkdir -p $(I_IP6T)/usr/sbin
@ -79,18 +93,14 @@ $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T)
$(IPKG) install $(PKG_IP6T)
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(TARGETS) compile: $(TARGETS)
install: compile install: $(INSTALL_TARGETS)
$(IPKG) install $(PKG_IPT)
ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
$(IPKG) install $(PKG_IPT_EXTRA)
endif
ifeq ($(BR2_PACKAGE_IP6TABLES),y)
$(IPKG) install $(PKG_IP6T)
endif
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_CAT := zcat PKG_SOURCE_CAT := zcat
PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
PKG_IPK := $(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
$(DL_DIR)/$(PKG_SOURCE_FILE): $(DL_DIR)/$(PKG_SOURCE_FILE):
@ -49,7 +49,7 @@ $(STAGING_DIR)/lib/liblzo.a: $(PKG_BUILD_DIR)/src/liblzo.la
DESTDIR="$(STAGING_DIR)" \ DESTDIR="$(STAGING_DIR)" \
install install
$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a $(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/lzo lzo.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/lzo lzo.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib mkdir -p $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib
@ -57,11 +57,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a
$(STRIP) $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib/* $(STRIP) $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib/*
$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/lzo $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/lzo $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/lzo.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(STAGING_DIR)/lib/liblzo.a $(PACKAGE_DIR)/$(PKG_IPK) compile: $(STAGING_DIR)/lib/liblzo.a $(PKG_IPK)
install: $(PKG_ZLIB) install: $(IPKG_STATE_DIR)/info/lzo.list
$(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(STAGING_DIR)/lib/liblzo* rm -f $(STAGING_DIR)/lib/liblzo*

View File

@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_CAT := zcat PKG_SOURCE_CAT := zcat
PKG_SOURCE_DIR := $(PKG_NAME) PKG_SOURCE_DIR := $(PKG_NAME)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
$(DL_DIR)/$(PKG_SOURCE_FILE): $(DL_DIR)/$(PKG_SOURCE_FILE):
@ -41,12 +41,14 @@ $(PKG_IPK): $(STAGING_DIR)/lib/libmatrixssl.so
$(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/* $(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/*
$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/libmatrixssl.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK) compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK)
install: $(PKG_ZLIB) install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/libmatrixssl.list
$(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl* rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl*

View File

@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_CAT := zcat PKG_SOURCE_CAT := zcat
PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
PKG_IPK := $(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4 OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4
@ -51,7 +51,7 @@ $(STAGING_DIR)/lib/libssl.so: $(PKG_BUILD_DIR)/apps/openssl
(cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so) (cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so)
(cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so.0) (cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so.0)
$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libssl.so $(PKG_IPK): $(STAGING_DIR)/lib/libssl.so
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib mkdir -p $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib
@ -60,11 +60,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libssl.so
$(STRIP) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib/* $(STRIP) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib/*
$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/openssl.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(STAGING_DIR)/lib/libssl.so $(PACKAGE_DIR)/$(PKG_IPK) compile: $(STAGING_DIR)/lib/libssl.so $(PACKAGE_DIR)/$(PKG_IPK)
install: $(PKG_ZLIB) install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/openssl.list
$(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(STAGING_DIR)/lib/libssl* rm -f $(STAGING_DIR)/lib/libssl*

View File

@ -50,20 +50,23 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
); );
touch $(PKG_BUILD_DIR)/.configured touch $(PKG_BUILD_DIR)/.configured
$(PKG_BUILD_DIR)/usr/sbin/openvpn: $(PKG_BUILD_DIR)/.configured $(PKG_BUILD_DIR)/openvpn: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
$(PKG_IPK): $(PKG_BUILD_DIR)/usr/sbin/openvpn $(PKG_IPK): $(PKG_BUILD_DIR)/openvpn
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_IPK_DIR)/usr/sbin mkdir -p $(PKG_IPK_DIR)/usr/sbin
cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/ cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/openvpn.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.unpacked prepare: $(PKG_BUILD_DIR)/.unpacked
compile: $(PKG_IPK) compile: $(PKG_IPK)
install: install: $(IPKG_STATE_DIR)/info/openvpn.list
$(IPKG) install $(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -37,6 +37,20 @@ ifneq ($(BR2_PACKAGE_PPPSTATS),)
TARGETS += $(PKG_PPPSTATS) TARGETS += $(PKG_PPPSTATS)
endif endif
INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/ppp.list
ifeq ($(BR2_PACKAGE_PPP_PPPOE),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list
endif
ifeq ($(BR2_PACKAGE_PPP_RADIUS),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-radius-plugin.list
endif
ifeq ($(BR2_PACKAGE_PPPDUMP),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppdump.list
endif
ifeq ($(BR2_PACKAGE_PPPSTATS),y)
INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppstats.list
endif
$(DL_DIR)/$(PKG_SOURCE_FILE): $(DL_DIR)/$(PKG_SOURCE_FILE):
mkdir -p $(DL_DIR) mkdir -p $(DL_DIR)
$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
@ -91,6 +105,9 @@ $(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd
cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR) cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR)
$(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/ppp.list: $(PKG_PPP)
$(IPKG) install $(PKG_PPP)
$(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP) $(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) $(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 mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
@ -101,6 +118,9 @@ $(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP)
cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(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) $(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(PKG_PPP_PPPOE_PLUGIN)
$(IPKG) install $(PKG_PPP_PPPOE_PLUGIN)
$(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP) $(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) $(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 mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius
@ -109,6 +129,9 @@ $(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP)
$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so $(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so
$(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/ppp-radius-plugin.list: $(PKG_PPP_RADIUS_PLUGIN)
$(IPKG) install $(PKG_PPP_RADIUS_PLUGIN)
$(PKG_PPPDUMP): $(PKG_PPP) $(PKG_PPPDUMP): $(PKG_PPP)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(I_PPPDUMP)/usr/sbin mkdir -p $(I_PPPDUMP)/usr/sbin
@ -116,6 +139,9 @@ $(PKG_PPPDUMP): $(PKG_PPP)
$(STRIP) $(I_PPPDUMP)/usr/sbin/* $(STRIP) $(I_PPPDUMP)/usr/sbin/*
$(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/pppdump.list: $(PKG_PPPDUMP)
$(IPKG) install $(PKG_PPPDUMP)
$(PKG_PPPSTATS): $(PKG_PPP) $(PKG_PPPSTATS): $(PKG_PPP)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(I_PPPSTATS)/usr/sbin mkdir -p $(I_PPPSTATS)/usr/sbin
@ -123,24 +149,13 @@ $(PKG_PPPSTATS): $(PKG_PPP)
$(STRIP) $(I_PPPSTATS)/usr/sbin/* $(STRIP) $(I_PPPSTATS)/usr/sbin/*
$(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR) $(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/pppstats.list: $(PKG_PPPSTATS)
$(IPKG) install $(PKG_PPPSTATS)
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(TARGETS) compile: $(TARGETS)
install: compile install: $(INSTALL_TARGETS)
$(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: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)

View File

@ -60,11 +60,14 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/pptpd.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE) source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.unpacked prepare: $(PKG_BUILD_DIR)/.unpacked
compile: $(PKG_IPK) compile: $(PKG_IPK)
install: install: $(IPKG_STATE_DIR)/info/pptpd.list
$(IPKG) install $(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(PKG_IPK) rm -f $(PKG_IPK)

View File

@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_CAT := zcat PKG_SOURCE_CAT := zcat
PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
PKG_IPK := zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
$(DL_DIR)/$(PKG_SOURCE_FILE): $(DL_DIR)/$(PKG_SOURCE_FILE):
@ -41,7 +41,7 @@ $(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so
DESTDIR="$(STAGING_DIR)" \ DESTDIR="$(STAGING_DIR)" \
install install
$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so $(PKG_IPK): $(STAGING_DIR)/lib/libz.so
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/zlib zlib.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/zlib zlib.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib mkdir -p $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib
@ -49,12 +49,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so
$(STRIP) $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib/* $(STRIP) $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib/*
$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/zlib $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/zlib $(PACKAGE_DIR)
$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(STAGING_DIR)/lib/libz.so $(PACKAGE_DIR)/$(PKG_IPK) compile: $(STAGING_DIR)/lib/libz.so $(PKG_IPK)
install: $(PKG_ZLIB) install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/zlib.list
$(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK)
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib* rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib*