Fix: msm-cros-efs-loader (#2557) (#2558)

* FIx: msm-cros-efs-loader name as to not conflict with fedora package Signed-off-by: Owen Zimmerman <[email protected]> * Provide fedora package name * remove qrtr, in kernel now --------- Signed-off-by: Owen Zimmerman <[email protected]> (cherry picked from commit da4b02d) Co-authored-by: Owen Zimmerman <[email protected]>
terrapkg · Dec 4, 2024 · 3d1c709 · 3d1c709
1 parent 3c69720
commit 3d1c709
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.service b/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=EFS loader for Qualcomm-based Chrome OS devices
-Requires=qrtr-ns.service
-After=qrtr-ns.service
 
 [Service]
 ExecStartPre=/usr/bin/msm-cros-efs-loader

diff --git a/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.spec b/anda/system/msm-cros-efs-loader/msm-cros-efs-loader.spec
@@ -1,4 +1,4 @@
-Name:                   msm-cros-efs-loader
+Name:                   terra-msm-cros-efs-loader
 Version:                1.0.2
 Release:                1%?dist
 Summary:                EFS loader for Qualcomm-based Chrome OS devices
@@ -9,6 +9,8 @@ Source1:                msm-cros-efs-loader.service
 Requires:               rmtfs crossystem
 BuildArch:              noarch
 Packager:               WeirdTreeThing <[email protected]>
+Conflicts:              msm-cros-efs-loader
+Provides:               msm-cros-efs-loader
 
 %{?systemd_requires}
 BuildRequires:  systemd-rpm-macros
@@ -20,7 +22,7 @@ EFS loader for Qualcomm-based Chrome OS devices
 %autosetup -n msm-cros-efs-loader-v%{version}
 
 %install
-install -Dm755 %{name}.sh %{buildroot}/usr/bin/%{name}
+install -Dm755 msm-cros-efs-loader.sh %{buildroot}/usr/bin/msm-cros-efs-loader
 install -Dm644 %SOURCE1 %{buildroot}/%{_unitdir}/msm-cros-efs-loader.service
 
 %post
@@ -33,7 +35,7 @@ install -Dm644 %SOURCE1 %{buildroot}/%{_unitdir}/msm-cros-efs-loader.service
 %systemd_postun_with_restart 88-ultramarine-chromebook-default.preset
 
 %files
-%_bindir/%name
+%_bindir/msm-cros-efs-loader
 %{_unitdir}/msm-cros-efs-loader.service
 
 %changelog