From 951a74ad6956659400849e183333465f377a0101 Mon Sep 17 00:00:00 2001 From: CN_SZTL <22235437+1715173329@users.noreply.github.com> Date: Mon, 3 Feb 2020 12:00:39 +0800 Subject: [PATCH] opkg: bump to latest git HEAD (#2914) * opkg: bump to latest git HEAD Signed-off-by: CN_SZTL * config: add option for opkg --- config/Config-build.in | 4 ++++ package/system/opkg/Makefile | 12 ++++++------ package/system/opkg/files/20_migrate-feeds | 0 3 files changed, 10 insertions(+), 6 deletions(-) mode change 100644 => 100755 package/system/opkg/files/20_migrate-feeds diff --git a/config/Config-build.in b/config/Config-build.in index 90d5f86b9..7970b5de5 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -41,6 +41,10 @@ menu "Global build settings" bool "Cryptographically signed package lists" default y + config SIGNATURE_CHECK + bool "Enable signature checking in opkg" + default SIGNED_PACKAGES + comment "General build options" config DISPLAY_SUPPORT diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 67105675e..b40d6b610 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=opkg -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git -PKG_SOURCE_DATE:=2017-12-07 -PKG_SOURCE_VERSION:=3b417b9f41b4ceb5912d82f867dd5534e5675b5c -PKG_MIRROR_HASH:=1c9c21e56186345d0034d15051c1d9c5ebb5aa6658d6ae8886d8403207a914a3 +PKG_SOURCE_DATE:=2020-01-25 +PKG_SOURCE_VERSION:=c09fe2098718807ddbca13ee36e3e38801822946 +PKG_MIRROR_HASH:=b2fba519fb3bf2da2e325a33eee951b85c7c1886e48ebaac3892435a71ae33d5 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -25,7 +25,7 @@ PKG_MAINTAINER:=Jo-Philipp Wich # Extend depends from version.mk PKG_CONFIG_DEPENDS += \ - CONFIG_SIGNED_PACKAGES \ + CONFIG_SIGNATURE_CHECK \ CONFIG_TARGET_INIT_PATH PKG_BUILD_PARALLEL:=1 @@ -88,7 +88,7 @@ define Package/opkg/install $(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf $(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg - ifneq ($(CONFIG_SIGNED_PACKAGES),) + ifneq ($(CONFIG_SIGNATURE_CHECK),) echo "option check_signature" >> $(1)/etc/opkg.conf endif $(INSTALL_DIR) $(1)/usr/sbin diff --git a/package/system/opkg/files/20_migrate-feeds b/package/system/opkg/files/20_migrate-feeds old mode 100644 new mode 100755