opkg: switch to git repository (#14655)

[openwrt.git] / package / system / opkg / Makefile

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index eb3b10a..0dc3d6a 100644 (file)
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -9,14 +9,14 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=opkg
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=opkg

-PKG_REV:=618
+PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d

 PKG_VERSION:=$(PKG_REV)
 PKG_VERSION:=$(PKG_REV)

-PKG_RELEASE:=4
+PKG_RELEASE:=6

 
 

-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_PROTO:=git

 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)

-PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
+PKG_SOURCE_URL:=http://git.yoctoproject.org/git/opkg

 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf


@@ -90,7 +90,7 @@ CONFIGURE_ARGS += \
        --with-opkglockfile=/var/lock/opkg.lock
 
 ifeq ($(BUILD_VARIANT),smime)
        --with-opkglockfile=/var/lock/opkg.lock
 
 ifeq ($(BUILD_VARIANT),smime)

-       CONFIGURE_ARGS += --enable-openssl
+       CONFIGURE_ARGS += --enable-openssl --enable-sha256

 endif
 
 MAKE_FLAGS = \
 endif
 
 MAKE_FLAGS = \


@@ -109,8 +109,12 @@ define Package/opkg/Default/install
 endef
 
 Package/opkg/install = $(call Package/opkg/Default/install,$(1),)
 endef
 
 Package/opkg/install = $(call Package/opkg/Default/install,$(1),)

-Package/opkg-smime/install = $(call Package/opkg/Default/install,$(1),-smime)

 
 

+define Package/opkg-smime/install
+       $(call Package/opkg/Default/install,$(1),-smime)
+       $(INSTALL_DIR) $(1)/etc/ssl/certs
+       $(if $(CONFIG_OPKGSMIME_CERT),$(INSTALL_DATA) $(call qstrip,$(CONFIG_OPKGSMIME_CERT)) $(1)/etc/ssl/certs/opkg.pem,)
+endef

 
 define Build/InstallDev
        mkdir -p $(1)/usr/include
 
 define Build/InstallDev
        mkdir -p $(1)/usr/include