Skip to content

Commit

Permalink
[systemd] Drop rpm macro compat symlink
Browse files Browse the repository at this point in the history
Likely not needed anymore.
Also it was a dangling link pointing to /usr/lib64 on aarch64.
  • Loading branch information
nephros authored and nephros committed Oct 9, 2024
1 parent d106b01 commit 9416afc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
9 changes: 0 additions & 9 deletions rpm/systemd-mini.spec
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,6 @@ install -m 644 %{SOURCE2} %{buildroot}/opt/tests/systemd-tests
rm -rf %{buildroot}/%{_docdir}
%endif

# systemd macros
# Old rpm versions assume macros in /etc/rpm/
# New ones support /usr/lib/rpm/macros.d/
# Systemd naturually uses later one
# But we support both by adding link
mkdir -p %{buildroot}%{_sysconfdir}/rpm
ln -s %{_libdir}/rpm/macros.d/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd

# Remove unneeded files
rm %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh

Expand Down Expand Up @@ -478,7 +470,6 @@ for a in `find /etc/systemd/system -type l ! -exec test -e {} \; -print`; do sta
%ghost %{_sysconfdir}/udev/hwdb.bin
%{_rpmconfigdir}/macros.d/macros.systemd
%dir %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/rpm/macros.systemd
%{_bindir}/systemctl
%{_bindir}/systemd-notify
%{_bindir}/systemd-escape
Expand Down
9 changes: 0 additions & 9 deletions rpm/systemd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,6 @@ install -m 644 %{SOURCE2} %{buildroot}/opt/tests/systemd-tests
rm -rf %{buildroot}/%{_docdir}
%endif

# systemd macros
# Old rpm versions assume macros in /etc/rpm/
# New ones support /usr/lib/rpm/macros.d/
# Systemd naturually uses later one
# But we support both by adding link
mkdir -p %{buildroot}%{_sysconfdir}/rpm
ln -s %{_libdir}/rpm/macros.d/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd

# Remove unneeded files
rm %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh

Expand Down Expand Up @@ -477,7 +469,6 @@ for a in `find /etc/systemd/system -type l ! -exec test -e {} \; -print`; do sta
%ghost %{_sysconfdir}/udev/hwdb.bin
%{_rpmconfigdir}/macros.d/macros.systemd
%dir %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/rpm/macros.systemd
%{_bindir}/systemctl
%{_bindir}/systemd-notify
%{_bindir}/systemd-escape
Expand Down

0 comments on commit 9416afc

Please sign in to comment.