diff --git a/biosdevname-0.2.4.tar.bz2 b/biosdevname-0.2.4.tar.bz2 new file mode 100644 index 0000000..90501c4 --- /dev/null +++ b/biosdevname-0.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62e39f11a7f969ca264a6634f11808e9f9eca2f95903bdb00f1c85546acc3a70 +size 149684 diff --git a/biosdevname-0.2.4.tar.gz b/biosdevname-0.2.4.tar.gz deleted file mode 100644 index 16b002b..0000000 --- a/biosdevname-0.2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53329e37ba8b97c9f8af9ec650ca13f4c4913c10751a7499bfd5fc9b7e0cc270 -size 178656 diff --git a/biosdevname.changes b/biosdevname.changes index 07121e1..eb249cb 100644 --- a/biosdevname.changes +++ b/biosdevname.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 31 13:48:47 CEST 2008 - bwalle@suse.de + +- integrate biosdevname to initrd (bnc#403269, FATE#301528) + ------------------------------------------------------------------- Sat Sep 22 17:37:00 CEST 2007 - bwalle@suse.de diff --git a/biosdevname.spec b/biosdevname.spec index ac15516..43c9d9c 100644 --- a/biosdevname.spec +++ b/biosdevname.spec @@ -2,16 +2,24 @@ # spec file for package biosdevname (Version 0.2.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: biosdevname Version: 0.2.4 -Release: 1 +Release: 46 Summary: Udev helper for naming devices per BIOS names Group: System/Base License: GPL v2 only @@ -21,11 +29,14 @@ Url: http://linux.dell.com/files/biosdevname/ # breadth-first, or of so, there haven't been any comments about that # on LKML. ExclusiveArch: %{ix86} x86_64 ia64 -Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.gz +Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}.tar.bz2 +Source1: setup-biosdevname.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pciutils-devel zlib-devel # to figure out how to name the rules file BuildRequires: udev +# because of mkinitrd_setup in %post and %postun +PreReq: mkinitrd # for ownership of /etc/udev/rules.d Requires: udev @@ -49,10 +60,14 @@ Authors: # this is a udev rule, so it needs to live in / rather than /usr %configure --disable-rpath --libdir=/%{_lib} --prefix=/ --bindir=/bin --sbindir=/sbin make %{?_smp_mflags} +cp %{S:1} . %install make install DESTDIR=$RPM_BUILD_ROOT rm %{buildroot}/sbin/%{name}S || : +mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/scripts +install -m 0755 setup-biosdevname.sh \ + $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-biosdevname.sh %clean rm -rf $RPM_BUILD_ROOT @@ -63,18 +78,25 @@ rm -rf $RPM_BUILD_ROOT /sbin/%{name} %config(noreplace) %{_sysconfdir}/udev/rules.d/*%{name}.rules %{_mandir}/man1/* +/lib/mkinitrd/scripts/setup-biosdevname.sh -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +mkinitrd_setup -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +mkinitrd_setup %changelog -* Sat Sep 22 2007 - bwalle@suse.de +* Thu Jul 31 2008 bwalle@suse.de +- integrate biosdevname to initrd (bnc#403269, FATE#301528) +* Sat Sep 22 2007 bwalle@suse.de - update to 0.2.4 o coordinate udev rules usage with udev maintainer o fix crashes in pcmcia search, in_ethernet(), and incorrect command line parsing. -* Mon Sep 03 2007 - bwalle@suse.de +* Mon Sep 03 2007 bwalle@suse.de - fix crash on startup -* Mon Sep 03 2007 - bwalle@suse.de +* Mon Sep 03 2007 bwalle@suse.de - initial package for SUSE (209107, FATE 301528) diff --git a/setup-biosdevname.sh b/setup-biosdevname.sh new file mode 100644 index 0000000..352f826 --- /dev/null +++ b/setup-biosdevname.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# +#%stage: crypto +#%provides: biosdevname + +# +# copy biosdevname binary +cp_bin /sbin/biosdevname "${tmp_mnt}/sbin/biosdevname" + +# +# copy udev rules +if ! [ -d "${tmp_mnt}/etc/udev/rules.d" ] ; then + mkdir -p "${tmp_mnt}/etc/udev/rules.d" +fi +cp /etc/udev/rules.d/*-biosdevname.rules "${tmp_mnt}/etc/udev/rules.d" + + +# vim: set sw=4 ts=4 et: