mirror of
https://git.rockylinux.org/staging/src/rocky-release.git
synced 2024-06-01 18:50:14 +00:00
Compare commits
7 Commits
r9
...
imports/r8
Author | SHA1 | Date | |
---|---|---|---|
|
43ece60087 | ||
|
0a9f2b06c0 | ||
|
ceac5c3f35 | ||
|
58775a220e | ||
|
420b21978b | ||
|
909ece8efd | ||
|
dadf44424c |
|
@ -7,4 +7,5 @@ enable lightdm.service
|
|||
enable slim.service
|
||||
enable lxdm.service
|
||||
enable kdm.service
|
||||
enable sddm.service
|
||||
enable xdm.service
|
||||
|
|
|
@ -93,7 +93,7 @@ enable rngd.service
|
|||
|
||||
# Other stuff
|
||||
enable abrtd.service
|
||||
enable abrt-ccpp.service
|
||||
enable abrt-journal-core.service
|
||||
enable abrt-oops.service
|
||||
enable abrt-xorg.service
|
||||
enable abrt-vmcore.service
|
||||
|
@ -114,7 +114,6 @@ enable accounts-daemon.service
|
|||
enable rtkit-daemon.service
|
||||
enable upower.service
|
||||
enable udisks2.service
|
||||
enable polkit.service
|
||||
enable packagekit-offline-update.service
|
||||
enable PackageKit.service
|
||||
|
||||
|
@ -158,3 +157,40 @@ enable device_cio_free.service
|
|||
# Enable the stratis daemon for managing stratis storage
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1632510
|
||||
enable stratisd.service
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1817591
|
||||
enable mlocate-updatedb.timer
|
||||
|
||||
# nvme auto connect
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1805466
|
||||
enable nvmefc-boot-connections.service
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1683101
|
||||
enable nfs-convert.service
|
||||
|
||||
# OSTree based systems need to remount /sysroot and
|
||||
# /var as rw via ostree-remount.service
|
||||
# ignored by non-OSTree based systems
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1848453
|
||||
enable ostree-remount.service
|
||||
|
||||
# enable greenboot services
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1935177
|
||||
enable greenboot-grub2-set-counter.service
|
||||
enable greenboot-grub2-set-success.service
|
||||
enable greenboot-healthcheck.service
|
||||
enable greenboot-rpm-ostree-grub2-check-fallback.service
|
||||
enable greenboot-status.service
|
||||
enable greenboot-task-runner.service
|
||||
enable redboot-auto-reboot.service
|
||||
enable redboot-task-runner.service
|
||||
|
||||
# enable dbus services
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1941642
|
||||
# https://projects.engineering.redhat.com/browse/RHELBLD-6131
|
||||
enable dbus.socket
|
||||
enable dbus-daemon.service
|
||||
|
||||
# enable nfs-client.target
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1967515
|
||||
enable nfs-client.target
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=1
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=1
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -7,4 +7,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=1
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAva
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$re
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nfv/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockypl
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTo
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$rel
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -14,4 +14,5 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie
|
|||
#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
|
||||
gpgcheck=1
|
||||
enabled=0
|
||||
countme=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
%define distro_name Rocky Linux
|
||||
%define distro_code Green Obsidian
|
||||
%define major 8
|
||||
%define minor 4
|
||||
%define rocky_rel 35
|
||||
%define minor 6
|
||||
%define rocky_rel 1
|
||||
%define upstream_rel %{major}.%{minor}
|
||||
%define rpm_license BSD-3-Clause
|
||||
|
||||
|
@ -138,7 +138,7 @@ VERSION_ID="%{major}.%{minor}"
|
|||
PLATFORM_ID="platform:el%{major}"
|
||||
PRETTY_NAME="%{distro_name} %{major}.%{minor} (%{distro_code})"
|
||||
ANSI_COLOR="0;32"
|
||||
CPE_NAME="cpe:/o:rocky:rocky:%{major}.%{minor}:GA"
|
||||
CPE_NAME="cpe:/o:rocky:rocky:%{base_release_version}:GA"
|
||||
HOME_URL="https://rockylinux.org/"
|
||||
BUG_REPORT_URL="https://bugs.rockylinux.org/"
|
||||
ROCKY_SUPPORT_PRODUCT="%{distro_name}"
|
||||
|
@ -149,7 +149,7 @@ EOF
|
|||
ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
|
||||
|
||||
# write cpe to /etc/system/release-cpe
|
||||
echo "cpe:/o:rocky:rocky:%{major}.%{minor}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe
|
||||
echo "cpe:/o:rocky:rocky:%{base_release_version}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe
|
||||
|
||||
# create /etc/issue and /etc/issue.net
|
||||
echo '\S' > %{buildroot}%{_sysconfdir}/issue
|
||||
|
@ -162,12 +162,13 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/rpm
|
|||
cat > %{buildroot}%{_sysconfdir}/rpm/macros.dist << EOF
|
||||
# dist macros.
|
||||
|
||||
%%__bootstrap ~bootstrap
|
||||
%%rocky_ver %{major}
|
||||
%%rocky %{major}
|
||||
%%centos_ver %{major}
|
||||
%%centos %{major}
|
||||
%%rhel %{major}
|
||||
%%dist .el%{major}
|
||||
%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}}
|
||||
%%el%{major} 1
|
||||
EOF
|
||||
|
||||
|
@ -235,6 +236,21 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
|
|||
%{_sysconfdir}/pki/rpm-gpg/
|
||||
|
||||
%changelog
|
||||
* Tue Mar 29 2022 Louis Abel <label@rockylinux.org> - 8.6-1
|
||||
- 8.6 prepatory release
|
||||
|
||||
* Mon Feb 14 2022 Louis Abel <label@rockylinux.org> - 8.5-4
|
||||
- Add bootstrap to macros to match EL9
|
||||
|
||||
* Tue Dec 21 2021 Louis Abel <label@rockylinux.org> - 8.5-3
|
||||
- Add countme=1 to base repositories
|
||||
|
||||
* Sat Dec 11 2021 Louis Abel <label@rockylinux.org> - 8.5-2
|
||||
- Fix CPE to match upstreamed Rocky data
|
||||
|
||||
* Tue Oct 05 2021 Louis Abel <label@rockylinux.org> - 8.5-1
|
||||
- 8.5 prepatory release
|
||||
|
||||
* Mon Sep 13 2021 Louis Abel <label@rockylinux.org> - 8.4-35
|
||||
- Add missing CentOS provides and symlinks
|
||||
- Add centos macros for some builds to complete successfully without relying
|
||||
|
|
Loading…
Reference in New Issue
Block a user