From 12b8f848e7939c4c00621f53b5dbf70a099fa72e Mon Sep 17 00:00:00 2001 From: dalto Date: Mon, 3 Jun 2024 08:06:41 -0500 Subject: [PATCH] [eos-packagelist] Remove ARM support --- eos-packagelist/README.md | 4 +--- eos-packagelist/eos-packagelist | 15 ++++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/eos-packagelist/README.md b/eos-packagelist/README.md index 88fed954..8621eaaa 100644 --- a/eos-packagelist/README.md +++ b/eos-packagelist/README.md @@ -1,4 +1,4 @@ -usage: `eos-packagelist [-h] [--list] [--arch ARCH] [--install] [profile ...]` +usage: `eos-packagelist [-h] [--list] [--install] [profile ...]` The EndeavourOS package list handler gets package information from the current installer files and allows you to optionally install them @@ -19,8 +19,6 @@ options: `--list` Lists the available options - `--arch ARCH` Only include packages available on ARM - `--install` Install the packages on the list using pacman instead of just listing them example: diff --git a/eos-packagelist/eos-packagelist b/eos-packagelist/eos-packagelist index 1629905e..fca7f33d 100755 --- a/eos-packagelist/eos-packagelist +++ b/eos-packagelist/eos-packagelist @@ -95,22 +95,15 @@ if __name__ == '__main__': ) parser.add_argument('profile', type=str, nargs='*', help='The name of the profile you want to see packages for') parser.add_argument('--list', action="store_true", help='Lists the available options') - parser.add_argument('--arch', type=str, help='Only include packages available on ARM') parser.add_argument('--install', action="store_true", help='Install the packages on the list using pacman instead of just listing them') args = parser.parse_args(args=None if sys.argv[1:] else ['--help']) # Condition to choose ARM or x64_64 - if (args.arch and args.arch != "x86_64") or (not args.arch and platform.machine() != "x86_64"): - url_netinstall = "https://raw.githubusercontent.com/endeavouros-arm/calamares-image/main/configs/calamares/modules" \ - "/netinstall.yaml" - url_pkgchooser = "https://raw.githubusercontent.com/endeavouros-arm/calamares-image/main/configs/calamares/modules" \ - "/packagechooser_ce.conf" - else: - url_netinstall = "https://raw.githubusercontent.com/endeavouros-team/calamares/calamares/data/eos/modules" \ - "/netinstall.yaml" - url_pkgchooser = "https://raw.githubusercontent.com/endeavouros-team/calamares/calamares/data/eos/modules" \ - "/packagechooser.conf" + url_netinstall = "https://raw.githubusercontent.com/endeavouros-team/calamares/calamares/data/eos/modules" \ + "/netinstall.yaml" + url_pkgchooser = "https://raw.githubusercontent.com/endeavouros-team/calamares/calamares/data/eos/modules" \ + "/packagechooser.conf" # Get the data from the internet and parse it netinstall_packages = []