Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-images-wsl for openSUSE:Factory
checked in at 2021-06-04 00:33:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-images-wsl (Old)
and /work/SRC/openSUSE:Factory/.kiwi-images-wsl.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-images-wsl"
Fri Jun 4 00:33:19 2021 rev:8 rq:896704 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi-images-wsl/kiwi-images-wsl.changes
2021-05-20 19:25:06.809929414 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-images-wsl.new.1898/kiwi-images-wsl.changes
2021-06-04 00:33:28.640887062 +0200
@@ -1,0 +2,41 @@
+Fri May 28 20:41:06 UTC 2021 - Jeff Kowalczyk <jkowalc...@suse.com>
+
+- Set kiwi definition version to 1.0.0. Use OBS build time _service
+ replace_using_env to substitute four-digit appx version. Example:
+ <version>1.0.0</version> at build time becomes
+ <version>153.3.2.0</version>
+ * Image filename examples:
+ SUSE-Linux-Enterprise-Server-15.3-WSL.x86_64-153.3.2.0-Build3.2.appx
+ openSUSE-Leap-15.3-WSL.x86_64-153.3.2.0-Build3.2.appx
+ openSUSE-Tumbleweed-20210524-WSL.x86_64-21144.3.2.0-Build3.2.appx
+ * Full OS name and VERSION_ID e.g. 15.3 or 20210528 (TW) are now
+ included in the first part of the image file name making the
+ second occurrence redundant.
+ * The 1.0.0 version allows use of unmodified kiwi definition to
+ produce valid manual kiwi appx image builds for side loading.
+ * Builds in OBS use _service replace_using_env to substitute the
+ four-digit appx version including RELEASE digits in place of
+ the three digit kiwi definition version.
+ * replace_using_env sets APPX_VERSION as AppxManifest.xml match
+ on Version=(W.X.Y.Z). Two grep passes are required to mitigate
+ apparent lack of group-only replacement in grep, sed, awk
+ * replace_using_env replaces <version>1.0.0</version> with
+ <version>%%APPX_VERSION%%/version>
+ * replace_using_env replaces %%APPX_VERSION%% with appx version
+ at build time.
+ * For reference, digits of appx VERSION are limited to the
+ following ranges: # 0-65535, 0-65535, 0-65535, 0
+
+-------------------------------------------------------------------
+Fri May 28 06:20:59 UTC 2021 - Jeff Kowalczyk <jkowalc...@suse.com>
+
+- Use full OS name and VERSION_ID for appx image filename
+ * SUSE-Linux-Enterprise-Server-%OS_VERSION_ID%-WSL
+ * openSUSE-Leap-%OS_VERSION_ID%-WSL
+ * openSUSE-Tumbleweed-%OS_VERSION_ID%-WSL
+ * Previously used generic image names suse-wsl and opensuse-wsl
+ as holdover from kiwi-images-wsl to wsl-appx workflow.
+ With kiwi direct appx generation, restore appx image filenames
+ specific to the OS branding.
+
+-------------------------------------------------------------------
@@ -4 +45 @@
-- Add OBS source service replace_using_env. Configure to subsitute
+- Add OBS source service replace_using_env. Configure to substitute
@@ -14 +55 @@
- * replace_using_evn replaces %%RELEASE%% with OBS build env var
+ * replace_using_env replaces %%RELEASE%% with OBS build env var
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-images-wsl.kiwi ++++++
--- /var/tmp/diff_new_pack.tdrB7z/_old 2021-06-04 00:33:29.048887379 +0200
+++ /var/tmp/diff_new_pack.tdrB7z/_new 2021-06-04 00:33:29.048887379 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="opensuse-wsl">
+<image schemaversion="6.1" name="openSUSE-Leap-%OS_VERSION_ID%-WSL">
<description type="system">
<author>SUSE WSL Team</author>
<contact>w...@suse.com</contact>
@@ -7,7 +7,7 @@
</description>
<preferences>
<type image="appx" metadata_path="/usr/share/wsl-appx"/>
- <version>15.3</version>
+ <version>1.0.0</version>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>false</rpm-check-signatures>
<rpm-excludedocs>true</rpm-excludedocs>
@@ -54,7 +54,7 @@
<package name="filesystem"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-appliance-wsl"/>
- <!-- needed by tumbleweed and other projects using kiwi-nobasepackages
until obs-build#562 resolved -->
- <package name="zypper"/>
+ <!-- needed by tumbleweed and other projects using kiwi-nobasepackages
until obs-build#562 resolved -->
+ <package name="zypper"/>
</packages>
</image>
++++++ _service ++++++
--- /var/tmp/diff_new_pack.tdrB7z/_old 2021-06-04 00:33:29.084887406 +0200
+++ /var/tmp/diff_new_pack.tdrB7z/_new 2021-06-04 00:33:29.088887410 +0200
@@ -8,4 +8,11 @@
<param name="eval">sed -i -e 's#
Version="\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)\.\([^\.]*\)"#
Version="\1.%%RELEASE%%.\4"#' /usr/share/wsl-appx/AppxManifest.xml</param>
<param name="verbose">1</param>
</service>
+ <service mode="buildtime" name="replace_using_env">
+ <param name="file">kiwi-images-wsl.kiwi</param>
+ <param name="var">APPX_VERSION</param>
+ <param name="eval">APPX_VERSION=$(grep -o -e '
Version="[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*.[0-9]*"'
/usr/share/wsl-appx/AppxManifest.xml |grep -o '[0-9.]*')</param>
+ <param name="eval">sed -i -e
's#\(.version.\)\([0-9\.]*\)\(..version.\)#\1%%APPX_VERSION%%\3#'
kiwi-images-wsl.kiwi</param>
+ <param name="verbose">1</param>
+ </service>
</services>
