diff --git a/build-blivet.sh b/build-blivet.sh index 5e15774..9f630c2 100755 --- 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 index ff1b51a..2c4e60d 100755 --- 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 deleted file mode 100644 index 8069b53..0000000 --- a/repo/t2linux-fedora-ci.pub +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEY0X1aRYJKwYBBAHaRw8BAQdAmNo1eWpPXLIygDXh1Gbr/dBbd8PBzpmPaK+u -nGRotJa0bXQybGludXgtZmVkb3JhIENJIChTaWduaW5nIGtleSBmb3IgU2hhcnBl -bmVkIEJsYWRlJ3MgdDJsaW51eCBrZXJuZWxzIGJ1aWx0IGJ5IENJLikgPHNoYXJw -ZW5lZGJsYWRlQHByb3Rvbi5tZT6IkwQTFgoAOxYhBCUj4Hdoi2fZ8VBmC5zv2qdm -TEDFBQJjRfVpAhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEJzv2qdm -TEDFT9AA/1pH+tvcxeMr/jvtnWhCcjdy3vFoXP1pK/bPU8bPvVWNAQCNLxdIDv9T -+yPcGp3+CRSunRtYUtJGfc1t8riLP3MtC7g4BGNF9WkSCisGAQQBl1UBBQEBB0DL -cRN1+FEWpNTBnO/EtYeaCRnpZKhcIYGJfjFj6IshXQMBCAeIeAQYFgoAIBYhBCUj -4Hdoi2fZ8VBmC5zv2qdmTEDFBQJjRfVpAhsMAAoJEJzv2qdmTEDFHZYBAN9Dh3wA -3nOhD/PozHhpvM9axFniLilVHbnN0MxpPHbVAQC5+nSSa7hmHTcyrkwO+2ERUOxT -ZckrRoEl9LY5BQY+AA== -=rpI3 ------END PGP PUBLIC KEY BLOCK----- diff --git a/repo/t2linux-fedora.pub b/repo/t2linux-fedora.pub new file mode 100644 index 0000000..7f58e36 Binary files /dev/null and b/repo/t2linux-fedora.pub differ diff --git a/repo/t2linux-fedora.repo b/repo/t2linux-fedora.repo index 2d615fb..13ae0fd 100644 --- 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 index ffafd34..7ea7b4d 100644 --- 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 index 7b01384..e0d13bf 100644 --- 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