From 7d75cfddfc24a90ff4a7481ebb568d0c615616e0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 24 Mar 2022 06:47:40 +0100
Subject: [PATCH] scripts: target_lib: remove profile override support (#2423)
No legacy OpenWrt targets exist anymore which require the .config profile
name to differ from the image name.
---
scripts/target_config_lib.lua | 6 ++----
scripts/target_lib.lua | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua
index c2237f72e..ccda8e424 100644
--- a/scripts/target_config_lib.lua
+++ b/scripts/target_config_lib.lua
@@ -155,8 +155,6 @@ if #lib.devices > 0 then
handle_target_pkgs(lib.target_packages)
for _, dev in ipairs(lib.devices) do
- local profile = dev.options.profile or dev.name
-
local device_pkgs = {}
local function handle_pkgs(pkgs)
for _, pkg in ipairs(pkgs) do
@@ -172,10 +170,10 @@ if #lib.devices > 0 then
handle_pkgs(dev.options.packages or {})
handle_pkgs(site_packages(dev.image))
- local profile_config = string.format('%s_DEVICE_%s', openwrt_config_target, profile)
+ local profile_config = string.format('%s_DEVICE_%s', openwrt_config_target, dev.name)
lib.config(
'TARGET_DEVICE_' .. profile_config, true,
- string.format("unable to enable device '%s'", profile)
+ string.format("unable to enable device '%s'", dev.name)
)
lib.config(
'TARGET_DEVICE_PACKAGES_' .. profile_config,
diff --git a/scripts/target_lib.lua b/scripts/target_lib.lua
index 1c2395e6e..b8dd933e4 100644
--- a/scripts/target_lib.lua
+++ b/scripts/target_lib.lua
@@ -31,7 +31,6 @@ M.images = {}
local default_options = {
- profile = false,
factory = '-squashfs-factory',
factory_ext = '.bin',
sysupgrade = '-squashfs-sysupgrade',
--
GitLab