3
0
forked from pool/util-linux

checked in (request 34654)

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=34
This commit is contained in:
OBS User autobuild 2010-03-12 15:45:46 +00:00 committed by Git OBS Bridge
parent 4a27d3f4b1
commit 9728f391db
4 changed files with 22 additions and 44 deletions

View File

@ -1,26 +0,0 @@
From: Jeff Mahoney <jeffm@suse.com>
Subject: losetup: Honor documented -c option
References: bnc#583677
losetup -h lists -c | --set-capacity as valid options, but doesn't
actually accept -c.
This patch fixes support for -c.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
mount/lomount.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -1065,7 +1065,7 @@ main(int argc, char **argv) {
if ((p = strrchr(progname, '/')) != NULL)
progname = p+1;
- while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:",
+ while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:c",
longopts, NULL)) != -1) {
switch (c) {
case 'a':

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
size 3470040

View File

@ -1,14 +1,3 @@
-------------------------------------------------------------------
Wed Mar 10 23:11:42 CET 2010 - jeffm@suse.de
- Properly honor documented -c option (bnc#583677)
-------------------------------------------------------------------
Tue Mar 2 09:53:04 UTC 2010 - lnussel@suse.de
- drop freeramdisk (bnc#584565)
- drop hostid (bnc#584562)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 23 12:46:07 UTC 2010 - lnussel@suse.de Tue Feb 23 12:46:07 UTC 2010 - lnussel@suse.de

View File

@ -43,6 +43,8 @@ Source7: baselibs.conf
%define adjtimex_ver 1.20 %define adjtimex_ver 1.20
# XXX: post upstream? # XXX: post upstream?
Source9: adjtimex-%{adjtimex_ver}.tar.bz2 Source9: adjtimex-%{adjtimex_ver}.tar.bz2
# XXX: DROP?
Source10: freeramdisk.tar.bz2
# XXX: post upstream? # XXX: post upstream?
Source11: klogconsole.tar.bz2 Source11: klogconsole.tar.bz2
# TODO: split to separate package # TODO: split to separate package
@ -64,13 +66,14 @@ Source51: blkid.conf
## ##
## util-linux patches ## util-linux patches
## ##
# add hostid. FIXME: use the one from coreutils
Patch0: util-linux-2.12-misc_utils_hostid.patch
# 241372 - remove legacy warnings from fdisk # 241372 - remove legacy warnings from fdisk
Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
# bnc#447036 # bnc#447036
Patch2: util-linux-2.14.1-mount_skip_sync.patch Patch2: util-linux-2.14.1-mount_skip_sync.patch
# crypto patch # crypto patch
Patch3: util-linux-2.17.1-mount_losetup_crypto.patch Patch3: util-linux-2.17.1-mount_losetup_crypto.patch
Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
## ##
## adjtimex ## adjtimex
## ##
@ -153,12 +156,11 @@ unique IDs (UUIDs).
%lang_package %lang_package
%prep %prep
%setup -q -a 9 -b 11 -b 12 -b 13 -n %name-ng-%version %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%version
#patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# #
cd adjtimex-* cd adjtimex-*
%patch50 -p1 %patch50 -p1
@ -182,6 +184,10 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
cd .. cd ..
pushd ../ pushd ../
# freeramdisk build
cd freeramdisk
make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" freeramdisk
cd ..
# which build # which build
cd which-%{which_ver} cd which-%{which_ver}
#autoreconf -fi #autoreconf -fi
@ -259,6 +265,11 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
cp adjtimex-*/adjtimex %{buildroot}/sbin/ cp adjtimex-*/adjtimex %{buildroot}/sbin/
cp adjtimex-*/adjtimex.8 %{buildroot}%{_mandir}/man8/ cp adjtimex-*/adjtimex.8 %{buildroot}%{_mandir}/man8/
pushd .. pushd ..
# freeramdisk install
cd freeramdisk
install freeramdisk $RPM_BUILD_ROOT/usr/sbin
install -m644 freeramdisk.info.gz $RPM_BUILD_ROOT%{_infodir}
cd ..
# which install # which install
cd which-%{which_ver} cd which-%{which_ver}
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
@ -354,6 +365,8 @@ rm -rf $RPM_BUILD_ROOT
%post %post
%{fillup_and_insserv raw} %{fillup_and_insserv raw}
txt='* freeramdisk: (freeramdisk). tell kernel to free allocated memory for ramdisk'
%install_info --entry="$txt" --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/ipc.info.gz
%install_info --entry="* time: (time). summarizing used system resources" --info-dir=%{_infodir} %{_infodir}/time.info.gz %install_info --entry="* time: (time). summarizing used system resources" --info-dir=%{_infodir} %{_infodir}/time.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/which.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/which.info.gz
@ -364,6 +377,7 @@ if [ -f etc/fstab ]; then
fi fi
%postun %postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/time.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/which.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/which.info.gz
@ -460,6 +474,7 @@ fi
/usr/bin/flock /usr/bin/flock
/usr/bin/getopt /usr/bin/getopt
/usr/bin/hexdump /usr/bin/hexdump
/usr/bin/hostid
/usr/bin/ionice /usr/bin/ionice
/usr/bin/ipcrm /usr/bin/ipcrm
/usr/bin/ipcs /usr/bin/ipcs
@ -492,6 +507,7 @@ fi
/usr/bin/which /usr/bin/which
/usr/sbin/addpart /usr/sbin/addpart
/usr/sbin/delpart /usr/sbin/delpart
/usr/sbin/freeramdisk
/usr/sbin/ldattach /usr/sbin/ldattach
/usr/sbin/partx /usr/sbin/partx
/usr/sbin/rcraw /usr/sbin/rcraw
@ -505,6 +521,7 @@ fi
%{_defaultdocdir}/time/* %{_defaultdocdir}/time/*
%{_defaultdocdir}/which/* %{_defaultdocdir}/which/*
%{_infodir}/ipc.info.gz %{_infodir}/ipc.info.gz
%{_infodir}/freeramdisk.info*.gz
%{_infodir}/time.info*.gz %{_infodir}/time.info*.gz
%{_infodir}/which.info*.gz %{_infodir}/which.info*.gz
%{_mandir}/man1/cal.1.gz %{_mandir}/man1/cal.1.gz
@ -521,6 +538,7 @@ fi
%{_mandir}/man1/hexdump.1.gz %{_mandir}/man1/hexdump.1.gz
%{_mandir}/man1/ipcrm.1.gz %{_mandir}/man1/ipcrm.1.gz
%{_mandir}/man1/ipcs.1.gz %{_mandir}/man1/ipcs.1.gz
%{_mandir}/man1/hostid.1.gz
%{_mandir}/man1/line.1.gz %{_mandir}/man1/line.1.gz
%{_mandir}/man1/logger.1.gz %{_mandir}/man1/logger.1.gz
%{_mandir}/man1/look.1.gz %{_mandir}/man1/look.1.gz