From 00880645411b7027c4d0a6241dbd98c572bff2e0 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Mon, 20 Jun 2022 15:51:34 +0800
Subject: [PATCH 1/4] Update to Leap 15.4 JeOS

---
 Makefile                         |  4 ++--
 leap-42.1.kiwi => leap-15.4.kiwi | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename leap-42.1.kiwi => leap-15.4.kiwi (94%)

diff --git a/Makefile b/Makefile
index 17830e1..13d03f0 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,14 @@ repo/config:
 exportrepo/config:
 	ostree init --repo=exportrepo --mode=archive-z2
 
-repo/refs/heads/base/org.openSUSE.Runtime/$(ARCH)/$(VERSION): repo/config leap-42.1.kiwi config.sh
+repo/refs/heads/base/org.openSUSE.Runtime/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
 	sudo rm -rf buildroot
 	sudo kiwi --profile="runtime" system prepare --root=$$PWD/buildroot --description=$$PWD
 	sudo ./prepare-to-ostree.sh
 	sudo ostree --repo=repo commit -s 'initial build' -b base/org.openSUSE.Runtime/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot-prepare
 	sudo chown -R `whoami` repo
 
-repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/config leap-42.1.kiwi config.sh
+repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
 	sudo rm -rf buildroot
 	sudo kiwi --profile="sdk" system prepare --root=$$PWD/buildroot --description=$$PWD
 	sudo ./prepare-to-ostree.sh
diff --git a/leap-42.1.kiwi b/leap-15.4.kiwi
similarity index 94%
rename from leap-42.1.kiwi
rename to leap-15.4.kiwi
index 64c5a20..3cf8545 100644
--- a/leap-42.1.kiwi
+++ b/leap-15.4.kiwi
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="6.3" name="LimeJeOS-Leap-42.1">
+<image schemaversion="6.3" name="openSUSE-Leap-15.4-JeOS">
     <description type="system">
         <author>Frederic Crozat</author>
         <contact>fcrozat@suse.com</contact>
         <specification>
-            Flatpak runtime and Sdk, based on Leap 42.1 JeOS
+            Flatpak runtime and Sdk, based on Leap 15.4 JeOS
         </specification>
     </description>
     <preferences>
         <type image="tbz" />
-        <version>1.42.1</version>
+        <version>15.4</version>
         <packagemanager>zypper</packagemanager>
         <locale>en_US</locale>
         <keytable>us.map.gz</keytable>
@@ -27,7 +27,7 @@
         <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
     </users>
     <repository type="yast2" imageinclude="true">
-        <source path="obs://leap/42.1/repo/oss"/>
+        <source path="http://download.opensuse.org/distribution/leap/15.4/repo/oss/"/>
     </repository>
     <packages type="image">
         <package name="ca-certificates-mozilla"/> <!-- OPENSUSE: needed for https -->
@@ -72,7 +72,7 @@
         <package name="Mesa-libGL1"/>
         <package name="libgdbm4"/>
         <package name="libGLU1"/>
-        <package name="libGLEW1_13"/>
+        <package name="libGLEW2_2"/>
         <!-- pulseaudio-->
         <package name="libpulse0"/>
         <package name="libpulse-mainloop-glib0"/>
@@ -111,9 +111,9 @@
         <package name="libXxf86vm-devel"/>
         <package name="libXfont-devel"/>
         <package name="libfontenc-devel"/>
-        <package name="mesa-libEGL-devel"/>
+        <package name="Mesa-libEGL-devel"/>
         <package name="libgbm-devel"/>
-        <package name="mesa-libGL-devel"/>
+        <package name="Mesa-libGL-devel"/>
         <package name="glu-devel"/>
         <package name="glew-devel"/>
         <package name="libpulse-devel"/>

From 593039501e1ff6ca8372e4f9d7f2c26d34f21e29 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Wed, 22 Mar 2023 15:22:01 +0800
Subject: [PATCH 2/4] Just works

---
 Makefile                              | 42 ++++++++++++++-------------
 commit-subtree.sh                     |  2 +-
 leap-15.4.kiwi                        |  1 +
 metadata.runtime => metadata.platform |  6 ++--
 metadata.sdk                          |  6 ++--
 prepare-to-ostree.sh                  | 16 +++++-----
 6 files changed, 38 insertions(+), 35 deletions(-)
 rename metadata.runtime => metadata.platform (59%)

diff --git a/Makefile b/Makefile
index 13d03f0..fa61a25 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,10 @@ clean:
 	sudo rm -fr buildroot buildroot-prepare .commit-*
 
 PROXY=
-VERSION=1
+VERSION=15.4
 ARCH=x86_64
+platform_METADATA=metadata.platform
+sdk_METADATA=metadata.sdk
 
 repo/config:
 	ostree init --repo=repo --mode=bare-user
@@ -14,49 +16,49 @@ repo/config:
 exportrepo/config:
 	ostree init --repo=exportrepo --mode=archive-z2
 
-repo/refs/heads/base/org.openSUSE.Runtime/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
+repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
 	sudo rm -rf buildroot
 	sudo kiwi --profile="runtime" system prepare --root=$$PWD/buildroot --description=$$PWD
-	sudo ./prepare-to-ostree.sh
-	sudo ostree --repo=repo commit -s 'initial build' -b base/org.openSUSE.Runtime/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot-prepare
+	#sudo ./prepare-to-ostree.sh
+	cat $(platform_METADATA) | xargs -0 -I XXX sudo ostree --repo=repo commit --owner-uid=0 --owner-gid=0 --no-xattrs --canonical-permissions -s 'initial build' -b base/org.openSUSE.Platform/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot --add-metadata-string xa.metadata=XXX
 	sudo chown -R `whoami` repo
 
 repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
 	sudo rm -rf buildroot
 	sudo kiwi --profile="sdk" system prepare --root=$$PWD/buildroot --description=$$PWD
-	sudo ./prepare-to-ostree.sh
-	sudo ostree --repo=repo commit -s 'initial build' -b base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot-prepare
+	#sudo ./prepare-to-ostree.sh
+	cat $(sdk_METADATA) | xargs -0 -I XXX sudo ostree --repo=repo commit --owner-uid=0 --owner-gid=0 --no-xattrs --canonical-permissions -s 'initial build' -b base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot --add-metadata-string xa.metadata=XXX
 	sudo chown -R `whoami` repo
 
-repo/refs/heads/runtime/org.openSUSE.Runtime/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Runtime/$(ARCH)/$(VERSION) metadata.runtime
-	./commit-subtree.sh base/org.openSUSE.Runtime/$(ARCH)/$(VERSION) runtime/org.openSUSE.Runtime/$(ARCH)/$(VERSION) metadata.runtime /usr files
+repo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform
+	./commit-subtree.sh base/org.openSUSE.Platform/$(ARCH)/$(VERSION) runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform /usr files
 
-repo/refs/heads/runtime/org.openSUSE.Runtime.Var/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Runtime/$(ARCH)/$(VERSION) metadata.runtime
-	./commit-subtree.sh base/org.openSUSE.Runtime/$(ARCH)/$(VERSION) runtime/org.openSUSE.Runtime.Var/$(ARCH)/$(VERSION) metadata.runtime /var files /usr/share/rpm files/lib/rpm
+repo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform
+	./commit-subtree.sh base/org.openSUSE.Platform/$(ARCH)/$(VERSION) runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION) metadata.platform /var files #/usr/lib/rpm files/lib/rpm
 
 repo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk
 	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk /usr files
 
 repo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk
-	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION) metadata.sdk /var files /usr/share/rpm files/lib/rpm
+	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION) metadata.sdk /var files #/usr/lib/rpm files/lib/rpm
 
-exportrepo/refs/heads/runtime/org.openSUSE.Runtime/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Runtime/$(ARCH)/$(VERSION) exportrepo/config
-	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Runtime/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo
+exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) exportrepo/config
+	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION)
+	flatpak build-update-repo exportrepo --generate-static-deltas
 
-exportrepo/refs/heads/runtime/org.openSUSE.Runtime.Var/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Runtime.Var/$(ARCH)/$(VERSION) exportrepo/config
-	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Runtime.Var/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo
+exportrepo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION) exportrepo/config
+	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION)
+	flatpak build-update-repo exportrepo --generate-static-deltas
 
 exportrepo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) exportrepo/config
 	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo
+	flatpak build-update-repo exportrepo --generate-static-deltas
 
 exportrepo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION) exportrepo/config
 	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo
+	flatpak build-update-repo exportrepo --generate-static-deltas
 
-platform: exportrepo/refs/heads/runtime/org.openSUSE.Runtime/$(ARCH)/$(VERSION) exportrepo/refs/heads/runtime/org.openSUSE.Runtime.Var/$(ARCH)/$(VERSION)
+platform: exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) exportrepo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION)
 
 sdk: exportrepo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) exportrepo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION)
 
diff --git a/commit-subtree.sh b/commit-subtree.sh
index 9ad58a7..8cc8f31 100755
--- a/commit-subtree.sh
+++ b/commit-subtree.sh
@@ -17,5 +17,5 @@ while (( "$#" )); do
     ostree checkout --repo=repo --subpath=$1 -U $SRC_COMMIT $DIR/$2
     shift 2
 done
-ostree commit --repo=repo --no-xattrs --owner-uid=0 --owner-gid=0 --link-checkout-speedup -s "Commit" --branch $DST_COMMIT $DIR
+cat $METADATA | xargs -0 -I XXX ostree commit --repo=repo --no-xattrs --owner-uid=0 --owner-gid=0 --canonical-permissions --link-checkout-speedup -s "Commit" --branch $DST_COMMIT $DIR --add-metadata-string xa.metadata=XXX
 rm -rf $DIR
diff --git a/leap-15.4.kiwi b/leap-15.4.kiwi
index 3cf8545..f711269 100644
--- a/leap-15.4.kiwi
+++ b/leap-15.4.kiwi
@@ -82,6 +82,7 @@
         <package name="strace"/>
         <package name="gdb"/>
         <package name="cpio"/>
+        <package name="rpm"/>
         <package name="rpm-build"/>
         <package name="zypper"/>
         <package name="gcc"/>
diff --git a/metadata.runtime b/metadata.platform
similarity index 59%
rename from metadata.runtime
rename to metadata.platform
index 74a51bc..e7e9e91 100644
--- a/metadata.runtime
+++ b/metadata.platform
@@ -1,7 +1,7 @@
 [Runtime]
-name=org.openSUSE.Runtime/x86_64/1
-runtime=org.flatpak.Runtime/x86_64/1
-sdk=org.openSUSE.Sdk/x86_64/1
+name=org.openSUSE.Platform
+runtime=org.openSUSE.Platform/x86_64/15.4
+sdk=org.openSUSE.Sdk/x86_64/15.4
 
 [Environment]
 LD_LIBRARY_PATH=/app/lib64
diff --git a/metadata.sdk b/metadata.sdk
index 049b2c8..b178077 100644
--- a/metadata.sdk
+++ b/metadata.sdk
@@ -1,7 +1,7 @@
 [Runtime]
-name=org.openSUSE.Sdk/x86_64/20160625
-runtime=org.openSUSE.Runtime/x86_64/20160625
-sdk=org.openSUSE.Sdk/x86_64/20160625
+name=org.openSUSE.Sdk
+runtime=org.openSUSE.Platform/x86_64/15.4
+sdk=org.openSUSE.Sdk/x86_64/15.4
 
 [Environment]
 LD_LIBRARY_PATH=/app/lib64
diff --git a/prepare-to-ostree.sh b/prepare-to-ostree.sh
index 3c779e7..1b7bae9 100755
--- a/prepare-to-ostree.sh
+++ b/prepare-to-ostree.sh
@@ -4,14 +4,14 @@ TARGET=buildroot-prepare
 rm -fr $TARGET
 mkdir $TARGET
 mkdir $TARGET/{var,dev,proc,run,sys,sysroot}
-ln -s ../var/opt $TARGET/opt
-ln -s ../var/srv $TARGET/srv
-ln -s ../var/mnt $TARGET/mnt
-ln -s ../var/roothome $TARGET/root
-ln -s ../var/home $TARGET/home
-ln -s ../run/media $TARGET/media
-ln -s ../sysroot/ostree $TARGET/ostree
-ln -s ../sysroot/tmp $TARGET/tmp
+ln -s buildroot/var/opt $TARGET/opt
+ln -s buildroot/var/srv $TARGET/srv
+ln -s buildroot/var/mnt $TARGET/mnt
+ln -s buildroot/var/roothome $TARGET/root
+ln -s buildroot/var/home $TARGET/home
+ln -s buildroot/run/media $TARGET/media
+ln -s buildroot/sysroot/ostree $TARGET/ostree
+ln -s buildroot/sysroot/tmp $TARGET/tmp
 
 mv buildroot/usr $TARGET/usr
 mv buildroot/etc $TARGET/etc

From d0fd1d676c980c5a114df0824caaca135f59562d Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Thu, 23 Mar 2023 10:49:37 +0800
Subject: [PATCH 3/4] Remove separated Var runtime

---
 Makefile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index fa61a25..b90a6f3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,32 +33,18 @@ repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/config leap-15.4.
 repo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform
 	./commit-subtree.sh base/org.openSUSE.Platform/$(ARCH)/$(VERSION) runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform /usr files
 
-repo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform
-	./commit-subtree.sh base/org.openSUSE.Platform/$(ARCH)/$(VERSION) runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION) metadata.platform /var files #/usr/lib/rpm files/lib/rpm
-
 repo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk
 	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk /usr files
 
-repo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk
-	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION) metadata.sdk /var files #/usr/lib/rpm files/lib/rpm
-
 exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) exportrepo/config
 	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION)
 	flatpak build-update-repo exportrepo --generate-static-deltas
 
-exportrepo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION) exportrepo/config
-	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo --generate-static-deltas
-
 exportrepo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) exportrepo/config
 	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION)
 	flatpak build-update-repo exportrepo --generate-static-deltas
 
-exportrepo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION) exportrepo/config
-	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo --generate-static-deltas
-
-platform: exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) exportrepo/refs/heads/runtime/org.openSUSE.Platform.Var/$(ARCH)/$(VERSION)
+platform: exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION)
 
-sdk: exportrepo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) exportrepo/refs/heads/runtime/org.openSUSE.Sdk.Var/$(ARCH)/$(VERSION)
+sdk: exportrepo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION)
 

From 85511a5cdd6e440f25f93ae6bd8404559a6913b1 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Fri, 7 Apr 2023 09:01:59 +0800
Subject: [PATCH 4/4] udpates

---
 Makefile             | 16 ++++++++--------
 commit-subtree.sh    |  2 +-
 leap-15.4.kiwi       |  8 +++++---
 prepare-to-ostree.sh |  6 +++---
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index b90a6f3..4bafa43 100644
--- a/Makefile
+++ b/Makefile
@@ -18,31 +18,31 @@ exportrepo/config:
 
 repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
 	sudo rm -rf buildroot
-	sudo kiwi --profile="runtime" system prepare --root=$$PWD/buildroot --description=$$PWD
-	#sudo ./prepare-to-ostree.sh
-	cat $(platform_METADATA) | xargs -0 -I XXX sudo ostree --repo=repo commit --owner-uid=0 --owner-gid=0 --no-xattrs --canonical-permissions -s 'initial build' -b base/org.openSUSE.Platform/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot --add-metadata-string xa.metadata=XXX
+	sudo kiwi --profile="platform" system prepare --root=$$PWD/buildroot --description=$$PWD
+	sudo ./prepare-to-ostree.sh
+	sudo ostree --repo=repo commit -s 'initial build' -b base/org.openSUSE.Platform/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot-prepare
 	sudo chown -R `whoami` repo
 
 repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/config leap-15.4.kiwi config.sh
 	sudo rm -rf buildroot
 	sudo kiwi --profile="sdk" system prepare --root=$$PWD/buildroot --description=$$PWD
-	#sudo ./prepare-to-ostree.sh
-	cat $(sdk_METADATA) | xargs -0 -I XXX sudo ostree --repo=repo commit --owner-uid=0 --owner-gid=0 --no-xattrs --canonical-permissions -s 'initial build' -b base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot --add-metadata-string xa.metadata=XXX
+	sudo ./prepare-to-ostree.sh
+	sudo ostree --repo=repo commit -s 'initial build' -b base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) --tree=dir=$$PWD/buildroot-prepare
 	sudo chown -R `whoami` repo
 
 repo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform
 	./commit-subtree.sh base/org.openSUSE.Platform/$(ARCH)/$(VERSION) runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) metadata.platform /usr files
 
 repo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/refs/heads/base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk
-	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk /usr files
+	./commit-subtree.sh base/org.openSUSE.Sdk/$(ARCH)/$(VERSION) runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) metadata.sdk /usr files /usr/share/rpm files/lib/rpm
 
 exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION) exportrepo/config
 	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo --generate-static-deltas
+	flatpak build-update-repo exportrepo
 
 exportrepo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION): repo/refs/heads/runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION) exportrepo/config
 	ostree pull-local --repo=exportrepo repo runtime/org.openSUSE.Sdk/$(ARCH)/$(VERSION)
-	flatpak build-update-repo exportrepo --generate-static-deltas
+	flatpak build-update-repo exportrepo
 
 platform: exportrepo/refs/heads/runtime/org.openSUSE.Platform/$(ARCH)/$(VERSION)
 
diff --git a/commit-subtree.sh b/commit-subtree.sh
index 8cc8f31..aa0abe4 100755
--- a/commit-subtree.sh
+++ b/commit-subtree.sh
@@ -17,5 +17,5 @@ while (( "$#" )); do
     ostree checkout --repo=repo --subpath=$1 -U $SRC_COMMIT $DIR/$2
     shift 2
 done
-cat $METADATA | xargs -0 -I XXX ostree commit --repo=repo --no-xattrs --owner-uid=0 --owner-gid=0 --canonical-permissions --link-checkout-speedup -s "Commit" --branch $DST_COMMIT $DIR --add-metadata-string xa.metadata=XXX
+cat $METADATA | xargs -0 -I XXX ostree commit --repo=repo --no-xattrs --owner-uid=0 --owner-gid=0 --link-checkout-speedup -s "Commit" --branch $DST_COMMIT $DIR --add-metadata-string xa.metadata=XXX
 rm -rf $DIR
diff --git a/leap-15.4.kiwi b/leap-15.4.kiwi
index f711269..6dd23c6 100644
--- a/leap-15.4.kiwi
+++ b/leap-15.4.kiwi
@@ -21,7 +21,7 @@
     </preferences>
     <profiles>
         <profile name="sdk" description="Flatpack sdk"/>
-        <profile name="runtime" description="Flatpack runtime"/>
+        <profile name="platform" description="Flatpack runtime"/>
     </profiles>
     <users group="root">
         <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -29,8 +29,9 @@
     <repository type="yast2" imageinclude="true">
         <source path="http://download.opensuse.org/distribution/leap/15.4/repo/oss/"/>
     </repository>
-    <packages type="image">
+    <packages type="image" profiles="platform">
         <package name="ca-certificates-mozilla"/> <!-- OPENSUSE: needed for https -->
+        <package name="bash-sh"/>
         <package name="tar"/>
         <package name="timezone"/>
         <package name="elfutils"/>
@@ -78,6 +79,7 @@
         <package name="libpulse-mainloop-glib0"/>
     </packages>
     <packages type="bootstrap" profiles="sdk">
+        <package name="bash-sh"/>
         <package name="valgrind"/>
         <package name="strace"/>
         <package name="gdb"/>
@@ -161,7 +163,7 @@
         <package name="systemd-presets-branding-openSUSE"/>
         -->
     </packages>
-    <packages type="delete" profiles="runtime">
+    <packages type="delete" profiles="platform">
         <package name="perl"/>
         <package name="sysvinit-tools"/>
         <package name="aaa_base"/>
diff --git a/prepare-to-ostree.sh b/prepare-to-ostree.sh
index 1b7bae9..3d2f3d0 100755
--- a/prepare-to-ostree.sh
+++ b/prepare-to-ostree.sh
@@ -13,8 +13,8 @@ ln -s buildroot/run/media $TARGET/media
 ln -s buildroot/sysroot/ostree $TARGET/ostree
 ln -s buildroot/sysroot/tmp $TARGET/tmp
 
-mv buildroot/usr $TARGET/usr
-mv buildroot/etc $TARGET/etc
+cp -r buildroot/usr $TARGET/usr
+cp -r buildroot/etc $TARGET/etc
 ln -s var/lib/rpm $TARGET/usr/share/rpm
-mv $TARGET/usr/local $TARGET/var/usrlocal
+cp -r $TARGET/usr/local $TARGET/var/usrlocal