opkg: update to git HEAD of 2022-01-09

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

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index fbf87cb34ff74506562ad8df159ce919c046bcf6..8ac822f17edf631f51f0c3ce1b50154c06178e01 100644 (file)
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -1,36 +1,30 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Copyright (C) 2006-2015 OpenWrt.org
-# Copyright (C) 2016 LEDE Project
+# Copyright (C) 2006-2021 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/version.mk
-include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=opkg
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 PKG_FLAGS:=essential
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://git.lede-project.org/project/opkg-lede.git
-PKG_SOURCE_DATE:=2017-02-23
-PKG_SOURCE_VERSION:=f9baf914f8fd0179e575deeebabe463d9f87e850
-PKG_MIRROR_HASH:=ca5df4dc8b2a2dd2c37b1ed2f6a075661c54586f553e8cd056e93021e67c2e83
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/opkg-lede.git
+PKG_SOURCE_DATE:=2022-01-09
+PKG_SOURCE_VERSION:=2edcfad1bb9a32f31199d5842aa087b4d30ec6f5
+PKG_MIRROR_HASH:=b21e51ffe5bae3ca01865415630cc1f4b471f69e0d7947264a579165c7d44294
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
-PKG_FLAGS := nonshared
-PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES
-
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
+# Extend depends from version.mk
+PKG_CONFIG_DEPENDS += \
+       CONFIG_SIGNATURE_CHECK \
+       CONFIG_TARGET_INIT_PATH
 
 HOST_BUILD_DEPENDS:=libubox/host
 
@@ -43,7 +37,7 @@ define Package/opkg
   CATEGORY:=Base system
   TITLE:=opkg package manager
   DEPENDS:=+uclient-fetch +libpthread +libubox
-  URL:=https://git.lede-project.org/?p=project/opkg-lede.git
+  URL:=$(PKG_SOURCE_URL)
   MENU:=1
 endef
 
@@ -69,6 +63,7 @@ EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
 CMAKE_OPTIONS += \
        -DBUILD_TESTS=OFF \
        -DHOST_CPU=$(PKGARCH) \
+       -DPATH_SPEC="$(TARGET_INIT_PATH)" \
        -DVERSION="$(PKG_SOURCE_VERSION) ($(PKG_SOURCE_DATE))"
 
 CMAKE_HOST_OPTIONS += \
@@ -85,12 +80,10 @@ define Package/opkg/install
        $(INSTALL_DIR) $(1)/etc/uci-defaults
        $(INSTALL_DATA) ./files/customfeeds.conf $(1)/etc/opkg/customfeeds.conf
        $(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf
-       $(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf)
-       $(VERSION_SED) $(1)/etc/opkg/distfeeds.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),)
-       echo "option check_signature 1" >> $(1)/etc/opkg.conf
+  ifneq ($(CONFIG_SIGNATURE_CHECK),)
+       echo "option check_signature" >> $(1)/etc/opkg.conf
   endif
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/