From 3e0db90497a28784231c89ef3913ed641bf1b9fa Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:29:17 +0000 Subject: [PATCH] import UBI rootfiles-8.1-41.el10 --- .fmf/version | 1 - ci.fmf | 1 - dot-bash_profile | 4 --- dot-bashrc | 22 ++++++++---- gating.yaml | 25 ------------- plans.fmf | 36 ------------------- rootfiles.conf | 6 ++++ rootfiles.spec | 94 ++++++++++++++++++++++++++++++++++++++++++------ sources | 0 9 files changed, 106 insertions(+), 83 deletions(-) delete mode 100644 .fmf/version delete mode 100644 ci.fmf delete mode 100644 gating.yaml delete mode 100644 plans.fmf create mode 100644 rootfiles.conf delete mode 100644 sources diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/dot-bash_profile b/dot-bash_profile index 3dc099a..55136b9 100644 --- a/dot-bash_profile +++ b/dot-bash_profile @@ -6,7 +6,3 @@ if [ -f ~/.bashrc ]; then fi # User specific environment and startup programs - -PATH=$PATH:$HOME/bin - -export PATH diff --git a/dot-bashrc b/dot-bashrc index 6e6d1e1..c2ad94d 100644 --- a/dot-bashrc +++ b/dot-bashrc @@ -1,12 +1,22 @@ # .bashrc -# User specific aliases and functions - -alias rm='rm -i' -alias cp='cp -i' -alias mv='mv -i' - # Source global definitions if [ -f /etc/bashrc ]; then . /etc/bashrc fi + +# User specific environment +if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]] +then + PATH="$HOME/.local/bin:$HOME/bin:$PATH" +fi +export PATH + +# Uncomment the following line if you don't like systemctl's auto-paging feature: +# export SYSTEMD_PAGER= + +# User specific aliases and functions + +alias rm='rm -i' +alias cp='cp -i' +alias mv='mv -i' diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index b8d65b0..0000000 --- a/gating.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} - -#Rawhide ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} - -#gating rhel ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf deleted file mode 100644 index 814828a..0000000 --- a/plans.fmf +++ /dev/null @@ -1,36 +0,0 @@ -/tier1-internal: - plan: - import: - url: https://src.fedoraproject.org/tests/rootfiles.git - name: /plans/tier1/internal - -/tier1-public: - plan: - import: - url: https://src.fedoraproject.org/tests/rootfiles.git - name: /plans/tier1/public - -/tier2-tier3-internal: - plan: - import: - url: https://src.fedoraproject.org/tests/rootfiles.git - name: /plans/tier2-tier3/internal - -/tier2-tier3-public: - plan: - import: - url: https://src.fedoraproject.org/tests/rootfiles.git - name: /plans/tier2-tier3/public - -/others-internal: - plan: - import: - url: https://src.fedoraproject.org/tests/rootfiles.git - name: /plans/others/internal - -/others-public: - plan: - import: - url: https://src.fedoraproject.org/tests/rootfiles.git - name: /plans/others/public - diff --git a/rootfiles.conf b/rootfiles.conf new file mode 100644 index 0000000..d4da612 --- /dev/null +++ b/rootfiles.conf @@ -0,0 +1,6 @@ +# create initial /root directories shell content +C /root/.bash_logout 644 root root - /usr/share/rootfiles/.bash_logout +C /root/.bash_profile 644 root root - /usr/share/rootfiles/.bash_profile +C /root/.bashrc 644 root root - /usr/share/rootfiles/.bashrc +C /root/.cshrc 644 root root - /usr/share/rootfiles/.cshrc +C /root/.tcshrc 644 root root - /usr/share/rootfiles/.tcshrc diff --git a/rootfiles.spec b/rootfiles.spec index 1e8e799..cb2921c 100644 --- a/rootfiles.spec +++ b/rootfiles.spec @@ -1,9 +1,8 @@ Summary: The basic required files for the root user's directory Name: rootfiles Version: 8.1 -Release: 22%{?dist} -License: Public Domain -Group: System Environment/Base +Release: 41%{?dist} +License: LicenseRef-Not-Copyrightable # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from @@ -13,8 +12,12 @@ Source1: dot-bash_profile Source2: dot-bash_logout Source3: dot-tcshrc Source4: dot-cshrc +Source5: rootfiles.conf + +%define ROOTFILES_DIR %{_datadir}/rootfiles BuildArch: noarch +BuildRequires: systemd-rpm-macros %description The rootfiles package contains basic required files that are placed @@ -25,24 +28,95 @@ users' home directories. %prep %install -mkdir -p $RPM_BUILD_ROOT/root +mkdir -p $RPM_BUILD_ROOT/%{ROOTFILES_DIR} +install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_tmpfilesdir}/rootfiles.conf for file in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do f=`basename $file` - install -p -m 644 $file $RPM_BUILD_ROOT/root/${f/dot-/.} + install -p -m 644 $file $RPM_BUILD_ROOT/%{ROOTFILES_DIR}/${f/dot-/.} done %posttrans -if [ $1 -eq 0 ] ; then +#if [ $1 -eq 0 ] ; then #copy recursively the content, but do not overwrite the original files provided by rootfiles package - cp -ndr --preserve=ownership,timestamps /etc/skel/. /root/ || : -fi + # NOTE: This has been broken by the conversion to tmpfiles. I see only one way to make it + # work: to synthetize a tmpfiles entry for each of these additional files/dirs. That seems like + # a lot of effort to continue supporting a feature for which there's likely not a high demand... + # cp -ndr --preserve=ownership,timestamps /etc/skel/. %{ROOTFILES_DIR}/ || : +#fi %files -%defattr(-,root,root,-) -%config(noreplace) /root/.[A-Za-z]* +%dir %{ROOTFILES_DIR} +%{ROOTFILES_DIR}/.[A-Za-z]* +%{_tmpfilesdir}/rootfiles.conf +%ghost /root/.bash_logout +%ghost /root/.bash_profile +%ghost /root/.bashrc +%ghost /root/.cshrc +%ghost /root/.tcshrc %changelog +* Wed Feb 12 2025 Martin Osvald - 8.1-41 +- Comment out empty if clause to prevent shell error (RHEL-76497) + +* Thu Jan 30 2025 David Tardon - 8.1-40 +- Fix tmpfiles rules (RHEL-76497) + +* Tue Jan 28 2025 David Tardon - 8.1-39 +- Use tmpfiles.d to create initial /root directory (RHEL-76497) + +* Tue Oct 29 2024 Troy Dawson - 8.1-38 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 8.1-37 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 8.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 8.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 8.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 8.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 8.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 8.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 8.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 8.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 8.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 8.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 11 2019 Till Maas - 8.1-26 +- Sync in current files from bash package: + https://src.fedoraproject.org/rpms/bash/c/739b272e5f5d10cf27a847a44d09eb7f4b6ec89b?branch=master + https://src.fedoraproject.org/rpms/bash/c/329df36f8bbc303be618f06562ec2c4eebfd1d29?branch=master + https://src.fedoraproject.org/rpms/bash/c/e3b3cd9cec4a3bd12a792536c0ea131f5ba5bd72?branch=master + +* Fri Jul 26 2019 Fedora Release Engineering - 8.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 8.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 8.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 8.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000