From d2506bf96d0edb51ee360389b7ca5c05444dad13ffe736c5520c8f7b8d4d57e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Wed, 23 Nov 2022 09:32:11 +0000
Subject: [PATCH 1/6] [info=f507eb6083a09294cb3714628b06275f]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/busybox-image?expand=0&rev=5
---
 _service           |  1 -
 busybox-image.kiwi | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/_service b/_service
index f5ca758..c910f60 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,4 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="kiwi_label_helper"/>
-
 </services>
\ No newline at end of file
diff --git a/busybox-image.kiwi b/busybox-image.kiwi
index b75b325..2c5eb11 100644
--- a/busybox-image.kiwi
+++ b/busybox-image.kiwi
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/bci-busybox:%OS_VERSION_ID_SP% bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-busybox:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-busybox:%OS_VERSION_ID_SP% opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-busybox:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="busybox-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>https://www.suse.com/</contact>
-    <specification>openSUSE Tumbleweed BCI %OS_VERSION% Busybox Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Busybox Container Image</specification>
   </description>
   <preferences>
     <type image="docker">
       <containerconfig
-          name="bci/bci-busybox"
+          name="opensuse/bci/bci-busybox"
           tag="%OS_VERSION_ID_SP%"
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
           <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.busybox">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION% Busybox Container Image"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Busybox Container Image"/>
             <label name="org.opencontainers.image.description" value="Busybox based on the SLE Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
@@ -30,12 +30,9 @@
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
             <label name="com.suse.release-stage" value="released"/>
-
           </suse_label_helper:add_prefix>
         </labels>
         <subcommand execute="/bin/sh"/>
-
-
       </containerconfig>
     </type>
     <version>15.Tumbleweed.0</version>

From 8ccfc6a089c83130bbffa94b3c5a7f1a58cbc55cb669dc6243ef1ccef507b0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Tue, 21 Feb 2023 08:48:12 +0000
Subject: [PATCH 2/6] [info=c0c11fcdfbe40144405f6c293d9ec5bc]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/busybox-image?expand=0&rev=10
---
 busybox-image.changes | 5 +++++
 config.sh             | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/busybox-image.changes b/busybox-image.changes
index e9ce3c0..126fabe 100644
--- a/busybox-image.changes
+++ b/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  2 12:22:14 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Bump copyright year
+
 -------------------------------------------------------------------
 Fri Jul 15 11:09:19 UTC 2022 - Dan Čermák <dcermak@suse.com>
 
diff --git a/config.sh b/config.sh
index 79d131b..3a51c1e 100644
--- a/config.sh
+++ b/config.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022 SUSE LLC
+# SPDX-FileCopyrightText: (c) 2022-2023 SUSE LLC
 
 set -euo pipefail
 

From e1e6f41a7ad9e02bb126aa5315196ad1bcaeaed515b1634e0c28651dd98b0298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Fri, 3 Mar 2023 07:50:46 +0000
Subject: [PATCH 3/6] [info=ee0d359d131a3568a02ebf710dfa49d2]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/busybox-image?expand=0&rev=15
---
 _service              | 2 +-
 busybox-image.changes | 5 +++++
 busybox-image.kiwi    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/_service b/_service
index c910f60..695a3f0 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,4 @@
 <services>
-  <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="kiwi_label_helper"/>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
 </services>
\ No newline at end of file
diff --git a/busybox-image.changes b/busybox-image.changes
index 126fabe..13774e9 100644
--- a/busybox-image.changes
+++ b/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  3 07:24:36 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Add org.opencontainers.image.source label set to %SOURCEURL%
+
 -------------------------------------------------------------------
 Mon Jan  2 12:22:14 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/busybox-image.kiwi b/busybox-image.kiwi
index 2c5eb11..a1b7c6f 100644
--- a/busybox-image.kiwi
+++ b/busybox-image.kiwi
@@ -25,6 +25,7 @@
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
+            <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
             <label name="org.opensuse.reference" value="registry.opensuse.org/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>

From 4e69077566a8af7fd03aac8ca7d3ad962899c731d144afd07742f5ee4a608271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Thu, 4 May 2023 13:19:59 +0000
Subject: [PATCH 4/6] [info=c8d6a543b7cb6ad2ec4579a47e5dc043]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/busybox-image?expand=0&rev=21
---
 busybox-image.changes | 13 +++++++++++++
 busybox-image.kiwi    |  5 ++---
 config.sh             |  4 ++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/busybox-image.changes b/busybox-image.changes
index 13774e9..3996114 100644
--- a/busybox-image.changes
+++ b/busybox-image.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Apr 25 22:24:05 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- Reduce busybox image size by removing Index.db
+
+  Index.db is being created on demand by rpm(1) (as long as it is run as root)
+  so we don't strictly have to ship it. currently the Index.db has a lot of
+  empty space within which we could optimize away.
+
+  until then removing the file saves 10% of the total compressed size.
+
+- switch versioning to rolling Tumbleweed schema
+
 -------------------------------------------------------------------
 Fri Mar  3 07:24:36 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/busybox-image.kiwi b/busybox-image.kiwi
index a1b7c6f..1b18e9c 100644
--- a/busybox-image.kiwi
+++ b/busybox-image.kiwi
@@ -18,7 +18,6 @@
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
-          <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.busybox">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Busybox Container Image"/>
             <label name="org.opencontainers.image.description" value="Busybox based on the SLE Base Container Image."/>
@@ -27,7 +26,7 @@
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
             <label name="com.suse.release-stage" value="released"/>
@@ -36,7 +35,7 @@
         <subcommand execute="/bin/sh"/>
       </containerconfig>
     </type>
-    <version>15.Tumbleweed.0</version>
+    <version>2023</version>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <rpm-excludedocs>true</rpm-excludedocs>
diff --git a/config.sh b/config.sh
index 3a51c1e..6c43e20 100644
--- a/config.sh
+++ b/config.sh
@@ -16,7 +16,11 @@ if command -v rpm > /dev/null; then
     suseImportBuildKey
 fi
 
+
 sed -i 's|/bin/bash|/bin/sh|' /etc/passwd
+# Will be recreated by the next rpm(1) run as root user
+rm -v /usr/lib/sysimage/rpm/Index.db
+
 
 #=======================================
 # Clean up after zypper if it is present

From 758a49234461cffcf7483386156974e2ced4f0c1d38c78a5cafa2c8cf0f7d77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Tue, 20 Jun 2023 16:17:28 +0000
Subject: [PATCH 5/6] [info=18d59cff8e93ca1157ac4304fc92f12f]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/busybox-image?expand=0&rev=23
---
 busybox-image.changes | 5 +++++
 busybox-image.kiwi    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/busybox-image.changes b/busybox-image.changes
index 3996114..0d134c0 100644
--- a/busybox-image.changes
+++ b/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 30 06:52:56 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Add release stage and lifecycle url
+
 -------------------------------------------------------------------
 Tue Apr 25 22:24:05 UTC 2023 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/busybox-image.kiwi b/busybox-image.kiwi
index 1b18e9c..167fdf9 100644
--- a/busybox-image.kiwi
+++ b/busybox-image.kiwi
@@ -29,7 +29,8 @@
             <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/bci-busybox:%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
-            <label name="com.suse.release-stage" value="released"/>
+            <label name="org.opensuse.release-stage" value="released"/>
+            <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime"/>
           </suse_label_helper:add_prefix>
         </labels>
         <subcommand execute="/bin/sh"/>

From 134e45fbe03572d873da352bedede434ee927ab58d1f3e3ace90f18d74a73aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 26 Jun 2023 10:29:29 +0000
Subject: [PATCH 6/6] [info=283f1bc96f76b6ab13ce616cb718c24e]

OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/busybox-image?expand=0&rev=27
---
 busybox-image.changes | 5 +++++
 busybox-image.kiwi    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/busybox-image.changes b/busybox-image.changes
index 0d134c0..7f4966c 100644
--- a/busybox-image.changes
+++ b/busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 23 15:33:33 UTC 2023 - Dirk Mueller <dmueller@suse.com>
+
+- label capitalization and related cleanups
+
 -------------------------------------------------------------------
 Tue May 30 06:52:56 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/busybox-image.kiwi b/busybox-image.kiwi
index 167fdf9..bc4a5a2 100644
--- a/busybox-image.kiwi
+++ b/busybox-image.kiwi
@@ -8,7 +8,7 @@
   <description type="system">
     <author>openSUSE Project</author>
     <contact>https://www.suse.com/</contact>
-    <specification>openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Busybox Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI openSUSE Tumbleweed BusyBox Container Image</specification>
   </description>
   <preferences>
     <type image="docker">
@@ -19,8 +19,8 @@
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.busybox">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Busybox Container Image"/>
-            <label name="org.opencontainers.image.description" value="Busybox based on the SLE Base Container Image."/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed BusyBox"/>
+            <label name="org.opencontainers.image.description" value="openSUSE Tumbleweed BusyBox container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>