From 16f1bc818c0b4f29e33c1d5cc2bb87612b422d04 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 15 2020 15:27:11 +0000 Subject: [PATCH 1/5] Relax centos-repos dependency a bit --- diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index fe26fd7..f866492 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -50,7 +50,7 @@ Provides: centos-release-eula Provides: redhat-release-eula Requires: centos-gpg-keys = %{version}-%{release} -Requires: centos-repos = %{version}-%{release} +Requires: centos-repos >= %{version}-%{release} Source1: 85-display-manager.preset Source2: 90-default.preset From 5c05e5b2ad3d897be66af3533fd292fdcbf22114 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 15 2020 15:49:17 +0000 Subject: [PATCH 2/5] Remove update-boot Signed-off-by: Pablo Greco --- diff --git a/SOURCES/update-boot b/SOURCES/update-boot deleted file mode 100755 index 8b4eba5..0000000 --- a/SOURCES/update-boot +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo "Starting with CentOS 7.5.1804, this script is obsoleted by grubby" -exit 0 diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index f866492..0b7eb46 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -58,7 +58,6 @@ Source3: 99-default-disable.preset Source10: RPM-GPG-KEY-centosofficial Source11: RPM-GPG-KEY-centostesting -Source99: update-boot Source100: rootfs-expand Source200: EULA @@ -218,7 +217,6 @@ install -m 0644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ %ifarch %{arm} # Install armhfp specific tools mkdir -p %{buildroot}/%{_bindir}/ -install -m 0755 %{SOURCE99} %{buildroot}%{_bindir}/ install -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/ %endif @@ -244,7 +242,6 @@ rm -rf %{buildroot} %{_prefix}/lib/os-release %{_prefix}/lib/systemd/system-preset/* %ifarch %{arm} -%attr(0755,root,root) %{_bindir}/update-boot %attr(0755,root,root) %{_bindir}/rootfs-expand %endif From 981821485ecd4de661c0fad583affe8af0c88be8 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 15 2020 15:52:21 +0000 Subject: [PATCH 3/5] Install rootfs-expand in aarch64 too Signed-off-by: Pablo Greco --- diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index 0b7eb46..3aa9ebe 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -214,10 +214,9 @@ install -m 0644 %{SOURCE1} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE2} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ -%ifarch %{arm} -# Install armhfp specific tools -mkdir -p %{buildroot}/%{_bindir}/ -install -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/ +%ifarch %{arm} aarch64 +# Install armhfp/aarch64 specific tools +install -D -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/rootfs-expand %endif @@ -241,7 +240,7 @@ rm -rf %{buildroot} %{_datadir}/centos-release/* %{_prefix}/lib/os-release %{_prefix}/lib/systemd/system-preset/* -%ifarch %{arm} +%ifarch %{arm} aarch64 %attr(0755,root,root) %{_bindir}/rootfs-expand %endif From 842a9d72d0678c20dc606ac3ff5468874e284631 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 15 2020 16:27:34 +0000 Subject: [PATCH 4/5] Stop requiring extlinux-bootloader Signed-off-by: Pablo Greco --- diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index 3aa9ebe..df731eb 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -37,7 +37,6 @@ License: GPLv2 %define pkg_name centos-userland-release %package -n %{pkg_name} Summary: %{product_family} release file -Requires: extlinux-bootloader %endif Provides: centos-release = %{version}-%{release} Provides: centos-release(upstream) = %{upstream_rel} From 9b09d69005c98a802cc59feeed56b6069ef101ca Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 15 2020 16:27:34 +0000 Subject: [PATCH 5/5] Bump release for 8.2 Signed-off-by: Pablo Greco --- diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index df731eb..abe3a1b 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -16,9 +16,9 @@ %define base_release_version 8 %define full_release_version 8 %define dist_release_version 8 -%define upstream_rel_long 8.1-0 -%define upstream_rel 8.1 -%define centos_rel 1.1911 +%define upstream_rel_long 8.2-0 +%define upstream_rel 8.2 +%define centos_rel 2.2004 #define beta Beta %define dist .el%{dist_release_version} @@ -27,7 +27,7 @@ Name: centos-release Version: %{upstream_rel} -Release: %{centos_rel}.0.9%{?dist} +Release: %{centos_rel}.0.1%{?dist} Summary: %{product_family} release file Group: System Environment/Base License: GPLv2 @@ -251,6 +251,12 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Fri May 15 2020 Pablo Greco - 8-2.0.1 +- Relax dependency for centos-repos +- Remove update_boot, it was never used in 8 +- Add rootfs_expand to aarch64 +- Bump release for 8.2 + * Thu Mar 12 2020 bstinson@centosproject.org - 8-1.0.9 - Add the Devel repo to centos-release - Install os-release(5) content to /usr/lib and have /etc/os-release be a symlink (ngompa)pr#9