mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-05 14:09:53 +03:00
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release cycle back into the master branch. A few conflicts had to be resolved: - In the DEVELOPERS file, because Fabrice Fontaine was added as a developer for libupnp in master, and for libupnp18 in next. Resolution is simple: add him for both. - linux/Config.in, because we updated the 4.13.x release used by default in master, while we moved to 4.14 in next. Resolution: use 4.14. - package/libupnp/libupnp.hash: a hash for the license file was added in master, while the package was bumped into next. Resolution: keep the hash for the license file, and keep the hash for the newest version of libupnp. - package/linux-headers/Config.in.host: default version of the kernel headers for 4.13 was bumped to the latest 4.13.x in master, but was changed to 4.14 in next. Resolution: use 4.14. - package/samba4/: samba was bumped to 4.6.11 in master for security reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
40
support/scripts/check-uniq-files
Executable file
40
support/scripts/check-uniq-files
Executable file
@@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import sys
|
||||
import csv
|
||||
import argparse
|
||||
from collections import defaultdict
|
||||
|
||||
warn = 'Warning: {} file "{}" is touched by more than one package: {}\n'
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('packages_file_list', nargs='*',
|
||||
help='The packages-file-list to check from')
|
||||
parser.add_argument('-t', '--type', metavar="TYPE",
|
||||
help='Report as a TYPE file (TYPE is either target, staging, or host)')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
if not len(args.packages_file_list) == 1:
|
||||
sys.stderr.write('No packages-file-list was provided.\n')
|
||||
return False
|
||||
|
||||
if args.type is None:
|
||||
sys.stderr.write('No type was provided\n')
|
||||
return False
|
||||
|
||||
file_to_pkg = defaultdict(list)
|
||||
with open(args.packages_file_list[0], 'r') as pkg_file_list:
|
||||
r = csv.reader(pkg_file_list, delimiter=',')
|
||||
for row in r:
|
||||
pkg = row[0]
|
||||
file = row[1]
|
||||
file_to_pkg[file].append(pkg)
|
||||
|
||||
for file in file_to_pkg:
|
||||
if len(file_to_pkg[file]) > 1:
|
||||
sys.stderr.write(warn.format(args.type, file, file_to_pkg[file]))
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user