Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package skelcd-control-Kubic for
openSUSE:Factory checked in at 2022-03-31 17:18:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-Kubic (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-Kubic.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-Kubic"
Thu Mar 31 17:18:16 2022 rev:43 rq:965322 version:20220204
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-Kubic/skelcd-control-Kubic.changes
2021-09-11 22:24:30.099384902 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-Kubic.new.1900/skelcd-control-Kubic.changes
2022-03-31 17:18:21.273498216 +0200
@@ -1,0 +2,6 @@
+Fri Feb 04 09:23:32 UTC 2022 - Richard Brown <[email protected]>
+
+- Use NetworkManager always (boo#1172684)
+- 20220204
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-Kubic-20210907.tar.bz2
New:
----
skelcd-control-Kubic-20220204.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-Kubic.spec ++++++
--- /var/tmp/diff_new_pack.SQCnUs/_old 2022-03-31 17:18:25.877446284 +0200
+++ /var/tmp/diff_new_pack.SQCnUs/_new 2022-03-31 17:18:25.881446239 +0200
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-Kubic
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -121,7 +121,7 @@
URL: https://github.com/yast/skelcd-control-Kubic
AutoReqProv: off
-Version: 20210907
+Version: 20220204
Release: 0
Summary: The Kubic control file needed for installation
License: MIT
++++++ skelcd-control-Kubic-20210907.tar.bz2 ->
skelcd-control-Kubic-20220204.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-Kubic-20210907/.github/workflows/ci.yml
new/skelcd-control-Kubic-20220204/.github/workflows/ci.yml
--- old/skelcd-control-Kubic-20210907/.github/workflows/ci.yml 2021-09-07
14:29:50.000000000 +0200
+++ new/skelcd-control-Kubic-20220204/.github/workflows/ci.yml 2022-02-04
10:55:55.000000000 +0100
@@ -8,7 +8,14 @@
jobs:
Package:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -16,11 +23,19 @@
uses: actions/checkout@v2
- name: Install Prerequisites
- run: rake build_dependencies:install
+ # use jing for validation instead of xmllint
+ run: |-
+ rake build_dependencies:install
+ zypper --non-interactive install --no-recommends jing
# just for easier debugging...
- name: Inspect Installed Packages
run: rpm -qa | sort
+ # must be before the package build as it installs the
/usr/lib/skelcd/CD1/control.xml
+ # which overwrites the original file from skelcd-control-openSUSE
+ - name: Validate XML
+ run: rake test:validate
+
- name: Package Build
run: yast-ci-ruby -o package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-Kubic-20210907/.travis.sh
new/skelcd-control-Kubic-20220204/.travis.sh
--- old/skelcd-control-Kubic-20210907/.travis.sh 2021-09-07
14:29:50.000000000 +0200
+++ new/skelcd-control-Kubic-20220204/.travis.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-set -e -x
-
-make -C control check
-
-# the "yast-travis-ruby" script is included in the base yastdevel/ruby image
-# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
-yast-travis-ruby
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-Kubic-20210907/README.md
new/skelcd-control-Kubic-20220204/README.md
--- old/skelcd-control-Kubic-20210907/README.md 2021-09-07 14:29:50.000000000
+0200
+++ new/skelcd-control-Kubic-20220204/README.md 2022-02-04 10:55:55.000000000
+0100
@@ -8,4 +8,27 @@
See also the [documentation for the `control.xml` file][1].
+## Building openSUSE Tumbleweed XML
+
+Run `rake build` to build the final `control/control.TWKubic.xml` file. By
+default it uses the base openSUSE Tumbleweed XML file from the
+`skelcd-control-openSUSE` package.
+
+That can be changed via the `OPENSUSE_CONTROL` environment variable to point
to a Git
+checkout directly:
+``` shell
+OPENSUSE_CONTROL=../../skelcd-control-openSUSE/control/control.openSUSE.xml
rake build
+```
+
+*Note: A relative path needs to be relative to the `control` subdirectory.*
+
+## Validation
+
+Run `rake test:validation` to validate the built XML file. It uses `jing` for
+XML validation, if that is not installed it fallbacks to `xmllint` (which
+unfortunately has a worse error reporting).
+
+You can use the `OPENSUSE_CONTROL` environment variable to set the base XML
path,
+see above.
+
[1]: https://github.com/yast/yast-installation/blob/master/doc/control-file.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-Kubic-20210907/Rakefile
new/skelcd-control-Kubic-20220204/Rakefile
--- old/skelcd-control-Kubic-20210907/Rakefile 2021-09-07 14:29:50.000000000
+0200
+++ new/skelcd-control-Kubic-20220204/Rakefile 2022-02-04 10:55:55.000000000
+0100
@@ -32,3 +32,41 @@
File.write(spec_file, spec)
end
end
+
+CONTROL_SCHEMA = "/usr/share/YaST2/control/control.rng".freeze
+XSL_FILE = "control/control.Kubic.xsl".freeze
+DEFAULT_OPENSUSE_CONTROL="/usr/lib/skelcd/CD1/control.xml"
+OPENSUSE_CONTROL = ENV["OPENSUSE_CONTROL"] || DEFAULT_OPENSUSE_CONTROL
+TARGET_XML = "control/control.TWKubic.xml".freeze
+BASE_XML = "control/control.Kubic.xml"
+
+file TARGET_XML => [ XSL_FILE, BASE_XML ] do
+ # the location is relative to the input file, change the CWD so relative
+ # paths work correctly
+ Dir.chdir("control") do
+ abort "Missing file #{OPENSUSE_CONTROL}" unless
File.exist?(OPENSUSE_CONTROL)
+ end
+
+ sh "xsltproc", "--stringparam", "openSUSE_control_file", OPENSUSE_CONTROL,
+ "--output", TARGET_XML, XSL_FILE, BASE_XML
+end
+
+desc "Build the TWKubic XML (set the base XML file via $OPENSUSE_CONTROL,
default: #{DEFAULT_OPENSUSE_CONTROL})"
+task :build => TARGET_XML.to_sym
+
+desc "Validate the built XML"
+task :"test:validate" => TARGET_XML do
+ begin
+ # prefer using jing for validation
+ sh "jing", CONTROL_SCHEMA, TARGET_XML
+ puts "OK"
+ rescue Errno::ENOENT
+ # fallback to xmllint
+ sh "xmllint", "--noout", "--relaxng", CONTROL_SCHEMA, TARGET_XML
+ end
+end
+
+desc "Remove the generated XML file"
+task :clean do
+ rm TARGET_XML if File.exist?(TARGET_XML)
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-Kubic-20210907/control/control.Kubic.xml
new/skelcd-control-Kubic-20220204/control/control.Kubic.xml
--- old/skelcd-control-Kubic-20210907/control/control.Kubic.xml 2021-09-07
14:29:50.000000000 +0200
+++ new/skelcd-control-Kubic-20220204/control/control.Kubic.xml 2022-02-04
10:55:55.000000000 +0100
@@ -218,9 +218,7 @@
</partitioning>
<network>
- <force_static_ip config:type="boolean">false</force_static_ip>
- <network_manager>never</network_manager>
- <startmode>auto</startmode>
+ <network_manager>always</network_manager>
<ipv4_forward config:type="boolean">true</ipv4_forward>
<ipv6_forward config:type="boolean">true</ipv6_forward>
</network>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-Kubic-20210907/control/control.Kubic.xsl
new/skelcd-control-Kubic-20220204/control/control.Kubic.xsl
--- old/skelcd-control-Kubic-20210907/control/control.Kubic.xsl 2021-09-07
14:29:50.000000000 +0200
+++ new/skelcd-control-Kubic-20220204/control/control.Kubic.xsl 2022-02-04
10:55:55.000000000 +0100
@@ -10,6 +10,9 @@
exclude-result-prefixes="n"
>
+ <!-- allow changing the input file with a command line parameter -->
+ <xsl:param name="openSUSE_control_file"
select="'/usr/lib/skelcd/CD1/control.xml'"/>
+
<xsl:output method="xml" indent="yes"/>
<xsl:template match="node()|@*">
@@ -22,9 +25,7 @@
<xsl:template match="n:software">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
- <!-- Make sure this is the openSUSE control file!, try both (old and the
new) locations -->
- <xsl:copy-of
select="document('/usr/lib/skelcd/CD1/control.xml')/*/n:software/n:extra_urls"/>
- <xsl:copy-of
select="document('/CD1/control.xml')/*/n:software/n:extra_urls"/>
+ <xsl:copy-of
select="document($openSUSE_control_file)/*/n:software/n:extra_urls"/>
</xsl:copy>
</xsl:template>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-Kubic-20210907/package/skelcd-control-Kubic.changes
new/skelcd-control-Kubic-20220204/package/skelcd-control-Kubic.changes
--- old/skelcd-control-Kubic-20210907/package/skelcd-control-Kubic.changes
2021-09-07 14:29:50.000000000 +0200
+++ new/skelcd-control-Kubic-20220204/package/skelcd-control-Kubic.changes
2022-02-04 10:55:55.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Feb 04 09:23:32 UTC 2022 - Richard Brown <[email protected]>
+
+- Use NetworkManager always (boo#1172684)
+- 20220204
+
+-------------------------------------------------------------------
Tue Sep 7 10:49:43 UTC 2021 - Knut Anderssen <[email protected]>
- Define default NTP servers for Kubic (bsc#1180699)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-Kubic-20210907/package/skelcd-control-Kubic.spec
new/skelcd-control-Kubic-20220204/package/skelcd-control-Kubic.spec
--- old/skelcd-control-Kubic-20210907/package/skelcd-control-Kubic.spec
2021-09-07 14:29:50.000000000 +0200
+++ new/skelcd-control-Kubic-20220204/package/skelcd-control-Kubic.spec
2022-02-04 10:55:55.000000000 +0100
@@ -121,7 +121,7 @@
Url: https://github.com/yast/skelcd-control-Kubic
AutoReqProv: off
-Version: 20210907
+Version: 20220204
Release: 0
Summary: The Kubic control file needed for installation
License: MIT
