Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package product-composer for
openSUSE:Factory checked in at 2024-02-23 16:46:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-composer (Old)
and /work/SRC/openSUSE:Factory/.product-composer.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-composer"
Fri Feb 23 16:46:38 2024 rev:5 rq:1149811 version:0.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-composer/product-composer.changes
2024-02-07 18:51:59.486469435 +0100
+++
/work/SRC/openSUSE:Factory/.product-composer.new.1770/product-composer.changes
2024-02-23 16:47:44.188573689 +0100
@@ -1,0 +2,6 @@
+Fri Feb 23 10:58:49 UTC 2024 - Adrian Schröter <[email protected]>
+
+- update to version 0.3.4
+ - support basic iso generation, not for bootable images yet
+
+-------------------------------------------------------------------
Old:
----
product-composer-0.3.3.obscpio
New:
----
product-composer-0.3.4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-composer.spec ++++++
--- /var/tmp/diff_new_pack.del5Mc/_old 2024-02-23 16:47:44.584588050 +0100
+++ /var/tmp/diff_new_pack.del5Mc/_new 2024-02-23 16:47:44.584588050 +0100
@@ -17,7 +17,7 @@
Name: product-composer
-Version: 0.3.3
+Version: 0.3.4
Release: 0
Summary: Product Composer
License: GPL-2.0-or-later
@@ -36,6 +36,7 @@
Requires: createrepo
Requires: inst-source-utils
Requires: instsource-susedata
+Requires: mkisofs
BuildArch: noarch
%description
++++++ _service ++++++
--- /var/tmp/diff_new_pack.del5Mc/_old 2024-02-23 16:47:44.612589065 +0100
+++ /var/tmp/diff_new_pack.del5Mc/_new 2024-02-23 16:47:44.612589065 +0100
@@ -2,8 +2,8 @@
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/openSUSE/product-composer</param>
<param name="scm">git</param>
- <param name="version">0.3.3</param>
- <param name="revision">0.3.3</param>
+ <param name="version">0.3.4</param>
+ <param name="revision">0.3.4</param>
</service>
<service name="set_version" mode="manual" />
<service name="tar" mode="buildtime" />
++++++ product-composer-0.3.3.obscpio -> product-composer-0.3.4.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-composer-0.3.3/examples/ftp.productcompose
new/product-composer-0.3.4/examples/ftp.productcompose
--- old/product-composer-0.3.3/examples/ftp.productcompose 2024-02-06
16:11:58.000000000 +0100
+++ new/product-composer-0.3.4/examples/ftp.productcompose 2024-02-23
11:57:24.000000000 +0100
@@ -11,6 +11,10 @@
openSUSE Tumbleweed is the rolling distribution by the
openSUSE.org project.
+iso:
+ publisher:
+ volume_id:
+
build_options:
### For maintenance, otherwise only "the best" version of each package is
picked:
- take_all_available_versions
@@ -34,6 +38,7 @@
large_arm:
architectures: [armv7l, aarch64]
name: Tumbleweed_ARM
+ summary: openSUSE Tumbleweed ARM
unpack:
- unpackset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-composer-0.3.3/src/productcomposer/cli.py
new/product-composer-0.3.4/src/productcomposer/cli.py
--- old/product-composer-0.3.3/src/productcomposer/cli.py 2024-02-06
16:11:58.000000000 +0100
+++ new/product-composer-0.3.4/src/productcomposer/cli.py 2024-02-23
11:57:24.000000000 +0100
@@ -301,7 +301,7 @@
process_updateinfos(rpmdir, yml, pool, flavor, debugdir, sourcedir)
# Add License File and create extra .license directory
- licensefilename = 'license.tar'
+ licensefilename = '/license.tar'
if os.path.exists(rpmdir + '/license-' + yml['name'] + '.tar') or
os.path.exists(rpmdir + '/license-' + yml['name'] + '.tar.gz'):
licensefilename = '/license-' + yml['name'] + '.tar'
if os.path.exists(rpmdir + licensefilename + '.gz'):
@@ -341,25 +341,28 @@
# do we need an ISO file?
if 'iso' in yml:
- application_id = re.sub(r'^.*/', '', maindir)
- args = [ '/bin/mkisofs', '-p', 'Product Composer -
http://www.github.com/openSUSE/product-composer' ]
- if True: # x86_64 efi only atm
+ for workdir in [maindir, sourcedir, debugdir]:
+ application_id = re.sub(r'^.*/', '', maindir)
+ args = [ '/bin/mkisofs', '-p', 'Product Composer -
http://www.github.com/openSUSE/product-composer' ]
args += [ '-r', '-pad', '-f', '-J', '-joliet-long' ]
- args += [ '-no-emul-boot', '-boot-load-size', '4',
'-boot-info-table' ]
- args += [ '-hide', 'glump', '-hide-joliet', 'glump' ]
- #args += [ '-eltorito-alt-boot', '-eltorito-platform', 'efi' ]
- args += [ '-no-emul-boot' ]
- #args += [ '-sort', $sort_file ]
- #args += [ '-boot-load-size', block_size("boot/"+arch+"/loader") ]
- # FIXME: cannot use arch, we have an archlist!
- args += [ '-b', "boot/"+arch+"/loader/isolinux.bin"]
- if 'publisher' in yml['iso']:
- args += [ '-publisher', yml['iso']['publisher'] ]
- if 'volume_id' in yml['iso']:
- args += [ '-V', yml['iso']['volume_id'] ]
- args += [ '-A', application_id ]
- args += [ '-o', maindir + '.iso', maindir ]
- run_helper(args, cwd=maindir, failmsg="create iso file")
+ # FIXME: do proper multi arch handling
+ isolinux = 'boot/' + archs[0] + '/loader/isolinux.bin'
+ if os.path.isfile(workdir + '/' + isolinux):
+ args += [ '-no-emul-boot', '-boot-load-size', '4',
'-boot-info-table' ]
+ args += [ '-hide', 'glump', '-hide-joliet', 'glump' ]
+ args += [ '-eltorito-alt-boot', '-eltorito-platform', 'efi' ]
+ args += [ '-no-emul-boot' ]
+ #args += [ '-sort', $sort_file ]
+ #args += [ '-boot-load-size',
block_size("boot/"+arch+"/loader") ]
+ args += [ '-b', isolinux]
+ if 'publisher' in yml['iso']:
+ args += [ '-publisher', yml['iso']['publisher'] ]
+ if 'volume_id' in yml['iso']:
+ args += [ '-V', yml['iso']['volume_id'] ]
+ args += [ '-A', application_id ]
+ args += [ '-o', workdir + '.iso', workdir ]
+ print(args)
+ run_helper(args, cwd=maindir, failmsg="create iso file")
# create SBOM data
if os.path.exists("/usr/lib/build/generate_sbom"):
++++++ product-composer.obsinfo ++++++
--- /var/tmp/diff_new_pack.del5Mc/_old 2024-02-23 16:47:44.720592982 +0100
+++ /var/tmp/diff_new_pack.del5Mc/_new 2024-02-23 16:47:44.720592982 +0100
@@ -1,5 +1,5 @@
name: product-composer
-version: 0.3.3
-mtime: 1707232318
-commit: 8594a3e4b6c50d06612168973e396ea21ed910e5
+version: 0.3.4
+mtime: 1708685844
+commit: c3a5234f3367f2d26dc542c32ce3b9dbaa7bf9a4
