Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package obs-service-kiwi_metainfo_helper for
openSUSE:Factory checked in at 2021-06-24 18:22:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper (Old)
and /work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.2625
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-kiwi_metainfo_helper"
Thu Jun 24 18:22:21 2021 rev:9 rq:901346 version:0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper/obs-service-kiwi_metainfo_helper.changes
2021-02-02 16:54:35.634709609 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.2625/obs-service-kiwi_metainfo_helper.changes
2021-06-24 18:22:35.800917714 +0200
@@ -1,0 +2,18 @@
+Wed Jun 2 14:23:53 UTC 2021 - Jeff Kowalczyk <[email protected]>
+
+- Provide various modified spellings of PRETTY_NAME useful for
+ writing KIWI image definitions with reduced diff between SLE,
+ Leap and Tumbleweed. DASHED satisfies the requirement that kiwi
+ image names must not have spaces. The BEFORE_PAREN variations
+ drop the release label in parentheses (SLE only) and can be used
+ as a stable name for image registries and WSL app store
+ submissions.
+ * VENDOR
+ * PRETTY_NAME_DASHED
+ * PRETTY_NAME_BEFORE_PAREN
+ * PRETTY_NAME_BEFORE_PAREN_DASHED
+ (Needed for jsc#SLE-12986)
+- Update README and service definition XML to reflect all variables
+- Bump version to 0.3
+
+-------------------------------------------------------------------
@@ -11,0 +30 @@
+- Bump version to 0.2
@@ -63 +81,0 @@
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-kiwi_metainfo_helper.spec ++++++
--- /var/tmp/diff_new_pack.TLe4yq/_old 2021-06-24 18:22:36.216918174 +0200
+++ /var/tmp/diff_new_pack.TLe4yq/_new 2021-06-24 18:22:36.220918180 +0200
@@ -17,7 +17,7 @@
Name: obs-service-kiwi_metainfo_helper
-Version: 0.2
+Version: 0.3
Release: 0
Summary: Service for substituting various variables in build recipes
License: GPL-2.0-or-later
++++++ README ++++++
--- /var/tmp/diff_new_pack.TLe4yq/_old 2021-06-24 18:22:36.244918205 +0200
+++ /var/tmp/diff_new_pack.TLe4yq/_new 2021-06-24 18:22:36.244918205 +0200
@@ -5,10 +5,15 @@
build recipe (.kiwi, Dockerfile, Chart.yaml) to replace placeholders with
build-specific metainfo.
-| Placeholder | Value | Example
|
-|--------------------|--------------------------------------------|-----------------------------------------------------------------------------------------------|
-| %DISTURL% | The OBS dist url |
obs://build.suse.de/SUSE:SLE-15:Update:CR/images/2951b67133dd6384cacb28203174e030-sles15-image|
-| %RELEASE% | The OBS release number (<cicnt\>.<bldcnt\>)| 4.2
|
-| %BUILDTIME% | $(date --utc +%FT%T.%NZ) |
2018-10-30T09:19:02.074934628Z
|
-| %OS_VERSION_ID% | VERSION_ID in the os-release file | 15
|
-| %OS_VERSION_ID_SP% | Like VERSION_ID, but with SP (SLE only) | 15.0
|
+| Placeholder | Value
| Example
|
+|--------------------------------------|-----------------------------------------------
|------------------------------------------------------------------------------------------------|
+| %DISTURL% | The OBS dist url
|
obs://build.suse.de/SUSE:SLE-15:Update:CR/images/2951b67133dd6384cacb28203174e030-sles15-image
|
+| %RELEASE% | The OBS release number
(<cicnt\>.<bldcnt\>) | 4.2
|
+| %BUILDTIME% | $(date --utc +%FT%T.%NZ)
| 2018-10-30T09:19:02.074934628Z
|
+| %OS_VERSION_ID% | VERSION_ID in the os-release file
| 15
|
+| %OS_VERSION_ID_SP% | Like VERSION_ID, but with SP (SLE
only) | 15.0
|
+| %OS_PRETTY_NAME% | PRETTY_NAME in the os-release file
| SUSE Linux Enterprise Server 15 SP3 (Snapshot16)
|
+| %OS_VENDOR% | PRETTY_NAME up to first space
character | SUSE
|
+| %OS_PRETTY_NAME_DASHED% | PRETTY_NAME with dashes in place of
spaces | SUSE-Linux-Enterprise-Server-15-SP3-Snapshot-16
|
+| %OS_PRETTY_NAME_BEFORE_PAREN% | PRETTY_NAME up to the first open
parentheses | SUSE Linux Enterprise Server 15 SP3
|
+| %OS_PRETTY_NAME_BEFORE_PAREN_DASHED% | PRETTY_NAME up to first open paren
with dashes | SUSE-Linux-Enterprise-Server-15-SP3
|
++++++ kiwi_metainfo_helper ++++++
--- /var/tmp/diff_new_pack.TLe4yq/_old 2021-06-24 18:22:36.256918219 +0200
+++ /var/tmp/diff_new_pack.TLe4yq/_new 2021-06-24 18:22:36.256918219 +0200
@@ -70,9 +70,43 @@
VERSION_ID_SP="${VERSION_ID}"
[[ "${VERSION_ID_SP%}" == *"."* ]] || VERSION_ID_SP="${VERSION_ID}.0"
+ # Provide various modified spellings of PRETTY_NAME useful for writing
+ # KIWI image definitions with reduced diff between SLE, Leap and
Tumbleweed:
+ #
+ # VENDOR: openSUSE
+ # PRETTY_NAME_DASHED: openSUSE-Leap-15.3
+ # PRETTY_NAME_BEFORE_PAREN: openSUSE Leap 15.3
+ # PRETTY_NAME_BEFORE_PAREN_DASHED: openSUSE-Leap-15.3
+ #
+ # VENDOR: SUSE
+ # PRETTY_NAME_DASHED:
SUSE-Linux-Enterprise-Server-15-SP3-Snapshot-16
+ # PRETTY_NAME_BEFORE_PAREN: SUSE Linux Enterprise Server 15 SP3
+ # PRETTY_NAME_BEFORE_PAREN_DASHED: SUSE-Linux-Enterprise-Server-15-SP3
+
+ # First word of PRETTY_NAME, typically used as vendor name e.g. SUSE or
openSUSE.
+ VENDOR="${PRETTY_NAME%% *}"
+
+ # KIWI image name attribute must not contain spaces, replace with dash
+ PRETTY_NAME_DASHED="${PRETTY_NAME//[^[:alnum:].]/-}"
+ # Remove repeated dashes from parentheses surrounding SLE release labels
+ PRETTY_NAME_DASHED="${PRETTY_NAME_DASHED//--/-}"
+ # Remove dash at end from parentheses surrounding SLE release labels
+ PRETTY_NAME_DASHED="${PRETTY_NAME_DASHED%%-}"
+
+ # Special case for SLE release labels e.g. RC1. Keep only up to (space)
open paren.
+ # Provides a stable project name for third-party integrations e.g. app
store submissions
+ PRETTY_NAME_BEFORE_PAREN="${PRETTY_NAME// (*/}"
+
+ # KIWI image name attribute must not contain spaces, replace with dash
+
PRETTY_NAME_BEFORE_PAREN_DASHED="${PRETTY_NAME_BEFORE_PAREN//[^[:alnum:].]/-}"
+
sed -i"" \
-e "s/%OS_VERSION_ID%/${VERSION_ID}/g" \
-e "s/%OS_PRETTY_NAME%/${PRETTY_NAME}/g" \
+ -e "s/%OS_VENDOR%/${VENDOR}/g" \
+ -e "s/%OS_PRETTY_NAME_DASHED%/${PRETTY_NAME_DASHED}/g" \
+ -e "s/%OS_PRETTY_NAME_BEFORE_PAREN%/${PRETTY_NAME_BEFORE_PAREN}/g" \
+ -e
"s/%OS_PRETTY_NAME_BEFORE_PAREN_DASHED%/${PRETTY_NAME_BEFORE_PAREN_DASHED}/g" \
-e "s/%OS_VERSION_ID_SP%/${VERSION_ID_SP}/g" "${files[@]}"
fi
++++++ kiwi_metainfo_helper.service ++++++
--- /var/tmp/diff_new_pack.TLe4yq/_old 2021-06-24 18:22:36.268918232 +0200
+++ /var/tmp/diff_new_pack.TLe4yq/_new 2021-06-24 18:22:36.268918232 +0200
@@ -1,4 +1,4 @@
<service name="kiwi_metainfo_helper">
<summary>Substitute various variables in build recipes</summary>
- <description>Substitutes %DISTURL%, %RELEASE% and %BUILDTIME% in build
recipes.</description>
+ <description>Substitutes variables in build recipes. See README for
variable listing.</description>
</service>
