diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/install-buildtools | 4 | ||||
-rwxr-xr-x | scripts/oe-pkgdata-util | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 50b5487eb8..93f3e2d678 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools | |||
@@ -57,8 +57,8 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout) | |||
57 | 57 | ||
58 | DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') | 58 | DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') |
59 | DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto' | 59 | DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto' |
60 | DEFAULT_RELEASE = 'yocto-5.2.2' | 60 | DEFAULT_RELEASE = 'yocto-5.2.3' |
61 | DEFAULT_INSTALLER_VERSION = '5.2.2' | 61 | DEFAULT_INSTALLER_VERSION = '5.2.3' |
62 | DEFAULT_BUILDDATE = '202110XX' | 62 | DEFAULT_BUILDDATE = '202110XX' |
63 | 63 | ||
64 | # Python version sanity check | 64 | # Python version sanity check |
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 5b7cd768a4..44ae40549a 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util | |||
@@ -51,15 +51,6 @@ def glob(args): | |||
51 | 51 | ||
52 | skippedpkgs = set() | 52 | skippedpkgs = set() |
53 | mappedpkgs = set() | 53 | mappedpkgs = set() |
54 | allpkgs = set() | ||
55 | if args.allpkgs: | ||
56 | with open(args.allpkgs, 'r') as f: | ||
57 | for line in f: | ||
58 | fields = line.rstrip().split() | ||
59 | if not fields: | ||
60 | continue | ||
61 | else: | ||
62 | allpkgs.add(fields[0]) | ||
63 | with open(args.pkglistfile, 'r') as f: | 54 | with open(args.pkglistfile, 'r') as f: |
64 | for line in f: | 55 | for line in f: |
65 | fields = line.rstrip().split() | 56 | fields = line.rstrip().split() |
@@ -145,10 +136,6 @@ def glob(args): | |||
145 | logger.debug("%s is not a valid package!" % (pkg)) | 136 | logger.debug("%s is not a valid package!" % (pkg)) |
146 | break | 137 | break |
147 | 138 | ||
148 | if args.allpkgs: | ||
149 | if mappedpkg not in allpkgs: | ||
150 | continue | ||
151 | |||
152 | if mappedpkg: | 139 | if mappedpkg: |
153 | logger.debug("%s (%s) -> %s" % (pkg, g, mappedpkg)) | 140 | logger.debug("%s (%s) -> %s" % (pkg, g, mappedpkg)) |
154 | mappedpkgs.add(mappedpkg) | 141 | mappedpkgs.add(mappedpkg) |
@@ -605,7 +592,6 @@ def main(): | |||
605 | parser_glob.add_argument('pkglistfile', help='File listing packages (one package name per line)') | 592 | parser_glob.add_argument('pkglistfile', help='File listing packages (one package name per line)') |
606 | parser_glob.add_argument('glob', nargs="+", help='Glob expression for package names, e.g. *-dev') | 593 | parser_glob.add_argument('glob', nargs="+", help='Glob expression for package names, e.g. *-dev') |
607 | parser_glob.add_argument('-x', '--exclude', help='Exclude packages matching specified regex from the glob operation') | 594 | parser_glob.add_argument('-x', '--exclude', help='Exclude packages matching specified regex from the glob operation') |
608 | parser_glob.add_argument('-a', '--allpkgs', help='File listing all available packages (one package name per line)') | ||
609 | parser_glob.set_defaults(func=glob) | 595 | parser_glob.set_defaults(func=glob) |
610 | 596 | ||
611 | 597 | ||