diff options
| author | John Crispin <blogic@openwrt.org> | 2016-03-01 09:17:12 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2016-03-01 09:17:12 +0000 |
| commit | 71444087465a9468556108794b06f03cbffaed02 (patch) | |
| tree | 983c6604d69d213833d76abe3b206e1a460493b5 /package/system/opkg/Makefile | |
| parent | 77a10161ae168fcf451140e2d72e86c1c4275034 (diff) | |
| download | master-187ad058-71444087465a9468556108794b06f03cbffaed02.tar.gz master-187ad058-71444087465a9468556108794b06f03cbffaed02.tar.bz2 master-187ad058-71444087465a9468556108794b06f03cbffaed02.zip | |
opkg: Make opkg understand old md5
Opkg now uses sha256 by default and expects them. Making it optionally
understand md5s also and detect md5 sum so we can migrate from configuration
that used md5.
Signed-off-by: Michal Hrusecky <Michal.Hrusecky@nic.cz>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48867 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/opkg/Makefile')
| -rw-r--r-- | package/system/opkg/Makefile | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index e46c6b3a34..c09d1683fe 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=opkg PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d PKG_VERSION:=$(PKG_REV) -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_REV) @@ -43,6 +43,7 @@ define Package/opkg/Default TITLE:=opkg package manager DEPENDS:=+uclient-fetch URL:=http://wiki.openmoko.org/wiki/Opkg + MENU:=1 endef define Package/opkg/Default/description @@ -55,6 +56,16 @@ define Package/opkg/Default/description opkg knows how to install both .ipk and .deb packages. endef +define Package/opkg/config +config OPKG_SUPPORT_MD5 + bool + default n + depends on PACKAGE_opkg + prompt "Support reading old md5 hashes." + help + Old opkg used md5s, new uses sha. This options enables understanding both while prefering sha. +endef + define Package/opkg $(call Package/opkg/Default) VARIANT:=unsigned @@ -84,6 +95,16 @@ define Package/opkg-smime/description This package allows the Package index to be verified with S/MIME. endef +define Package/opkg-smime/config +config OPKG_SMIME_SUPPORT_MD5 + bool + default n + depends on PACKAGE_opkg-smime + prompt "Support reading old md5 hashes." + help + Old opkg used md5s, new uses sha. This options enables understanding both while prefering sha. +endef + Package/opkg-smime/conffiles = $(Package/opkg/conffiles) TARGET_CFLAGS += -ffunction-sections -fdata-sections @@ -97,11 +118,21 @@ CONFIGURE_ARGS += \ --with-opkglockfile=/var/lock/opkg.lock ifeq ($(BUILD_VARIANT),smime) - CONFIGURE_ARGS += --enable-openssl --disable-usign + CONFIGURE_ARGS += --enable-openssl --disable-usign + ifeq ($(CONFIG_OPKG_SMIME_SUPPORT_MD5),y) + CONFIGURE_ARGS += --enable-md5 + else + CONFIGURE_ARGS += --disable-md5 + endif else ifndef CONFIG_SIGNED_PACKAGES CONFIGURE_ARGS += --disable-usign endif + ifeq ($(CONFIG_OPKG_SUPPORT_MD5),y) + CONFIGURE_ARGS += --enable-md5 + else + CONFIGURE_ARGS += --disable-md5 + endif endif MAKE_FLAGS = \ |