Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Allow scratch builds with dir as argument

Browse Source
This commit is contained in:
Disassembler 2019-10-05 23:09:30 +02:00
parent 93cc9f435b
commit 466a83e407
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build/usr/bin/lxcbuild
View File

@ -20,7 +20,7 @@ if len(sys.argv) < 2:
sys.exit(1) sys.exit(1)
args = parser.parse_args() args = parser.parse_args()
def build_and_pack_image(args, path): def build_and_pack_image(path, args):
image = Image() image = Image()
image.force_build = args.force or args.scratch image.force_build = args.force or args.scratch
image.scratch_build = args.scratch image.scratch_build = args.scratch
@ -44,7 +44,7 @@ else:
if os.path.isfile(buildpath): if os.path.isfile(buildpath):
basename = os.path.basename(buildpath) basename = os.path.basename(buildpath)
if basename == 'lxcfile' or basename.endswith('.lxcfile'): if basename == 'lxcfile' or basename.endswith('.lxcfile'):
build_and_pack_image(args, buildpath) build_and_pack_image(buildpath, args)
# Compose files needs to be ignored when performing scratch builds # Compose files needs to be ignored when performing scratch builds
elif not args.scratch and basename == 'meta': elif not args.scratch and basename == 'meta':
pack_app(buildpath) pack_app(buildpath)
@ -54,16 +54,21 @@ else:
# If the buildpath is a directory, build as much as possible, unless scratch build was requested, in which case don't build anything # If the buildpath is a directory, build as much as possible, unless scratch build was requested, in which case don't build anything
else: else:
if args.scratch: if args.scratch:
print('Please specify an lxcfile for scratch build') lxcfile = os.path.join(buildpath, 'lxcfile')
sys.exit(1) if os.path.exists(lxcfile):
valid_dir = False build_and_pack_image(lxcfile, args)
for entry in os.scandir(buildpath): else:
if entry.is_file() and (entry.name == 'lxcfile' or entry.name.endswith('.lxcfile')): print('Please specify an lxcfile for scratch build')
sys.exit(1)
else:
valid_dir = False
for entry in os.scandir(buildpath):
if entry.is_file() and (entry.name == 'lxcfile' or entry.name.endswith('.lxcfile')):
valid_dir = True
build_and_pack_image(entry.path, args)
meta = os.path.join(buildpath, 'meta')
if os.path.exists(meta):
valid_dir = True valid_dir = True
build_and_pack_image(args, entry.path) pack_app(meta)
meta = os.path.join(buildpath, 'meta') if not valid_dir:
if os.path.exists(meta): print('Directory {} doesn\'t contain anything to build, skipping'.format(buildpath))
valid_dir = True
pack_app(meta)
if not valid_dir:
print('Directory {} doesn\'t contain anything to build, skipping'.format(buildpath))

2
build/usr/lib/python3.6/lxcbuild/apppacker.py
View File

@ -47,7 +47,7 @@ class AppPacker(Packer):
def register(self): def register(self):
# Register package in global repository metadata file # Register package in global repository metadata file
print('Registering package', self.app.name) print('Registering application package', self.app.name)
self.packages['apps'][self.app.name] = self.app.conf.copy() self.packages['apps'][self.app.name] = self.app.conf.copy()
self.packages['apps'][self.app.name]['size'] = self.tar_size self.packages['apps'][self.app.name]['size'] = self.tar_size
self.packages['apps'][self.app.name]['pkgsize'] = self.xz_size self.packages['apps'][self.app.name]['pkgsize'] = self.xz_size

4
build/usr/lib/python3.6/lxcbuild/imagepacker.py
View File

@ -40,13 +40,13 @@ class ImagePacker(Packer):
def create_archive(self): def create_archive(self):
# Create archive # Create archive
print('Archiving', self.image.name) print('Archiving image', self.image.name)
subprocess.run(['tar', '--xattrs', '-cpf', self.tar_path, self.image.name], cwd=LXC_STORAGE_DIR) subprocess.run(['tar', '--xattrs', '-cpf', self.tar_path, self.image.name], cwd=LXC_STORAGE_DIR)
self.compress_archive() self.compress_archive()
def register(self): def register(self):
# Register image in global repository metadata file # Register image in global repository metadata file
print('Registering package', self.image.name) print('Registering image package', self.image.name)
self.packages['images'][self.image.name] = self.image.conf.copy() self.packages['images'][self.image.name] = self.image.conf.copy()
self.packages['images'][self.image.name]['size'] = self.tar_size self.packages['images'][self.image.name]['size'] = self.tar_size
self.packages['images'][self.image.name]['pkgsize'] = self.xz_size self.packages['images'][self.image.name]['pkgsize'] = self.xz_size