billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add --include-controldir.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-26 02:05:10 +00:00
parent 7556399b35
commit 4237745197
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ognibuild/debian/file_search.py
View file

@ -286,6 +286,7 @@ GENERATED_FILE_SEARCHER = GeneratedFileSearcher(
"/usr/bin/rst2html": "python3-docutils", "/usr/bin/rst2html": "python3-docutils",
# aclocal is a symlink to aclocal-1.XY # aclocal is a symlink to aclocal-1.XY
"/usr/bin/aclocal": "automake", "/usr/bin/aclocal": "automake",
"/usr/bin/automake": "automake",
# maven lives in /usr/share # maven lives in /usr/share
"/usr/bin/mvn": "maven", "/usr/bin/mvn": "maven",
} }

4
ognibuild/dist.py
View file

@ -146,6 +146,9 @@ if __name__ == "__main__":
"--target-directory", type=str, default="..", help="Target directory" "--target-directory", type=str, default="..", help="Target directory"
) )
parser.add_argument("--verbose", action="store_true", help="Be verbose") parser.add_argument("--verbose", action="store_true", help="Be verbose")
parser.add_argument(
'--include-controldir', action='store_true',
help='Clone rather than export.')
args = parser.parse_args() args = parser.parse_args()
@ -172,6 +175,7 @@ if __name__ == "__main__":
target_dir=os.path.abspath(args.target_directory), target_dir=os.path.abspath(args.target_directory),
packaging_tree=packaging_tree, packaging_tree=packaging_tree,
chroot=args.chroot, chroot=args.chroot,
include_controldir=args.include_controldir,
) )
except (NoBuildToolsFound, NotImplementedError): except (NoBuildToolsFound, NotImplementedError):
logging.info("No build tools found, falling back to simple export.") logging.info("No build tools found, falling back to simple export.")