scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-02 03:17:48 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

openwrt-20.x: add support for latest 20.x

Browse Source 
This is opt-in and we continue to use the 19.07 tree as the default.

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2020-10-24 17:44:35 +02:00
parent cded4ebf9a
commit a6a28f5aab
71 changed files with 23061 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
patches-20.x/0002-pending-scripts-add-gen_config.py.patch Normal file
View File

@@ -0,0 +1,210 @@
From 3496a3b2b77a86caa5a689555192627922917836 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 19 Jun 2020 10:45:22 +0200
Subject: [PATCH 02/25] pending: scripts: add gen_config.py
This script is used to setup the tree based on the profiles/.
Signed-off-by: John Crispin <john@phrozen.org>
---
scripts/gen_config.py | 188 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 188 insertions(+)
create mode 100755 scripts/gen_config.py
diff --git a/scripts/gen_config.py b/scripts/gen_config.py
new file mode 100755
index 0000000000..5bc7068ae7
--- /dev/null
+++ b/scripts/gen_config.py
@@ -0,0 +1,188 @@
+#!/usr/bin/env python3
+
+from os import getenv
+from pathlib import Path
+from shutil import rmtree
+from subprocess import run
+import sys
+import yaml
+
+profile_folder = Path(getenv("PROFILES", "./profiles")).absolute()
+
+
+def die(msg: str):
+ """Quit script with error message
+
+ msg (str): Error message to print
+ """
+ print(msg)
+ sys.exit(1)
+
+
+def usage(code: int = 0):
+ """Print script usage
+
+ Args:
+ code (int): exit code
+ """
+ print(
+ f"""Usage: {sys.argv[0]} <profile> [options...]
+
+ clean Remove feeds before setup
+ list List available profiles
+ help Print this message
+ """
+ )
+ sys.exit(code)
+
+
+def load_yaml(fname: str, profile: dict, include = True):
+ profile_file = (profile_folder / fname).with_suffix(".yml")
+
+ if not profile_file.is_file():
+ die(f"Profile {fname} not found")
+
+ new = yaml.safe_load(profile_file.read_text())
+ for n in new:
+ if n in {"profile", "target", "subtarget", "external_target"}:
+ if profile.get(n):
+ die(f"Duplicate tag found {n}")
+ profile.update({n: new.get(n)})
+ elif n in {"description"}:
+ profile["description"].append(new.get(n))
+ elif n in {"packages"}:
+ profile["packages"].extend(new.get(n))
+ elif n in {"diffconfig"}:
+ profile["diffconfig"] += new.get(n)
+ elif n in {"feeds"}:
+ for f in new.get(n):
+ if f.get("name", "") == "" or (f.get("uri", "") == "" and f.get("path", "") == ""):
+ die(f"Found bad feed {f}")
+ profile["feeds"][f.get("name")] = f
+
+ if "include" in new and include:
+ for i in range(len(new["include"])):
+ profile = load_yaml(new["include"][i], profile, False)
+ return profile
+
+
+def clean_tree():
+ print("Cleaning tree")
+ rmtree("./tmp", ignore_errors=True)
+ rmtree("./packages/feeds/", ignore_errors=True)
+ rmtree("./tmp/", ignore_errors=True)
+ rmtree(".git/rebase-apply/", ignore_errors=True)
+ if Path("./feeds.conf").is_file():
+ Path("./feeds.conf").unlink()
+ if Path("./.config").is_file():
+ Path("./.config").unlink()
+
+
+def merge_profiles(profiles):
+ profile = {"packages": [], "description": [], "diffconfig": "", "feeds": {}}
+
+ for p in profiles:
+ profile = load_yaml(p, profile)
+
+ return profile
+
+
+def setup_feeds(profile):
+ feeds_conf = Path("feeds.conf")
+ if feeds_conf.is_file():
+ feeds_conf.unlink()
+
+ feeds = []
+ for p in profile.get("feeds", []):
+ try:
+ f = profile["feeds"].get(p)
+ if all(k in f for k in ("branch", "revision", "path")):
+ die(f"Please specify either a branch, a revision or a path: {f}")
+ if "path" in f:
+ feeds.append(
+ f'{f.get("method", "src-link")},{f["name"]},{f["path"]}'
+ )
+ elif "revision" in f:
+ feeds.append(
+ f'{f.get("method", "src-git")},{f["name"]},{f["uri"]}^{f.get("revision")}'
+ )
+ else:
+ feeds.append(
+ f'{f.get("method", "src-git")},{f["name"]},{f["uri"]};{f.get("branch", "master")}'
+ )
+
+ except:
+ print(f"Badly configured feed: {f}")
+
+ if run(["./scripts/feeds", "setup", "-b", *feeds]).returncode:
+ die(f"Error setting up feeds")
+
+ if run(["./scripts/feeds", "update"]).returncode:
+ die(f"Error updating feeds")
+
+ for p in profile.get("feeds", []):
+ f = profile["feeds"].get(p)
+ if run(
+ ["./scripts/feeds", "install", "-a", "-f", "-p", f.get("name")]
+ ).returncode:
+ die(f"Error installing {feed}")
+
+ packages = ["./scripts/feeds", "install" ]
+ for package in profile.get("packages", []):
+ packages.append(package)
+ if len(packages) > 2:
+ if run(packages).returncode:
+ die(f"Error installing packages")
+
+ if profile.get("external_target", False):
+ if run(["./scripts/feeds", "install", profile["target"]]).returncode:
+ die(f"Error installing external target {profile['target']}")
+
+
+def generate_config(profile):
+ config_output = f"""CONFIG_TARGET_{profile["target"]}=y
+CONFIG_TARGET_{profile["target"]}_{profile["subtarget"]}=y
+CONFIG_TARGET_{profile["target"]}_{profile["subtarget"]}_DEVICE_{profile["profile"]}=y
+"""
+
+ config_output += f"{profile.get('diffconfig', '')}"
+
+ for package in profile.get("packages", []):
+ print(f"Add package to .config: {package}")
+ config_output += f"CONFIG_PACKAGE_{package}=y\n"
+
+ Path(".config").write_text(config_output)
+ print("Configuration written to .config")
+
+
+if __name__ == "__main__":
+ if "list" in sys.argv:
+ print(f"Profiles in {profile_folder}")
+
+ print("\n".join(map(lambda p: str(p.stem), profile_folder.glob("*.yml"))))
+ quit(0)
+
+ if "help" in sys.argv:
+ usage()
+
+ if len(sys.argv) < 2:
+ usage(1)
+
+ if "clean" in sys.argv:
+ clean_tree()
+ print("Tree is now clean")
+ quit(0)
+
+ profile = merge_profiles(sys.argv[1:])
+
+ print("Using the following profiles:")
+ for d in profile.get("description"):
+ print(f" - {d}")
+
+ clean_tree()
+ setup_feeds(profile)
+ generate_config(profile)
+
+ print("Running make defconfig")
+ if run(["make", "defconfig"]).returncode:
+ die(f"Error running make defconfig")
--
2.25.1