Browse Source

opkg: update to latest, add host variant, enable gpg support

Waldemar Brodkorb 8 years ago
parent
commit
4e630077f1
3 changed files with 24 additions and 6 deletions
  1. 14 6
      package/opkg/Makefile
  2. 1 0
      target/config/Config.in.target
  3. 9 0
      target/config/Config.in.tools

+ 14 - 6
package/opkg/Makefile

@@ -4,12 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		opkg
-PKG_VERSION:=		0.2.4
+PKG_VERSION:=		0.3.1
 PKG_RELEASE:=		1
-PKG_HASH:=		0f40c7e457d81edf9aedc07c778f4697111ab163a38ef95999faece015453086
+PKG_HASH:=		d2c6c02a8384ec21168a1f0a186cb5e9f577d1452f491d02ed3e56b2ea8b87df
 PKG_DESCR:=		embedded package manager
-PKG_DEPENDS:=		libcurl
-PKG_BUILDDEP:=		curl
+PKG_DEPENDS:=		libcurl libarchive gpgme
+PKG_BUILDDEP:=		curl libarchive gpgme
+HOST_BUILDDEP:=		libarchive-host curl-host
 PKG_NEEDS:=		threads
 PKG_SECTION:=		sys/misc
 PKG_URL:=		https://code.google.com/p/opkg/
@@ -17,13 +18,19 @@ PKG_SITES:=		http://downloads.yoctoproject.org/releases/opkg/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,OPKG,opkg,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,OPKG,opkg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autogen
+HOST_CONFIGURE_ARGS+=	--disable-openssl \
+			--disable-gpg \
+			--disable-ssl-curl
 CONFIGURE_ARGS+=	--disable-openssl \
-			--disable-ssl-curl \
-			--disable-gpg
+			--enable-gpg \
+			--disable-ssl-curl
 
 opkg-install:
 	$(INSTALL_DIR) $(IDIR_OPKG)/usr/bin
@@ -33,4 +40,5 @@ opkg-install:
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/opkg* \
 		$(IDIR_OPKG)/usr/bin
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 1 - 0
target/config/Config.in.target

@@ -216,6 +216,7 @@ config ADK_TARGET_PACKAGE_IPKG
 config ADK_TARGET_PACKAGE_OPKG
 	bool "opkg"
 	select ADK_PACKAGE_OPKG
+	select ADK_HOST_NEED_OPKG
 	help
 	  Create opkg packages and use opkg package management on the target.
 	  

+ 9 - 0
target/config/Config.in.tools

@@ -193,6 +193,15 @@ config ADK_HOST_BUILD_PATCHELF
 	bool
 	default n
 
+config ADK_HOST_NEED_OPKG
+	bool
+	default n
+
+config ADK_HOST_BUILD_OPKG
+	bool
+	default y if ADK_HOST_NEED_OPKG
+	default n
+
 config ADK_HOST_NEED_SQUASHFS
 	bool
 	default n