From 5b6ecd6f5d5ee55f31102f6b5b8549ddfcb05d9f Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Wed, 8 Jan 2025 18:10:42 +0900 Subject: [PATCH 1/2] Initial version for 10 Kitten --- almalinux-raspberrypi.repo | 19 +++++++++--------- almalinux-release-raspberrypi.spec | 19 +++++------------- rootfs-expand | 31 ------------------------------ 3 files changed, 15 insertions(+), 54 deletions(-) delete mode 100755 rootfs-expand diff --git a/almalinux-raspberrypi.repo b/almalinux-raspberrypi.repo index 4545100..b1dcf06 100644 --- a/almalinux-raspberrypi.repo +++ b/almalinux-raspberrypi.repo @@ -1,27 +1,28 @@ -# Raspberry PI repo for AlmaLinux +# Raspberry Pi repo for AlmaLinux [raspberrypi] name=AlmaLinux $releasever - Raspberry Pi mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/raspberrypi -# baseurl=https://repo.almalinux.org/almalinux/$releasever/raspberrypi/$basearch/os/ +mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/raspberrypi +# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/raspberrypi/$basearch/os/ gpgcheck=1 enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10 ## Sources [raspberrypi-source] name=AlmaLinux $releasever - Raspberry Pi Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/raspberrypi-source -# baseurl=https://repo.almalinux.org/vault/$releasever/raspberrypi/Source/ +mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/raspberrypi-source +# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/raspberrypi/Source/$basearch/ gpgcheck=1 enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10 ## Debug [raspberrypi-debuginfo] name=AlmaLinux $releasever - Raspberry Pi debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/raspberrypi-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/raspberrypi/debug/$basearch/ +mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/raspberrypi-debug/ +# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/raspberrypi/debug/$basearch/ gpgcheck=1 enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10 diff --git a/almalinux-release-raspberrypi.spec b/almalinux-release-raspberrypi.spec index d25aa84..3717030 100644 --- a/almalinux-release-raspberrypi.spec +++ b/almalinux-release-raspberrypi.spec @@ -1,32 +1,23 @@ Summary: Raspberry Pi support packages from the AlmaLinux Core SIG repository Name: almalinux-release-raspberrypi -Version: 9 -Release: 3%{?dist} +Version: 10 +Release: 1%{?dist} License: GPLv2 URL: https://wiki.almalinux.org/sigs/Core Source0: almalinux-raspberrypi.repo -Source1: rootfs-expand -Provides: almalinux-release-raspberrypi = 9 +Provides: almalinux-release-raspberrypi = 10 %description yum configuration for Raspberry Pi support packages from the AlmaLinux Core SIG. %install install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/almalinux-raspberrypi.repo -install -D -m 750 %{SOURCE1} %{buildroot}%{_bindir}/rootfs-expand %files %defattr(-,root,root) -%{_bindir}/rootfs-expand %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-raspberrypi.repo %changelog -* Wed May 24 2023 Andrew Lukoshko - 9-3 -- Update Source and debug URLs - -* Wed Apr 19 2023 Koichiro Iwao - 9-2 -- Fix wrong GPG key path - -* Fri May 27 2022 Eduard Abdullin - 9-1 -- Initial version +* Wed Jan 08 2025 Koichiro Iwao - 10-1 +- Initial version diff --git a/rootfs-expand b/rootfs-expand deleted file mode 100755 index baab79a..0000000 --- a/rootfs-expand +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -clear -part=$(mount |grep '^/dev.* / ' |awk '{print $1}') -if [ -z "$part" ];then - echo "Error detecting rootfs" - exit -1 -fi -dev=$(echo $part|sed 's/[0-9]*$//g') -devlen=${#dev} -num=${part:$devlen} -if [[ "$dev" =~ ^/dev/mmcblk[0-9]*p$ ]];then - dev=${dev:0:-1} -fi -if [ ! -x /usr/bin/growpart ];then - echo "Please install cloud-utils-growpart (sudo yum install cloud-utils-growpart)" - exit -2 -fi -if [ ! -x /usr/sbin/resize2fs ];then - echo "Please install e2fsprogs (sudo yum install e2fsprogs)" - exit -3 -fi -echo $part $dev $num - -echo "Extending partition $num to max size ...." -growpart $dev $num -echo "Resizing ext4 filesystem ..." -resize2fs $part -echo "Done." -df -h |grep $part - From d6921fa6025e4f11ce6d3d39bc2ce6ee68fdd126 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Wed, 8 Jan 2025 20:54:09 +0900 Subject: [PATCH 2/2] Remove wrong mirrorlist and trailing slash --- almalinux-raspberrypi.repo | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/almalinux-raspberrypi.repo b/almalinux-raspberrypi.repo index b1dcf06..0970dd2 100644 --- a/almalinux-raspberrypi.repo +++ b/almalinux-raspberrypi.repo @@ -2,7 +2,6 @@ [raspberrypi] name=AlmaLinux $releasever - Raspberry Pi -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/raspberrypi mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/raspberrypi # baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/raspberrypi/$basearch/os/ gpgcheck=1 @@ -21,7 +20,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10 ## Debug [raspberrypi-debuginfo] name=AlmaLinux $releasever - Raspberry Pi debuginfo -mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/raspberrypi-debug/ +mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/raspberrypi-debug # baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/raspberrypi/debug/$basearch/ gpgcheck=1 enabled=0