From: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
To: initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Frederic Crozat <FCrozat-IBi9RG/b67k@public.gmane.org>
Subject: Re: Further specfile changes
Date: Fri, 13 Jul 2012 15:35:49 +0200 [thread overview]
Message-ID: <201207131535.50050.trenn@suse.de> (raw)
In-Reply-To: <201207131533.56617.trenn-l3A5Bk7waGM@public.gmane.org>
On Friday, July 13, 2012 03:33:55 PM Thomas Renninger wrote:
> Hi,
>
> this is a patch of a modified working Version 020 specfile,
> diffed against latest git specfile (with my changes I sent today
> already applied).
--- dracut.spec 2012-07-13 14:49:14.000000000 +0200
+++ /archteam/trenn/packages/Base:System/dracut/dracut.spec 2012-07-13 14:42:52.000000000 +0200
@@ -21,8 +21,8 @@
%endif
Name: dracut
-Version: xxx
-Release: xxx
+Version: 020
+Release: 0
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -128,7 +128,7 @@
This package requires everything which is needed to build a generic
all purpose initramfs with network support with dracut.
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
%package fips
Summary: Dracut modules to build a dracut initramfs with an integrity check
Requires: %{name} = %{version}-%{release}
@@ -208,13 +208,13 @@
echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
-%if 0%{?fedora} == 0 && 0%{?rhel} == 0
+%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0
rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
%endif
# we do not support dash in the initramfs
-rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
+# rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
# remove gentoo specific modules
rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
@@ -231,9 +231,9 @@
mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs
+#mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/initramfs
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
install -m 0644 dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/40-fips.conf
%endif
@@ -242,7 +242,7 @@
install -m 0644 dracut.conf.d/suse.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/01-dist.conf
%endif
-%if 0%{?fedora} <= 12 && 0%{?rhel} < 6 && 0%{?suse_version} <= 9999
+%if 0%{?fedora} <= 12 || 0%{?rhel} < 6 || 0%{?suse_version} <= 9999
rm $RPM_BUILD_ROOT%{_bindir}/mkinitrd
rm $RPM_BUILD_ROOT%{_bindir}/lsinitrd
%endif
@@ -267,6 +267,7 @@
%{_bindir}/mkinitrd
%{_bindir}/lsinitrd
%endif
+%{_bindir}/dracut-install
%dir %{dracutlibdir}
%dir %{dracutlibdir}/modules.d
%{dracutlibdir}/dracut-functions.sh
@@ -274,19 +275,21 @@
%{dracutlibdir}/dracut-version.sh
%{dracutlibdir}/dracut-logger.sh
%{dracutlibdir}/dracut-initramfs-restore
-%{dracutlibdir}/dracut-install
%config(noreplace) /etc/dracut.conf
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%config /etc/dracut.conf.d/01-dist.conf
%endif
%dir /etc/dracut.conf.d
%{_mandir}/man8/dracut.8*
+%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
%{_mandir}/man8/mkinitrd.8*
+%{_mandir}/man1/lsinitrd.1*
+%endif
%{_mandir}/man7/dracut.kernel.7*
%{_mandir}/man7/dracut.cmdline.7*
%{_mandir}/man5/dracut.conf.5*
-%{_mandir}/man1/lsinitrd.1*
%{dracutlibdir}/modules.d/00bootchart
+%{dracutlibdir}/modules.d/00dash
%{dracutlibdir}/modules.d/04watchdog
%{dracutlibdir}/modules.d/05busybox
%{dracutlibdir}/modules.d/10i18n
@@ -333,10 +336,11 @@
%{dracutlibdir}/modules.d/99shutdown
%config(noreplace) /etc/logrotate.d/dracut
%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
-%dir %{_sharedstatedir}/initramfs
+# %dir %{_localstatedir}/initramfs
%if %{defined _unitdir}
-%{_unitdir}/dracut-shutdown.service
-%{_unitdir}/shutdown.target.wants/dracut-shutdown.service
+%{_unitdir}/*.service
+%{_unitdir}/*.target
+%{_unitdir}/*/*.service
%endif
%files network
@@ -352,7 +356,7 @@
%{dracutlibdir}/modules.d/45ifcfg
%{dracutlibdir}/modules.d/95znet
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
%files fips
%defattr(-,root,root,0755)
%{dracutlibdir}/modules.d/01fips
next prev parent reply other threads:[~2012-07-13 13:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 13:33 Further specfile changes Thomas Renninger
[not found] ` <201207131533.56617.trenn-l3A5Bk7waGM@public.gmane.org>
2012-07-13 13:35 ` Thomas Renninger [this message]
[not found] ` <201207131535.50050.trenn-l3A5Bk7waGM@public.gmane.org>
2012-07-16 8:30 ` Harald Hoyer
2012-07-14 14:25 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201207131535.50050.trenn@suse.de \
--to=trenn-l3a5bk7wagm@public.gmane.org \
--cc=FCrozat-IBi9RG/b67k@public.gmane.org \
--cc=initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox