From 707dd340ba95c6d11dfef12b0858578c2ab1e3eb Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sun, 2 Jan 2022 17:43:38 +0000 Subject: [PATCH] opkg: drop package OPKG was removed by APK Signed-off-by: Paul Spooren --- package/system/opkg/Makefile | 97 ---------------------- package/system/opkg/files/20_migrate-feeds | 9 -- package/system/opkg/files/customfeeds.conf | 3 - package/system/opkg/files/opkg-key | 58 ------------- package/system/opkg/files/opkg-smime.conf | 6 -- package/system/opkg/files/opkg.conf | 4 - 6 files changed, 177 deletions(-) delete mode 100644 package/system/opkg/Makefile delete mode 100644 package/system/opkg/files/20_migrate-feeds delete mode 100644 package/system/opkg/files/customfeeds.conf delete mode 100755 package/system/opkg/files/opkg-key delete mode 100644 package/system/opkg/files/opkg-smime.conf delete mode 100644 package/system/opkg/files/opkg.conf diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile deleted file mode 100644 index 8ac822f17e..0000000000 --- a/package/system/opkg/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# -# Copyright (C) 2006-2021 OpenWrt.org -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=opkg -PKG_RELEASE:=$(AUTORELEASE) -PKG_FLAGS:=essential - -PKG_SOURCE_PROTO:=git -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 - -# Extend depends from version.mk -PKG_CONFIG_DEPENDS += \ - CONFIG_SIGNATURE_CHECK \ - CONFIG_TARGET_INIT_PATH - -HOST_BUILD_DEPENDS:=libubox/host - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/opkg - SECTION:=base - CATEGORY:=Base system - TITLE:=opkg package manager - DEPENDS:=+uclient-fetch +libpthread +libubox - URL:=$(PKG_SOURCE_URL) - MENU:=1 -endef - -define Package/opkg/description - Lightweight package management system - opkg is the opkg Package Management System, for handling - installation and removal of packages on a system. It can - recursively follow dependencies and download all packages - necessary to install a particular package. - - opkg knows how to install both .ipk and .deb packages. -endef - -define Package/opkg/conffiles -/etc/opkg.conf -/etc/opkg/keys/ -/etc/opkg/customfeeds.conf -endef - -TARGET_CFLAGS += -ffunction-sections -fdata-sections -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 += \ - -DSTATIC_UBOX=ON \ - -DBUILD_TESTS=OFF \ - -DHOST_CPU=$(PKGARCH) \ - -DLOCK_FILE=/tmp/opkg.lock \ - -DVERSION="$(PKG_SOURCE_VERSION) ($(PKG_SOURCE_DATE))" - -define Package/opkg/install - $(INSTALL_DIR) $(1)/usr/lib/opkg - $(INSTALL_DIR) $(1)/bin - $(INSTALL_DIR) $(1)/etc/opkg - $(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 - $(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg - 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/ -endef - -define Host/Install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/opkg-cl $(STAGING_DIR_HOST)/bin/opkg -endef - -$(eval $(call BuildPackage,opkg)) -$(eval $(call HostBuild)) diff --git a/package/system/opkg/files/20_migrate-feeds b/package/system/opkg/files/20_migrate-feeds deleted file mode 100644 index 38cc57c467..0000000000 --- a/package/system/opkg/files/20_migrate-feeds +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -[ -f /etc/opkg.conf ] && grep -q "src\/" /etc/opkg.conf || exit 0 - -echo -e "# Old feeds from previous image\n# Uncomment to reenable\n" >> /etc/opkg/customfeeds.conf -sed -n "s/.*\(src\/.*\)/# \1/p" /etc/opkg.conf >> /etc/opkg/customfeeds.conf -sed -i "/.*src\/.*/d" /etc/opkg.conf - -exit 0 diff --git a/package/system/opkg/files/customfeeds.conf b/package/system/opkg/files/customfeeds.conf deleted file mode 100644 index f130113c47..0000000000 --- a/package/system/opkg/files/customfeeds.conf +++ /dev/null @@ -1,3 +0,0 @@ -# add your custom package feeds here -# -# src/gz example_feed_name http://www.example.com/path/to/files diff --git a/package/system/opkg/files/opkg-key b/package/system/opkg/files/opkg-key deleted file mode 100755 index 51d1857ad5..0000000000 --- a/package/system/opkg/files/opkg-key +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -OPKG_KEYS="${OPKG_KEYS:-/etc/opkg/keys}" - -usage() { - cat < -Commands: - add : Add keyfile to opkg trusted keys - remove : Remove keyfile matching from opkg trusted keys - verify : Check list file against signature file - -EOF - exit 1 -} - -opkg_key_verify() { - local sigfile="$1" - local msgfile="$2" - - ( - zcat "$msgfile" 2>/dev/null || - cat "$msgfile" 2>/dev/null - ) | usign -V -P "$OPKG_KEYS" -q -x "$sigfile" -m - -} - -opkg_key_add() { - local key="$1" - [ -n "$key" ] || usage - [ -f "$key" ] || echo "Cannot open file $1" - local fingerprint="$(usign -F -p "$key")" - mkdir -p "$OPKG_KEYS" - cp "$key" "$OPKG_KEYS/$fingerprint" -} - -opkg_key_remove() { - local key="$1" - [ -n "$key" ] || usage - [ -f "$key" ] || echo "Cannot open file $1" - local fingerprint="$(usign -F -p "$key")" - rm -f "$OPKG_KEYS/$fingerprint" -} - -case "$1" in - add) - shift - opkg_key_add "$@" - ;; - remove) - shift - opkg_key_remove "$@" - ;; - verify) - shift - opkg_key_verify "$@" - ;; - *) usage ;; -esac diff --git a/package/system/opkg/files/opkg-smime.conf b/package/system/opkg/files/opkg-smime.conf deleted file mode 100644 index fd2cade1f8..0000000000 --- a/package/system/opkg/files/opkg-smime.conf +++ /dev/null @@ -1,6 +0,0 @@ -dest root / -dest ram /tmp -lists_dir ext /var/opkg-lists -option overlay_root /overlay -option check_signature 1 -option signature_ca_file /etc/ssl/certs/opkg.pem diff --git a/package/system/opkg/files/opkg.conf b/package/system/opkg/files/opkg.conf deleted file mode 100644 index d8d3a2d693..0000000000 --- a/package/system/opkg/files/opkg.conf +++ /dev/null @@ -1,4 +0,0 @@ -dest root / -dest ram /tmp -lists_dir ext /var/opkg-lists -option overlay_root /overlay -- 2.30.2