hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-06 20:54:00 -05:00
Code Issues Projects Releases Wiki Activity

scripts/make-index-json: ensure that manifest output is in opkg format

Browse Source 
Certain existing tooling, such as 'package-metadata.pl', are written
to accept the output of 'opkg list' with package manifest delimited
by '-'.  The 'make-index-json.py --manifest' output was emulating
the 'apk list --manifest' format without the delimiting dash,
thus breaking these legacy tools.

We fix this by adding the dash to the manifest output, which allows
all existing tooling to process the output irrespective of whether
the build system uses opkg or apk.

Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20094
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Eric Fahlgren 2025-09-19 10:01:07 -07:00 committed by Robert Marko
parent 3156d72cbf
commit 3b21f97641
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/make-index-json.py
View File

@ -32,7 +32,7 @@ def parse_args():
parser.add_argument("-f", "--source-format", required=True, choices=source_format,
help="Required source format of input: 'apk' or 'opkg'")
parser.add_argument("-m", "--manifest", action="store_true", default=False,
help="Print output in manifest format, as package:version pairs")
help="Print output in opkg list format, as 'package - version' pairs")
parser.add_argument(dest="source",
help="File name for input, '-' for stdin")
# fmt: on
@ -90,8 +90,10 @@ if __name__ == "__main__":
packages = parse_apk(text) if args.source_format == "apk" else parse_opkg(text)
if args.manifest:
for name, version in packages.items():
print(name, version)
# Emulate the output of 'opkg list' command for compatibility with
# legacy tooling.
for name, version in sorted(packages.items()):
print(name, "-", version)
else:
index = {
"version": 2,