diff options
| -rw-r--r-- | package/openvpn/Config.in | 2 | ||||
| -rw-r--r-- | package/openvpn/Makefile | 108 | ||||
| -rw-r--r-- | package/openvpn/ipkg/openvpn.control (renamed from package/openvpn/openvpn.control) | 0 |
3 files changed, 54 insertions, 56 deletions
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 472dc333a..5a4755d01 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -20,4 +20,4 @@ config BR2_PACKAGE_OPENVPN_LZO bool "Enable transparent compression (lzo)" default y depends BR2_PACKAGE_OPENVPN - select BR2_PACKAGE_LZO + select BR2_PACKAGE_LIBLZO diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index ad2210fe5..79d1c6e8e 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -9,10 +9,14 @@ PKG_MD5SUM:=7401faebc6baee9add32608709c54eec PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) PKG_DEPEND:="openssl, kmod-tun" ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y) @@ -25,63 +29,57 @@ ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y) DISABLE_SERVER:=--disable-server endif -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) - -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.unpacked - -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(strip $(TARGET_CFLAGS))" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --program-prefix="" \ - --disable-pthread \ - --disable-debug \ - --disable-plugins \ - --disable-management \ - --disable-socks \ - --disable-http \ - $(DISABLE_LZO) \ - $(DISABLE_SERVER) \ + --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) \ + --enable-shared \ + --disable-static \ + --disable-pthread \ + --disable-debug \ + --disable-plugins \ + --disable-management \ + --disable-socks \ + --disable-http \ + $(DISABLE_LZO) \ + $(DISABLE_SERVER) \ ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/openvpn: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + install + touch $(PKG_BUILD_DIR)/.built -$(PKG_IPK): $(PKG_BUILD_DIR)/openvpn - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - echo "Depends: $(PKG_DEPEND)" >> $(PKG_IPK_DIR)/CONTROL/control - mkdir -p $(PKG_IPK_DIR)/usr/sbin - cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/ - $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* - mkdir -p $(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) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/openvpn.list +$(IPKG_OPENVPN): + install -d -m0755 $(IDIR_OPENVPN)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ + $(RSTRIP) $(IDIR_OPENVPN) + echo "Depends: $(PKG_DEPEND)" >> $(IDIR_OPENVPN)/CONTROL/control + $(IPKG_BUILD) $(IDIR_OPENVPN) $(PACKAGE_DIR) -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) diff --git a/package/openvpn/openvpn.control b/package/openvpn/ipkg/openvpn.control index 6332d34d2..6332d34d2 100644 --- a/package/openvpn/openvpn.control +++ b/package/openvpn/ipkg/openvpn.control |