packages: grubby/grubby-geninitrd.patch, grubby/grubby.spec, grubby/grubby-...
glen
glen at pld-linux.org
Thu Jul 16 11:38:26 CEST 2009
Author: glen Date: Thu Jul 16 09:38:26 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 7.0, separated from mkinitrd from upstream; WORKSFORME
---- Files affected:
packages/grubby:
grubby-geninitrd.patch (1.8 -> 1.9) , grubby.spec (1.26 -> 1.27) , grubby-c99.patch (1.1 -> NONE) (REMOVED), grubby-nolibs.patch (1.6 -> NONE) (REMOVED), grubby-pic.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/grubby/grubby-geninitrd.patch
diff -u packages/grubby/grubby-geninitrd.patch:1.8 packages/grubby/grubby-geninitrd.patch:1.9
--- packages/grubby/grubby-geninitrd.patch:1.8 Tue Mar 10 00:16:34 2009
+++ packages/grubby/grubby-geninitrd.patch Thu Jul 16 11:38:21 2009
@@ -1,19 +1,11 @@
---- mkinitrd-6.0.9/grubby/new-kernel-pkg 2007-12-15 17:41:08.258802271 +0200
-+++ mkinitrd-6.0.24/grubby/new-kernel-pkg 2009-03-10 01:01:43.373402943 +0200
+--- grubby-7.0/new-kernel-pkg~ 2009-07-16 12:26:14.000000000 +0300
++++ grubby-7.0/new-kernel-pkg 2009-07-16 12:29:41.029773021 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Invoked upon installation or removal of a kernel package, the following
# tasks are/can be done here:
-@@ -10,6 +10,7 @@
- #
-
- PATH=/sbin:/bin:$PATH
-+PROGRAM=${0##*/}
-
- lilo=/sbin/lilo
-
@@ -114,15 +115,12 @@
return
fi
@@ -36,24 +28,12 @@
fi
if [ -n "$mbkernel" -a -n "$cfgLilo" -a "$liloFlag" != "elilo" ]; then
-@@ -208,10 +206,10 @@
-
+@@ -268,6 +268,8 @@
mkinitrd() {
- [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
-- /sbin/mkinitrd --allow-missing -f $initrdfile $version
-+ /sbin/geninitrd -f --initrdfs=rom $initrdfile $version
- rc=$?
- if [ $rc != 0 ]; then
-- echo "mkinitrd failed" >&2
-+ echo "geninitrd failed" >&2
- exit 1
+ if [ -n "$USEDRACUT" -a -x /sbin/dracut ]; then
+ tool="/sbin/dracut -f $initrdfile $version"
++ elif [ -x /sbin/geninitrd ]; then
++ tool="/sbin/geninitrd -f --initrdfs=rom $initrdfile $version"
+ else
+ tool="/sbin/mkinitrd --allow-missing -f $initrdfile $version"
fi
- }
-@@ -231,7 +229,6 @@
- [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*
- }
-
--
- while [ $# -gt 0 ]; do
- case $1 in
- --mkinitrd)
================================================================
Index: packages/grubby/grubby.spec
diff -u packages/grubby/grubby.spec:1.26 packages/grubby/grubby.spec:1.27
--- packages/grubby/grubby.spec:1.26 Thu May 28 00:03:22 2009
+++ packages/grubby/grubby.spec Thu Jul 16 11:38:21 2009
@@ -3,26 +3,25 @@
# Conditional build:
%bcond_without tests # skip tests
#
-Summary: Command line tool for configuring grub, lilo, and elilo
+Summary: Command line tool for updating bootloader configs
Summary(pl.UTF-8): Działające z linii poleceń narzędzie do konfiguracji gruba, lilo i elilo
Name: grubby
-Version: 6.0.86
-Release: 0.5
+Version: 7.0
+Release: 1
License: GPL v2
Group: Base
-Source0: mkinitrd-%{version}.tar.bz2
-# Source0-md5: b1407f7cc45f730027d535b24c9fe2e6
+# git clone git://git.fedorahosted.org/git/grubby.git
+# git archive --format=tar --prefix=grubby-%{version}/ HEAD | bzip2 > grubby-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
+# Source0-md5: 6c2fe5d01dc392abb8d05d43fc79416a
+URL: http://git.fedorahosted.org/git/grubby.git
Patch0: %{name}-menu.lst.patch
Patch1: %{name}-pld.patch
Patch2: %{name}-geninitrd.patch
-Patch3: %{name}-c99.patch
-Patch4: %{name}-pic.patch
-Patch5: %{name}-nolibs.patch
-BuildRequires: device-mapper-devel
+BuildRequires: glib2-devel
BuildRequires: libblkid-devel
-BuildRequires: libdhcp-devel > 1.9
-BuildRequires: libnl-devel
-BuildRequires: parted-devel >= 1.8.5
+BuildRequires: libblkid-devel
+BuildRequires: pkgconfig
BuildRequires: popt-devel
Requires: geninitrd >= 10000.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,93 +43,15 @@
nowe jądra i potrzebujących odczytać informacje o aktualnym środowisku
startowym.
-%package -n bdevid
-Summary: Boot-time device identification
-Summary(pl.UTF-8): Identyfikacja urządzeń w trakcie startu systemu
-Group: Base
-Requires: bdevid-libs = %{version}-%{release}
-
-%description -n bdevid
-Boot-time device identification.
-
-%description -n bdevid -l pl.UTF-8
-Identyfikacja urządzeń w trakcie startu systemu.
-
-%package -n bdevid-libs
-Summary: Boot-time device identification library
-Summary(pl.UTF-8): Biblioteka do identyfikacji urządzeń w trakcie startu systemu
-Group: Libraries
-
-%description -n bdevid-libs
-Boot-time device identification library.
-
-%description -n bdevid-libs -l pl.UTF-8
-Biblioteka do identyfikacji urządzeń w trakcie startu systemu.
-
-%package -n bdevid-devel
-Summary: Development files for bdevid library
-Summary(pl.UTF-8): Pliki programistyczne biblioteki bdevid
-Group: Development/Libraries
-Requires: bdevid-libs = %{version}-%{release}
-
-%description -n bdevid-devel
-Development files for bdevid library.
-
-%description -n bdevid-devel -l pl.UTF-8
-Pliki programistyczne biblioteki bdevid.
-
-%package -n python-bdevid
-Summary: Python bindings for bdevid
-Summary(pl.UTF-8): Wiązania Pythona do biblioteki bdevid
-Group: Libraries/Python
-Requires: bdevid-libs = %{version}-%{release}
-Requires: nash-libs = %{version}-%{release}
-
-%description -n python-bdevid
-Python bindings for bdevid.
-
-%description -n python-bdevid -l pl.UTF-8
-Wiązania Pythona do biblioteki bdevid.
-
-%package -n nash-libs
-Summary: Nash library
-Summary(pl.UTF-8): Biblioteka nash
-Group: Libraries
-
-%description -n nash-libs
-Nash library.
-
-%description -n nash-libs -l pl.UTF-8
-Biblioteka nash.
-
-%package -n nash-devel
-Summary: Header files for nash library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki nash
-Group: Development/Libraries
-Requires: nash-libs = %{version}-%{release}
-
-%description -n nash-devel
-Header files for nash library.
-
-%description -n nash-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki nash.
-
%prep
-%setup -q -n mkinitrd-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
+%patch0 -p2
+%patch1 -p2
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
-# their flags from Makefile.inc, if problem resync
-export CFLAGS="%{rpmcflags} -Wall -g -D_FORTIFY_SOURCE=2 -Wno-unused-function -fPIC -std=gnu99 -D_GNU_SOURCE=1"
-export LDFLAGS="%{rpmldflags} -Wl,--wrap,open,--wrap,fopen,--wrap,opendir,--wrap,socket -Wl,--wrap,pipe,--wrap,mkdir,--wrap,access"
%{__make} \
- CC="%{__cc}" \
- LIB=%{_lib} \
+ CC="%{__cc}"
%if %{with tests}
%{__make} test
@@ -141,28 +62,11 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- LIB=%{_lib} \
mandir=%{_mandir}
-install installkernel $RPM_BUILD_ROOT%{_sbindir}
-
-# we don't use these
-rm -f $RPM_BUILD_ROOT%{_sbindir}/{ls,mk}initrd
-rm -f $RPM_BUILD_ROOT%{_prefix}/libexec/initrd-functions
-rm -f $RPM_BUILD_ROOT%{_prefix}/libexec/mkliveinitrd
-rm -f $RPM_BUILD_ROOT%{_sbindir}/nash
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd.8*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/nash.8*
-
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n bdevid-libs -p /sbin/ldconfig
-%postun -n bdevid-libs -p /sbin/ldconfig
-
-%post -n nash-libs -p /sbin/ldconfig
-%postun -n nash-libs -p /sbin/ldconfig
-
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/new-kernel-pkg
@@ -170,128 +74,12 @@
%attr(755,root,root) %{_sbindir}/installkernel
%{_mandir}/man8/grubby.8*
-%files -n bdevid
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/bdevid
-
-%files -n bdevid-libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libbdevid.so.%{version}
-%dir /%{_lib}/bdevid
-%attr(755,root,root) /%{_lib}/bdevid/*.so
-
-%files -n bdevid-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libbdevid.so
-%attr(755,root,root) %{_libdir}/libbdevidprobe.a
-%{_includedir}/bdevid.h
-%{_includedir}/bdevid
-%{_pkgconfigdir}/libbdevid.pc
-%{_pkgconfigdir}/libbdevidprobe.pc
-
-%files -n python-bdevid
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/bdevid.so
-
-%files -n nash-libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnash.so.%{version}
-
-%files -n nash-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnash.so
-%{_includedir}/blkent.h
-%{_includedir}/nash.h
-%{_includedir}/nash
-%{_pkgconfigdir}/libnash.pc
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.26 2009/05/27 22:03:22 glen
-- updated to 6.0.86
-
-Revision 1.25 2009/05/27 17:58:34 glen
-- release 4
-
-Revision 1.24 2009/03/09 23:17:04 glen
-- update to new geninitrd paths, depend on geninitrd only on install mode; rel 3
-
-Revision 1.23 2008/10/12 10:35:41 patrys
-- rel 2
-
-Revision 1.22 2007-12-25 19:13:40 qboosh
-- added pic patch instead of wrong specflags hack
-- lib64 fixes
-- proper bdevid split, added nash-devel package
-
-Revision 1.21 2007-12-25 18:25:26 qboosh
-- ldconfig calls
-
-Revision 1.20 2007-12-25 18:24:34 qboosh
-- pl for new subpackages
-
-Revision 1.19 2007-12-18 09:44:32 patrys
-- fever is not your friend
-
-Revision 1.18 2007-12-18 09:41:58 patrys
-- package dir
-
-Revision 1.17 2007-12-18 09:27:45 glen
-- add -fPIC because relocation R_X86_64_32 against `a local symbol' can not be
- used when making a shared object
-
-Revision 1.16 2007-12-18 09:21:43 glen
-- more deps
-
-Revision 1.15 2007-12-17 13:44:59 patrys
-- package nash-libs
-
-Revision 1.14 2007-12-17 13:42:00 patrys
-- 6.0.24
-- patch to make it compile (removing C99)
-
-Revision 1.13 2007-02-13 07:16:47 glen
-- tabs in preamble
-
-Revision 1.12 2007/02/12 00:48:54 baggins
-- converted to UTF-8
-
-Revision 1.11 2007/02/08 18:59:18 glen
-- link with shared popt
-
-Revision 1.10 2007/02/08 18:56:30 glen
-- use geninitrd with fixed UUID=, LABEL= lookups; rel 2
-
-Revision 1.9 2006/05/15 13:14:31 glen
-- rel 1
-
-Revision 1.8 2005/10/13 16:17:00 glen
-- up to 5.0.4 from fc-dev
-
-Revision 1.7 2005/07/12 17:45:32 glen
-- doesn't obsolete mkinitrd
-
-Revision 1.6 2005/06/06 18:28:42 glen
-- rel 2; STBR
-
-Revision 1.5 2005/05/24 15:16:56 glen
-- adapterized
-
-Revision 1.4 2005/05/24 15:15:01 glen
-- rel 1; STBR
-
-Revision 1.3 2005/01/07 08:42:10 kolodko
-- use CC="%{__cc}"
-- it's static linked with popt: added BR popt-static
-
-Revision 1.2 2005/01/06 20:16:37 qboosh
-- pl
-- removed old todo (RH rarely distributes their tarballs outside src.rpms),
- added new one (no configs in /sbin please)
+Revision 1.27 2009/07/16 09:38:21 glen
+- updated to 7.0, separated from mkinitrd from upstream; WORKSFORME
-Revision 1.1 2005/01/05 22:38:08 glen
-- fork of mkinitrd - contains grubby and mkinitrd replaced with geninitrd
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-geninitrd.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list