rpms
/
dracut
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to latest git

This commit is contained in:
Harald Hoyer 2012-01-26 16:43:20 +01:00
parent fc0cfdf2fb
commit e9260f332e
2 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0074-dracut.spec-create-compat-symlink-instead-of-ghost.patch Normal file
View File

@ -0,0 +1,44 @@
From e4d85a77aad660b7877a3af091921e73865bfce6 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 26 Jan 2012 16:39:09 +0100
Subject: [PATCH] dracut.spec: create compat symlink, instead of %ghost
---
dracut.spec | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/dracut.spec b/dracut.spec
index 4eb3ba3..10556d0 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -197,25 +197,19 @@ rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
-# create the ghosts
-mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/sbin
-ln -s ../bin/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut
-ln -s ../usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
+# create compat symlink
+mkdir -p $RPM_BUILD_ROOT/sbin
+ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p <lua>
-posix.symlink("../bin/dracut", "%{_sbindir}/dracut")
-posix.symlink("../usr/bin/dracut", "/sbin/dracut")
-return 0
-
%files
%defattr(-,root,root,0755)
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
%{_bindir}/dracut
-%ghost /sbin/dracut
-%ghost %{_sbindir}/dracut
+# compat symlink
+/sbin/dracut
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
%{_bindir}/mkinitrd
%{_bindir}/lsinitrd

22
dracut.spec
View File

@ -10,7 +10,7 @@
Name: dracut
Version: 014
Release: 74.git20120126%{?dist}
Release: 75.git20120126%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} > 6
@ -97,6 +97,7 @@ Patch70: 0070-add-usrmove-module.patch
Patch71: 0071-dracut.spec-add-compat-symlinks-to-sbin.patch
Patch72: 0072-usrmove-install-missing-binaries-and-set-x-only-for-.patch
Patch73: 0073-30usrmove-usrmove-convert.sh-rename-duplicate-librar.patch
Patch74: 0074-dracut.spec-create-compat-symlink-instead-of-ghost.patch
BuildArch: noarch
@ -271,25 +272,19 @@ rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
install -m 0644 dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
# create the ghosts
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/sbin
ln -s ../bin/dracut $RPM_BUILD_ROOT%{_sbindir}/dracut
ln -s ../usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
# create compat symlink
mkdir -p $RPM_BUILD_ROOT/sbin
ln -s /usr/bin/dracut $RPM_BUILD_ROOT/sbin/dracut
%clean
rm -rf $RPM_BUILD_ROOT
%post -p <lua>
posix.symlink("../bin/dracut", "%{_sbindir}/dracut")
posix.symlink("../usr/bin/dracut", "/sbin/dracut")
return 0
%files
%defattr(-,root,root,0755)
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
%{_bindir}/dracut
%ghost /sbin/dracut
%ghost %{_sbindir}/dracut
# compat symlink
/sbin/dracut
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
%{_bindir}/mkinitrd
%{_bindir}/lsinitrd
@ -387,6 +382,9 @@ return 0
%dir /var/lib/dracut/overlay
%changelog
* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-75.git20120126
- update to latest git
* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-74.git20120126
- update to latest git