From f4145a957579c486a795c1e9b4f6980ad14519c2 Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 01:01:19 -0500 Subject: [PATCH 01/19] initial package for stardust-black-hole --- anda/stardust/anda.hcl | 8 +++++++ anda/stardust/black-hole.spec | 40 +++++++++++++++++++++++++++++++++++ anda/stardust/update.rhai | 7 ++++++ 3 files changed, 55 insertions(+) create mode 100644 anda/stardust/anda.hcl create mode 100644 anda/stardust/black-hole.spec create mode 100644 anda/stardust/update.rhai diff --git a/anda/stardust/anda.hcl b/anda/stardust/anda.hcl new file mode 100644 index 0000000000..f14c2dc669 --- /dev/null +++ b/anda/stardust/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "stardust-black-hole.spec" + } + labels { + nightly = 1 + } +} \ No newline at end of file diff --git a/anda/stardust/black-hole.spec b/anda/stardust/black-hole.spec new file mode 100644 index 0000000000..0cb2e9763f --- /dev/null +++ b/anda/stardust/black-hole.spec @@ -0,0 +1,40 @@ +%global commit 0b847b6ddc383bfcc1e133a2238a37ce8202fe95 +%global commit_date 20240824 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} +%define __os_install_post %{nil} + +Name: stardust-black-hole +Version: %commit_date.%shortcommit +Release: 1%?dist +Summary: Spatial storage for stardust xr. +URL: https://github.com/StardustXR/black-hole +Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz +License: MIT +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold +Requires: libgcc glibc glibm + +Provides: black-hole +Conflicts: black-hole + +%description +Spatial storage for stardust xr + +%prep +%autosetup -n black-hole-%commit +%cargo_prep_online + +%build +%cargo_build + +%install +%cargo_install + +%files +%_bindir/black-hole +%license LICENSE +%doc README.md + +%changelog +* Sat Sep 7 2024 Owen-sz +- Package StardustXR black-hole \ No newline at end of file diff --git a/anda/stardust/update.rhai b/anda/stardust/update.rhai new file mode 100644 index 0000000000..f2705a6be1 --- /dev/null +++ b/anda/stardust/update.rhai @@ -0,0 +1,7 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("StardustXR/black-hole")); + if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + } + } \ No newline at end of file From 000c885195603d5d139824c0681aa0274625c1fd Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 01:06:48 -0500 Subject: [PATCH 02/19] fix folders --- anda/stardust/{ => black-hole}/anda.hcl | 0 anda/stardust/{ => black-hole}/black-hole.spec | 0 anda/stardust/{ => black-hole}/update.rhai | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename anda/stardust/{ => black-hole}/anda.hcl (100%) rename anda/stardust/{ => black-hole}/black-hole.spec (100%) rename anda/stardust/{ => black-hole}/update.rhai (100%) diff --git a/anda/stardust/anda.hcl b/anda/stardust/black-hole/anda.hcl similarity index 100% rename from anda/stardust/anda.hcl rename to anda/stardust/black-hole/anda.hcl diff --git a/anda/stardust/black-hole.spec b/anda/stardust/black-hole/black-hole.spec similarity index 100% rename from anda/stardust/black-hole.spec rename to anda/stardust/black-hole/black-hole.spec diff --git a/anda/stardust/update.rhai b/anda/stardust/black-hole/update.rhai similarity index 100% rename from anda/stardust/update.rhai rename to anda/stardust/black-hole/update.rhai From 65eb9f91ffc74362d06e47571ddcb6d1fdf08d9b Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 01:16:17 -0500 Subject: [PATCH 03/19] fix .spec file --- .../black-hole/{black-hole.spec => stardust-black-hole.spec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename anda/stardust/black-hole/{black-hole.spec => stardust-black-hole.spec} (100%) diff --git a/anda/stardust/black-hole/black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec similarity index 100% rename from anda/stardust/black-hole/black-hole.spec rename to anda/stardust/black-hole/stardust-black-hole.spec From 3a54472eb931d59a431eef546bba2b1139d138dc Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 01:25:50 -0500 Subject: [PATCH 04/19] change musl to replace glibc --- anda/stardust/black-hole/stardust-black-hole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 0cb2e9763f..ab448369cb 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -12,7 +12,7 @@ URL: https://github.com/StardustXR/black-hole Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold -Requires: libgcc glibc glibm +Requires: libgcc musl glibm Provides: black-hole Conflicts: black-hole From 81813acaa34a7ef331565f6bb90871940e29432a Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 02:03:42 -0500 Subject: [PATCH 05/19] add back glibc --- anda/stardust/black-hole/stardust-black-hole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index ab448369cb..0cb2e9763f 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -12,7 +12,7 @@ URL: https://github.com/StardustXR/black-hole Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold -Requires: libgcc musl glibm +Requires: libgcc glibc glibm Provides: black-hole Conflicts: black-hole From f319f092b814c91af93f80df75060971d2151040 Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 02:41:40 -0500 Subject: [PATCH 06/19] RPM bug workaround --- anda/stardust/black-hole/stardust-black-hole.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 0cb2e9763f..603c64a740 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -1,8 +1,7 @@ %global commit 0b847b6ddc383bfcc1e133a2238a37ce8202fe95 %global commit_date 20240824 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global debug_package %{nil} -%define __os_install_post %{nil} +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-black-hole Version: %commit_date.%shortcommit @@ -36,5 +35,5 @@ Spatial storage for stardust xr %doc README.md %changelog -* Sat Sep 7 2024 Owen-sz +* Sat Sep 8 2024 Owen-sz - Package StardustXR black-hole \ No newline at end of file From 9d7eb95ef1ce3df84e20b2bcd0f0abfc7c6bb813 Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 8 Sep 2024 02:42:31 -0500 Subject: [PATCH 07/19] RPM bug workaround comment --- anda/stardust/black-hole/stardust-black-hole.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 603c64a740..8ac6b72d41 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -1,7 +1,8 @@ %global commit 0b847b6ddc383bfcc1e133a2238a37ce8202fe95 %global commit_date 20240824 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-black-hole Version: %commit_date.%shortcommit From ef942400368311bcb56a1ae6df61fbe56aea1f59 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 8 Sep 2024 02:46:33 -0500 Subject: [PATCH 08/19] Remove glibm as a dep Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 8ac6b72d41..035853e0e2 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -12,7 +12,7 @@ URL: https://github.com/StardustXR/black-hole Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold -Requires: libgcc glibc glibm +Requires: libgcc glibc Provides: black-hole Conflicts: black-hole @@ -37,4 +37,4 @@ Spatial storage for stardust xr %changelog * Sat Sep 8 2024 Owen-sz -- Package StardustXR black-hole \ No newline at end of file +- Package StardustXR black-hole From e1dc09555f5af2b5bec4c7c0a8948c4dc7f1b20f Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 8 Sep 2024 03:08:20 -0500 Subject: [PATCH 09/19] Update stardust-black-hole.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 035853e0e2..7acb4d2538 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -15,7 +15,6 @@ BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc Provides: black-hole -Conflicts: black-hole %description Spatial storage for stardust xr From bae3e4fade515f024eb5f6d878252ad343696af5 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:34:04 -0500 Subject: [PATCH 10/19] Update stardust-black-hole.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 7acb4d2538..a2d1fde892 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -9,7 +9,7 @@ Version: %commit_date.%shortcommit Release: 1%?dist Summary: Spatial storage for stardust xr. URL: https://github.com/StardustXR/black-hole -Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz +Source0: %url/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc @@ -24,7 +24,6 @@ Spatial storage for stardust xr %cargo_prep_online %build -%cargo_build %install %cargo_install From 49d0408b2d9472fc6ba86d97813d80ac2cbbc42e Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:39:44 -0500 Subject: [PATCH 11/19] Update stardust-black-hole.spec Add packager Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index a2d1fde892..6de5e165ce 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -15,6 +15,7 @@ BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc Provides: black-hole +Packager: Owen Zimmerman %description Spatial storage for stardust xr From 6016cf10af8ce13bc0ed325cdca544c183d361e7 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:49:16 -0500 Subject: [PATCH 12/19] Update stardust-black-hole.spec Remove runtime requirements Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 6de5e165ce..af485a5e58 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -12,7 +12,6 @@ URL: https://github.com/StardustXR/black-hole Source0: %url/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold -Requires: libgcc glibc Provides: black-hole Packager: Owen Zimmerman From 3b6b27bbf9b7b279721d898e049bfd89030f8e2d Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:24:03 -0500 Subject: [PATCH 13/19] Update update.rhai Remove if statement from Rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index f2705a6be1..da141f929e 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -1,7 +1 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("StardustXR/black-hole")); - if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); - } - } \ No newline at end of file +rpm.global("commit", gh_commit("StardustXR/black-hole")); From 19ae76d1ecced70f29131c904b02fd0c4277e61a Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:34:58 -0500 Subject: [PATCH 14/19] Update update.rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index da141f929e..e7caa7ddc8 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -1 +1,5 @@ rpm.global("commit", gh_commit("StardustXR/black-hole")); + if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + } From 51ca95ee64799683b2a7cf5de22e429c05c6365d Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:41:09 -0500 Subject: [PATCH 15/19] Update update.rhai fix indentation Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index e7caa7ddc8..8cacd481ac 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -1,5 +1,5 @@ rpm.global("commit", gh_commit("StardustXR/black-hole")); - if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); - } +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} From 914b007c67cce3c234aec42851b527849c44a1bd Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:46:37 -0500 Subject: [PATCH 16/19] Update stardust-black-hole.spec Lock cargo install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index af485a5e58..90eff4ac3d 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -26,6 +26,7 @@ Spatial storage for stardust xr %build %install +%define __cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps --locked %cargo_install %files From a98b7c2c5de661fa14464b66dd40d17e214120be Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:05:33 -0500 Subject: [PATCH 17/19] Update stardust-black-hole.spec Add %summary Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 90eff4ac3d..be28a5c099 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -17,7 +17,7 @@ Provides: black-hole Packager: Owen Zimmerman %description -Spatial storage for stardust xr +%summary %prep %autosetup -n black-hole-%commit From aae460b012a84fa418669d447e4aa3a052bdfad6 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:16:08 -0500 Subject: [PATCH 18/19] Update stardust-black-hole.spec Unify summaries Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index be28a5c099..aea881435f 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -7,7 +7,7 @@ Name: stardust-black-hole Version: %commit_date.%shortcommit Release: 1%?dist -Summary: Spatial storage for stardust xr. +Summary: Spatial storage for Stardust XR. URL: https://github.com/StardustXR/black-hole Source0: %url/archive/%commit/black-hole-%commit.tar.gz License: MIT From f7d536b201b05fef61c6709016cb985b14cab02f Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 15 Sep 2024 20:58:31 -0500 Subject: [PATCH 19/19] Update stardust-black-hole.spec Add environment variable before cargo install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index aea881435f..ea1829c32e 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -27,6 +27,7 @@ Packager: Owen Zimmerman %install %define __cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps --locked +STARDUST_RES_PREFIXES=%_datadir %cargo_install %files