From 95dc14994d8f77d338c9d7f7adda2e2f7ab3ac02 Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Tue, 31 Oct 2023 09:21:47 -0400
Subject: [PATCH] Update to newer version

Update apt-ostree snapshot to latest.

Update build dependencies, added:

- python3-systemd
- python3-rich

Updated dependencies, added:

- systemd-container
- python3-systemd
- python3-yaml
- software-properties-common

Story: 2010844
Task: 48459

Depends-On: https://review.opendev.org/c/starlingx/tools/+/898224

Change-Id: I961de05d17e9dc68438f61db33feb262f90cac94
Signed-off-by: Charles Short <charles.short@windriver.com>
---
 apt-ostree/debian/deb_folder/control          |  6 +++++
 .../patches/0001-Set-default-directory.patch  | 26 +++++++++++++++++++
 apt-ostree/debian/deb_folder/patches/series   |  1 +
 apt-ostree/debian/meta_data.yaml              |  6 ++---
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 apt-ostree/debian/deb_folder/patches/0001-Set-default-directory.patch
 create mode 100644 apt-ostree/debian/deb_folder/patches/series

diff --git a/apt-ostree/debian/deb_folder/control b/apt-ostree/debian/deb_folder/control
index 4d597288..b4d409ee 100644
--- a/apt-ostree/debian/deb_folder/control
+++ b/apt-ostree/debian/deb_folder/control
@@ -9,6 +9,8 @@ Build-Depends:
  python3-setuptools,
  python3-all,
  python3-pbr,
+ python3-rich,
+ python3-systemd,
  python3-click,
  python3-oslotest
 Standards-Version: 4.6.2
@@ -24,6 +26,10 @@ Depends:
  python3-rich,
  bubblewrap,
  reprepro,
+ systemd-container,
+ python3-systemd,
+ python3-yaml,
+ software-properties-common
 Suggests:
  python-apt-ostree-doc,
 Description: Hybrid Image/Package management system
diff --git a/apt-ostree/debian/deb_folder/patches/0001-Set-default-directory.patch b/apt-ostree/debian/deb_folder/patches/0001-Set-default-directory.patch
new file mode 100644
index 00000000..4deee98d
--- /dev/null
+++ b/apt-ostree/debian/deb_folder/patches/0001-Set-default-directory.patch
@@ -0,0 +1,26 @@
+From 7d128dc42ef511492550f538d85fcdaa74f2f38c Mon Sep 17 00:00:00 2001
+From: Charles Short <charles.short@windriver.com>
+Date: Mon, 27 Nov 2023 21:16:07 -0500
+Subject: [PATCH 1/4] Set default directory
+
+Signed-off-by: Charles Short <charles.short@windriver.com>
+---
+ apt_ostree/cmd/options.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apt_ostree/cmd/options.py b/apt_ostree/cmd/options.py
+index 3ee9675..34512bc 100644
+--- a/apt_ostree/cmd/options.py
++++ b/apt_ostree/cmd/options.py
+@@ -36,7 +36,7 @@ def workspace_option(f):
+         "--workspace",
+         help="Path to the apt-ostree workspace",
+         nargs=1,
+-        default="/var/tmp/apt-ostree",
++        default="/scratch/apt-ostree",
+         required=True,
+         callback=callback
+     )(f)
+-- 
+2.25.1
+
diff --git a/apt-ostree/debian/deb_folder/patches/series b/apt-ostree/debian/deb_folder/patches/series
new file mode 100644
index 00000000..e8c17533
--- /dev/null
+++ b/apt-ostree/debian/deb_folder/patches/series
@@ -0,0 +1 @@
+0001-Set-default-directory.patch
diff --git a/apt-ostree/debian/meta_data.yaml b/apt-ostree/debian/meta_data.yaml
index 40c7d9c7..205e3bac 100644
--- a/apt-ostree/debian/meta_data.yaml
+++ b/apt-ostree/debian/meta_data.yaml
@@ -4,9 +4,9 @@ debver: 0.1
 dl_path:
     name: apt-ostree-0.1.tar.gz
     url: "https://opendev.org/starlingx/apt-ostree/archive/\
-      c79a4e664453bad65d04006d12de197b185e924d.tar.gz"
-    sha256sum: 4e91e63cd6973ed35215436c46673bc22416a6e9d1eb4c82af34f59aed6eda71
-    md5sum: faff65d1bd6c07cda26ff46e75affc63
+          c307ed40b66492c7b8a90a14b49be2f4bfa70aa3.tar.gz"
+    sha256sum: 51730b1f7e8a0f8471d858cb43023f1fe7cf6a2edd54571a76eccd70b16fb387
+    md5sum: d92f498b563d58c27f68b4c6a5551d49
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true