Rotate signing key.

t2linux · Jan 20, 2023 · a5d9120 · a5d9120
1 parent e5bbe02
commit a5d9120
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 26 deletions.
diff --git a/build-blivet.sh b/build-blivet.sh
@@ -24,9 +24,9 @@ mv -f /repo/python-blivet.spec /repo/rpmbuild/SPECS/python-blivet.spec
 
 echo "=====IMPORTING KEYS====="
 gpg --import /repo/rpm_signing_key
-rpm --import /repo/repo/t2linux-fedora-ci.pub
+rpm --import /repo/repo/t2linux-fedora.pub
 rm -rfv /repo/rpm_signing_key
-echo -e "%_signature gpg\n%_gpg_name t2linux-fedora CI" > ~/.rpmmacros
+echo -e "%_signature gpg\n%_gpg_name T2Linux Fedora" > ~/.rpmmacros
 
 echo "=====BUILDING====="
 cd "/root/rpmbuild"/SPECS

diff --git a/build.sh b/build.sh
@@ -71,9 +71,9 @@ sed -i "s@$KERNEL_TMP@@" /root/rpmbuild/SOURCES/linux-kernel-test.patch
 
 echo "=====IMPORTING KEYS====="
 gpg --import /repo/rpm_signing_key
-rpm --import /repo/repo/t2linux-fedora-ci.pub
+rpm --import /repo/repo/t2linux-fedora.pub
 rm -rfv /repo/rpm_signing_key
-echo -e "%_signature gpg\n%_gpg_name t2linux-fedora CI" > ~/.rpmmacros
+echo -e "%_signature gpg\n%_gpg_name T2Linux Fedora" > ~/.rpmmacros
 
 echo "=====BUILDING====="
 cd "/root/rpmbuild"/SPECS

diff --git a/repo/t2linux-fedora-ci.pub b/repo/t2linux-fedora-ci.pub
diff --git a/repo/t2linux-fedora.pub b/repo/t2linux-fedora.pub
diff --git a/repo/t2linux-fedora.repo b/repo/t2linux-fedora.repo
@@ -5,4 +5,4 @@ enabled=1
 gpgcheck=1
 cost=998
 priority=98
-gpgkey=file:///etc/pki/rpm-gpg/t2linux-fedora-ci.pub
+gpgkey=file:///etc/pki/rpm-gpg/t2linux-fedora.pub
diff --git a/t2linux-config.spec b/t2linux-config.spec
@@ -1,6 +1,6 @@
 Name: t2linux-config
 Version: 6.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System configuration for linux on t2 macs.
 License: MIT
 
@@ -49,7 +49,6 @@ done
 
 %post
 grubby --args="intel_iommu=on iommu=pt pcie_ports=compat" --update-kernel=ALL
-echo "IF YOUR WIFI ISNT WORKING REINSTALL THE KERNEL AFTER DELETEING THE OLD KERNEL FROM THE CACHE."
 
 %files
 /etc/modules-load.d/t2linux.conf

diff --git a/t2linux-repo.spec b/t2linux-repo.spec
@@ -1,11 +1,11 @@
 Name: t2linux-repo
-Version: 3.0.0
+Version: 4.0.0
 Release: 1%{?dist}
 Summary: DNF Repo for linux on t2 macs.
 License: MIT
 
 URL: https://github.com/sharpenedblade/t2linux-fedora-kernel
-Source0: t2linux-fedora-ci.pub
+Source0: t2linux-fedora.pub
 Source1: t2linux-fedora.repo
 
 %description
@@ -17,7 +17,7 @@ DNF repo files for linux on t2 macs.
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-install -m 644 %{_sourcedir}/t2linux-fedora-ci.pub $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+install -m 644 %{_sourcedir}/t2linux-fedora.pub $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 install -m 644 %{_sourcedir}/t2linux-fedora.repo $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -28,4 +28,4 @@ install -m 644 %{_sourcedir}/t2linux-fedora.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 %dir /etc/yum.repos.d
 %config /etc/yum.repos.d/t2linux-fedora.repo
 %dir /etc/pki/rpm-gpg	
-/etc/pki/rpm-gpg/t2linux-fedora-ci.pub
+/etc/pki/rpm-gpg/t2linux-fedora.pub