From 8707eb105d28058df8611c5b42f2279f6e072e0e Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sun, 1 Apr 2018 02:10:32 -0400 Subject: [PATCH] Revert opkg --- package/system/opkg/Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index f00e574de0..876a72d016 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -1,32 +1,32 @@ # # Copyright (C) 2006-2015 OpenWrt.org -# Copyright (C) 2016-2017 LEDE Project +# Copyright (C) 2016 LEDE Project # # 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:=2 +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_URL:=https://git.lede-project.org/project/opkg-lede.git +PKG_SOURCE_DATE:=2017-12-08 +PKG_SOURCE_VERSION:=9f61f7acf3845d2e09675b49fec5d783d57eb780 +PKG_MIRROR_HASH:=3e70d78e92f73e0848a75cfd74762656a4172b6d71369b9e2717dc57acf39cbf PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jo-Philipp Wich -# Extend depends from version.mk -PKG_CONFIG_DEPENDS += \ - CONFIG_SIGNED_PACKAGES \ - CONFIG_TARGET_INIT_PATH +PKG_FLAGS := nonshared +PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1 @@ -43,7 +43,7 @@ define Package/opkg CATEGORY:=Base system TITLE:=opkg package manager DEPENDS:=+uclient-fetch +libpthread +libubox - URL:=$(PKG_SOURCE_URL) + URL:=https://git.lede-project.org/?p=project/opkg-lede.git MENU:=1 endef @@ -86,6 +86,8 @@ 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),) -- 2.25.1