From aed14db84f251a0a400192bbdbb8433f5ef588c5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 11 Jul 2021 22:48:07 +0200
Subject: [PATCH] build: remove no_opkg
With the removal of ramips-rt305x, all targets come with opkg again.
---
scripts/copy_output.lua | 2 +-
scripts/target_config_lib.lua | 7 -------
scripts/target_lib.lua | 5 -----
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/scripts/copy_output.lua b/scripts/copy_output.lua
index 9f14fba50..b5c6f1b24 100755
--- a/scripts/copy_output.lua
+++ b/scripts/copy_output.lua
@@ -83,7 +83,7 @@ lib.exec {'cp', kernel_debug_source, kernel_debug_dest}
-- Copy opkg repo
-if lib.opkg and (env.GLUON_DEVICES or '') == '' then
+if (env.GLUON_DEVICES or '') == '' then
local package_prefix = string.format('gluon-%s-%s', lib.site_code, env.GLUON_RELEASE)
local function dest_dir(prefix)
return env.GLUON_PACKAGEDIR..'/'..prefix..'/'..bindir
diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua
index 4b107e2bd..c2237f72e 100644
--- a/scripts/target_config_lib.lua
+++ b/scripts/target_config_lib.lua
@@ -151,13 +151,6 @@ lib.include(target)
lib.check_devices()
-if not lib.opkg then
- lib.config('SIGNED_PACKAGES', false)
- lib.config('CLEAN_IPKG', true)
- lib.config('ALL_NONSHARED', false)
- lib.packages {'-opkg'}
-end
-
if #lib.devices > 0 then
handle_target_pkgs(lib.target_packages)
diff --git a/scripts/target_lib.lua b/scripts/target_lib.lua
index babec324b..36a6ee91f 100644
--- a/scripts/target_lib.lua
+++ b/scripts/target_lib.lua
@@ -28,7 +28,6 @@ M.target_packages = {}
M.configs = {}
M.devices = {}
M.images = {}
-M.opkg = true
local default_options = {
@@ -309,10 +308,6 @@ function F.sysupgrade_image(image, name, ext, options)
}
end
-function F.no_opkg()
- M.opkg = false
-end
-
function F.defaults(options)
default_options = merge(default_options, options)
end
--
GitLab