Attachment 7261 Details for Bug 34132 – E2K: avoid klibc/nologin

[patch] E2K: avoid klibc/nologin

0001-2.30.2-alt2.patch (text/plain), 2.03 KB, created by Michael Shigorin on 2017-11-06 17:16:55 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2017-11-06 17:16:55 MSK

Size: 2.03 KB

patch

obsolete

>From b9e8929ed1fccd43ba4417a9b82e214a2bab438c Mon Sep 17 00:00:00 2001
>From: Michael Shigorin <mike@altlinux.org>
>Date: Thu, 7 Sep 2017 07:58:15 +0300
>Subject: [PATCH] 2.30.2-alt2
>
>- E2K: avoid klibc/nologin
>---
> rpm/util-linux.spec | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/rpm/util-linux.spec b/rpm/util-linux.spec
>index 7adc7e5..b5e1e0b 100644
>--- a/rpm/util-linux.spec
>+++ b/rpm/util-linux.spec
>@@ -4,7 +4,7 @@
> Summary: A collection of basic system utilities
> Name: util-linux
> Version: 2.30.2
>-Release: alt1
>+Release: alt2
> License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
> Group: System/Base
> URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux
>@@ -33,7 +33,10 @@ Packager: Alexey Gladkov <legion@altlinux.ru>
> ### Dependences
> BuildRequires: /proc,/dev/pts
> BuildRequires: bash4
>-BuildRequires: glibc-devel-static klibc-devel
>+BuildRequires: glibc-devel-static
>+%ifnarch e2k
>+BuildRequires: klibc-devel
>+%endif
> BuildRequires: zlib-devel
> BuildRequires: libncursesw-devel
> BuildRequires: libpopt-devel
>@@ -538,8 +541,10 @@ mv blkid.static rpm/blkid.initramfs
> %ifarch %ix86 x86_64
> %__cc %optflags stacktest.c -o stacktest
> %endif
>+%ifnarch e2k
> # build nologin
> klcc -Wall -Wextra -Werror nologin.c -o nologin
>+%endif
> 
> %__cc %optflags clock_unsynced.c -o clock_unsynced
> %__cc %optflags pause.c -o pause
>@@ -566,8 +571,10 @@ install -pD -m755 %SOURCE6 %buildroot%_controldir/write
> install -p -m755 stacktest %buildroot/%_bindir
> %endif
> install -p -m755 pause %buildroot/%_bindir
>+%ifnarch e2k
> install -p -m755 nologin %buildroot/sbin/
> install -p -m644 nologin.8 %buildroot/%_man8dir/
>+%endif
> 
> %if_enabled raw
> echo '.so man8/raw.8' > %buildroot/%_man8dir/rawdevices.8
>@@ -950,6 +957,9 @@ fi
> %doc Documentation/*.txt NEWS AUTHORS README* Documentation/licenses/* Documentation/TODO
> 
> %changelog
>+* Mon Nov 06 2017 Michael Shigorin <mike@altlinux.org> 2.30.2-alt2
>+- E2K: avoid klibc/nologin
>+
> * Mon Oct 16 2017 Alexey Gladkov <legion@altlinux.ru> 2.30.2-alt1
> - New version (2.30.2).
> 
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 34132: 7261