mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-21 01:32:10 +01:00
Code

Support the mkosi build type

Browse Source 
Unlike other recipe files, OBS detects this by matching the prefix rather
than the suffix. As this would cause conflicts with e.g. mkosi.spec the
build type detection had to be changed a bit.
This commit is contained in:
Fabian Vogt 2024-10-10 16:44:03 +02:00
parent 0c5dda2fe3
commit facdbf2306
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osc/build.py
View File

@ -450,6 +450,11 @@ def get_built_files(pacdir, buildtype):
'-type', 'f'], '-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip() stdout=subprocess.PIPE).stdout.read().strip()
s_built = '' s_built = ''
elif buildtype == 'mkosi':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'OTHER'),
'-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip()
s_built = ''
else: else:
print('WARNING: Unknown package type \'%s\'.' % buildtype, file=sys.stderr) print('WARNING: Unknown package type \'%s\'.' % buildtype, file=sys.stderr)
b_built = '' b_built = ''
@ -757,37 +762,40 @@ def main(apiurl, store, opts, argv):
build_descr = os.path.abspath(build_descr) build_descr = os.path.abspath(build_descr)
build_type = os.path.splitext(build_descr)[1][1:] build_type = os.path.splitext(build_descr)[1][1:]
if os.path.basename(build_descr) == 'PKGBUILD': if build_type in ['spec', 'dsc', 'kiwi', 'productcompose', 'livebuild']:
# File extension works
pass
elif os.path.basename(build_descr) == 'PKGBUILD':
build_type = 'arch' build_type = 'arch'
if os.path.basename(build_descr) == 'build.collax': elif os.path.basename(build_descr) == 'build.collax':
build_type = 'collax' build_type = 'collax'
if os.path.basename(build_descr) == 'appimage.yml': elif os.path.basename(build_descr) == 'appimage.yml':
build_type = 'appimage' build_type = 'appimage'
if os.path.basename(build_descr) == 'Chart.yaml': elif os.path.basename(build_descr) == 'Chart.yaml':
build_type = 'helm' build_type = 'helm'
if os.path.basename(build_descr) == 'snapcraft.yaml': elif os.path.basename(build_descr) == 'snapcraft.yaml':
build_type = 'snapcraft' build_type = 'snapcraft'
if os.path.basename(build_descr) == 'simpleimage': elif os.path.basename(build_descr) == 'simpleimage':
build_type = 'simpleimage' build_type = 'simpleimage'
if os.path.basename(build_descr) == 'Containerfile' or os.path.basename(build_descr).startswith('Containerfile.'): elif os.path.basename(build_descr) == 'Containerfile' or os.path.basename(build_descr).startswith('Containerfile.'):
build_type = 'docker' build_type = 'docker'
if os.path.basename(build_descr) == 'Dockerfile' or os.path.basename(build_descr).startswith('Dockerfile.'): elif os.path.basename(build_descr) == 'Dockerfile' or os.path.basename(build_descr).startswith('Dockerfile.'):
build_type = 'docker' build_type = 'docker'
if os.path.basename(build_descr) == 'fissile.yml': elif os.path.basename(build_descr) == 'fissile.yml':
build_type = 'fissile' build_type = 'fissile'
if os.path.basename(build_descr) == '_preinstallimage': elif os.path.basename(build_descr) == '_preinstallimage':
build_type = 'preinstallimage' build_type = 'preinstallimage'
if build_descr.endswith('flatpak.yaml') or build_descr.endswith('flatpak.yml') or build_descr.endswith('flatpak.json'): elif build_descr.endswith('flatpak.yaml') or build_descr.endswith('flatpak.yml') or build_descr.endswith('flatpak.json'):
build_type = 'flatpak' build_type = 'flatpak'
if build_type not in ['spec', 'dsc', 'kiwi', 'arch', 'collax', 'livebuild', elif os.path.basename(build_descr).startswith('mkosi.'):
'simpleimage', 'snapcraft', 'appimage', 'docker', 'helm', build_type = 'mkosi'
'podman', 'fissile', 'flatpak', 'preinstallimage', 'productcompose']: else:
raise oscerr.WrongArgs( raise oscerr.WrongArgs(
'Unknown build type: \'%s\'. ' 'Unknown build type: \'%s\'. '
'Build description should end in .spec, .dsc, .kiwi, .productcompose or .livebuild. ' 'Build description should end in .spec, .dsc, .kiwi, .productcompose or .livebuild. '
'Or being named PKGBUILD, build.collax, simpleimage, appimage.yml, ' 'Or being named PKGBUILD, build.collax, simpleimage, appimage.yml, '
'Chart.yaml, snapcraft.yaml, flatpak.json, flatpak.yml, flatpak.yaml, ' 'Chart.yaml, snapcraft.yaml, flatpak.json, flatpak.yml, flatpak.yaml, '
'preinstallimage or Dockerfile' % build_type) 'preinstallimage, Dockerfile.*, Containerfile.* or mkosi.*' % build_type)
if not os.path.isfile(build_descr): if not os.path.isfile(build_descr):
raise oscerr.WrongArgs('Error: build description file named \'%s\' does not exist.' % build_descr) raise oscerr.WrongArgs('Error: build description file named \'%s\' does not exist.' % build_descr)

4
osc/commandline.py
View File

@ -6860,7 +6860,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
glob.glob('Dockerfile.*') + glob.glob('Containerfile') + glob.glob('Containerfile.*') + \ glob.glob('Dockerfile.*') + glob.glob('Containerfile') + glob.glob('Containerfile.*') + \
glob.glob('fissile.yml') + glob.glob('appimage.yml') + glob.glob('Chart.yaml') + \ glob.glob('fissile.yml') + glob.glob('appimage.yml') + glob.glob('Chart.yaml') + \
glob.glob('*flatpak.yaml') + glob.glob('*flatpak.yml') + glob.glob('*flatpak.json') + \ glob.glob('*flatpak.yaml') + glob.glob('*flatpak.yml') + glob.glob('*flatpak.json') + \
glob.glob('*.productcompose') glob.glob('*.productcompose') + glob.glob('mkosi.*')
# FIXME: # FIXME:
# * request repos from server and select by build type. # * request repos from server and select by build type.
@ -6904,6 +6904,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
pac = multibuild_package pac = multibuild_package
if recipe == 'PKGBUILD': if recipe == 'PKGBUILD':
cands = [d for d in descr if d.startswith(recipe)] cands = [d for d in descr if d.startswith(recipe)]
elif recipe == 'mkosi':
cands = [d for d in descr if d.startswith('mkosi.')]
else: else:
cands = [d for d in descr if d.endswith('.' + recipe)] cands = [d for d in descr if d.endswith('.' + recipe)]
if len(cands) > 1: if len(cands) > 1: