From 68307f055cbdf65d7da7392668d73b7abd86a8ac Mon Sep 17 00:00:00 2001 From: madonuko Date: Thu, 13 Jun 2024 13:22:17 +0800 Subject: [PATCH 01/19] feat(readymade): add readymade installer --- ultramarine/readymade/anda.hcl | 5 +++++ ultramarine/readymade/readymade.spec | 25 +++++++++++++++++++++++++ ultramarine/readymade/update.rhai | 1 + 3 files changed, 31 insertions(+) create mode 100644 ultramarine/readymade/anda.hcl create mode 100644 ultramarine/readymade/readymade.spec create mode 100644 ultramarine/readymade/update.rhai diff --git a/ultramarine/readymade/anda.hcl b/ultramarine/readymade/anda.hcl new file mode 100644 index 0000000..3f252be --- /dev/null +++ b/ultramarine/readymade/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "readymade.spec" + } +} diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec new file mode 100644 index 0000000..0be7be1 --- /dev/null +++ b/ultramarine/readymade/readymade.spec @@ -0,0 +1,25 @@ +Name: readymade +Version: 0.1.0 +Release: 1%?dist +Summary: Install ready-made distribution images! +License: MIT +URL: https://github.com/FyraLabs/readymade +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +BuildRequires: anda-srpm-macros rust-packaging + +%description +Readymade is a Linux Distribution installer based on the great distinst library by System76. + +It is created as a replacement to Red Hat's Anaconda installer for Ultramarine Linux and tauOS after we have heard many complaints about the poor UX design of Anaconda, and the lack of working alternative installers for RPM-based distributions. + +%prep +%autosetup +%cargo_prep_online + +%build + +%install +%cargo_install + +%files +%_bindir/readymade diff --git a/ultramarine/readymade/update.rhai b/ultramarine/readymade/update.rhai new file mode 100644 index 0000000..6a4f29a --- /dev/null +++ b/ultramarine/readymade/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("readymade")); From 2eb8f2f7febe830c768de04a7dfbd8bed2304c40 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 13 Jun 2024 13:54:22 +0800 Subject: [PATCH 02/19] deps --- ultramarine/readymade/readymade.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 0be7be1..5e1adc6 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -6,6 +6,7 @@ License: MIT URL: https://github.com/FyraLabs/readymade Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros rust-packaging +BuildRequires: pkgconfig(libhelium-1) %description Readymade is a Linux Distribution installer based on the great distinst library by System76. From 356a64b1fbfbc6d12ce38b4b7902db957ed22202 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 13 Jun 2024 14:25:18 +0800 Subject: [PATCH 03/19] fix(readymade): dep libclang --- ultramarine/readymade/readymade.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 5e1adc6..3b8c21b 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -7,6 +7,7 @@ URL: https://github.com/FyraLabs/readymade Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros rust-packaging BuildRequires: pkgconfig(libhelium-1) +BuildRequires: clang-devel %description Readymade is a Linux Distribution installer based on the great distinst library by System76. From 960e698eae00e9f770b73be79d079686204a9598 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 13 Jun 2024 14:33:53 +0800 Subject: [PATCH 04/19] fix(readymade): pkgconfig(gnome-desktop-4) --- ultramarine/readymade/readymade.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 3b8c21b..5e199a7 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -7,6 +7,7 @@ URL: https://github.com/FyraLabs/readymade Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros rust-packaging BuildRequires: pkgconfig(libhelium-1) +BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: clang-devel %description From e698d64864be748775a71e25438756035b87a88d Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 15 Jun 2024 11:35:26 +0800 Subject: [PATCH 05/19] Update readymade.spec --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 5e199a7..eee3ae9 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.0 +Version: 0.1.1 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From 518a3ee790fc9bfcd15c1953104c96e7fed9c6ec Mon Sep 17 00:00:00 2001 From: madonuko Date: Sat, 15 Jun 2024 11:55:23 +0800 Subject: [PATCH 06/19] fix: make readymade only available on x86_64 --- ultramarine/readymade/anda.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/readymade/anda.hcl b/ultramarine/readymade/anda.hcl index 3f252be..3ad9eed 100644 --- a/ultramarine/readymade/anda.hcl +++ b/ultramarine/readymade/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "readymade.spec" } From bab6d1feec17728f39c60b7840a4ee1565b7e561 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Jun 2024 00:19:41 +0800 Subject: [PATCH 07/19] feat(readymade): bump to 0.1.2 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index eee3ae9..cda10a4 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.1 +Version: 0.1.2 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From c4069c0e169a217e222a5ad311a4255508166290 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Jun 2024 00:22:00 +0800 Subject: [PATCH 08/19] feat(readymade): bump to 0.1.3 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index cda10a4..e7993e4 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.2 +Version: 0.1.3 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From 65423375593bb3c28b56b4ed1c07f7261491defc Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Jun 2024 00:47:38 +0800 Subject: [PATCH 09/19] feat(readymade): bump version to 0.1.4 --- ultramarine/readymade/readymade.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index e7993e4..106d60d 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.3 +Version: 0.1.4 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT @@ -23,6 +23,8 @@ It is created as a replacement to Red Hat's Anaconda installer for Ultramarine L %install %cargo_install +install -Dpm644 com.fyralabs.pkexec.readymade.policy %buildroot%_datadir/polkit-1/actions/ %files %_bindir/readymade +%_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy From 3b41eb41a0a6b31b3886c0ebf5eb6af2bf586d7d Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Jun 2024 01:07:23 +0800 Subject: [PATCH 10/19] feat(readymade): bump to 0.1.5 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 106d60d..b52b9c3 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.4 +Version: 0.1.5 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From fadc9c4f1a7c150d0b2e1edaa312213238be19ab Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Jun 2024 01:24:44 +0800 Subject: [PATCH 11/19] feat(readymade): bump to 0.1.6 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index b52b9c3..639a482 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.5 +Version: 0.1.6 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From 59899ad7354c6690c23b97cb8a9c977f8cb3822f Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Jun 2024 01:36:31 +0800 Subject: [PATCH 12/19] fix(readymade): com.fyralabs.pkexec.readymade.policy --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 639a482..d495a57 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -23,7 +23,7 @@ It is created as a replacement to Red Hat's Anaconda installer for Ultramarine L %install %cargo_install -install -Dpm644 com.fyralabs.pkexec.readymade.policy %buildroot%_datadir/polkit-1/actions/ +install -Dpm644 com.fyralabs.pkexec.readymade.policy %buildroot%_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy %files %_bindir/readymade From 46c57382a21f11e62dd750ffca896ecb7d975545 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 23 Jun 2024 11:20:23 +0700 Subject: [PATCH 13/19] bump readymade to 0.1.8 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index d495a57..c3a7e35 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.6 +Version: 0.1.8 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From 4293db9286e6e245a30bb00913566e5b6c1ab612 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 23 Jun 2024 12:13:56 +0700 Subject: [PATCH 14/19] feat: bump to 0.1.9 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index c3a7e35..7484c73 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.8 +Version: 0.1.9 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From 873b6cde7923b06c5df5baa700b8c75f7a227260 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 20 Jul 2024 14:51:07 +0800 Subject: [PATCH 15/19] feat(readymade): bump to 0.1.11 --- ultramarine/readymade/readymade.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 7484c73..2e6f021 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.9 +Version: 0.1.11 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT @@ -23,8 +23,11 @@ It is created as a replacement to Red Hat's Anaconda installer for Ultramarine L %install %cargo_install -install -Dpm644 com.fyralabs.pkexec.readymade.policy %buildroot%_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy +./install.sh %buildroot -%files +%find_lang com.fyralabs.Readymade + +%files -f com.fyralabs.Readymade.lang %_bindir/readymade %_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy +%_datadir/readymade From 7a5af08bbc17f6783441ab1ec5616011b2b2fef5 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 1 Aug 2024 21:53:33 +0800 Subject: [PATCH 16/19] chore(readymade): bump to 0.1.12 --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 2e6f021..3bcd1ac 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.11 +Version: 0.1.12 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From bbbea121f8606be3b74515941351a5ccfe31b21a Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 8 Dec 2024 00:42:57 -0800 Subject: [PATCH 17/19] bump rdm --- ultramarine/readymade/anda.hcl | 1 - ultramarine/readymade/readymade.spec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ultramarine/readymade/anda.hcl b/ultramarine/readymade/anda.hcl index 3ad9eed..3f252be 100644 --- a/ultramarine/readymade/anda.hcl +++ b/ultramarine/readymade/anda.hcl @@ -1,5 +1,4 @@ project pkg { - arches = ["x86_64"] rpm { spec = "readymade.spec" } diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 3bcd1ac..810ed73 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.1.12 +Version: 0.2.0 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From 7ac727e31be4d39786b484f3ad1474f6fb43e44f Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 8 Dec 2024 00:47:25 -0800 Subject: [PATCH 18/19] pull in mold --- ultramarine/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 810ed73..450eae5 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -5,7 +5,7 @@ Summary: Install ready-made distribution images! License: MIT URL: https://github.com/FyraLabs/readymade Source0: %{url}/archive/refs/tags/v%{version}.tar.gz -BuildRequires: anda-srpm-macros rust-packaging +BuildRequires: anda-srpm-macros rust-packaging mold BuildRequires: pkgconfig(libhelium-1) BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: clang-devel From 2e8a5220ac3be2335133caa1307f8802bf957806 Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 8 Dec 2024 01:00:33 -0800 Subject: [PATCH 19/19] include readymade.toml --- ultramarine/readymade/readymade.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ultramarine/readymade/readymade.spec b/ultramarine/readymade/readymade.spec index 450eae5..d66acba 100644 --- a/ultramarine/readymade/readymade.spec +++ b/ultramarine/readymade/readymade.spec @@ -31,3 +31,4 @@ It is created as a replacement to Red Hat's Anaconda installer for Ultramarine L %_bindir/readymade %_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy %_datadir/readymade +%_sysconfdir/readymade.toml