ALT Linux Sisyphus discussions
 help / color / mirror / Atom feed
From: Epiphanov Sergei <serpiph@nikiet.ru>
To: ALT Linux Sisyphus discussion list <sisyphus@altlinux.ru>
Subject: Re: [sisyphus] Daedalus: New packages
Date: Tue, 11 Jan 2005 18:28:21 +0300
Message-ID: <200501111828.21305.serpiph@nikiet.ru> (raw)
In-Reply-To: <20050111140614.GA8353@sass.office.ptl>

В сообщении от 11 Январь 2005 17:06 Daedalus написал:
> kernel-feat-core-realtime
> kernel-fix-security

Решил воспользоваться ими и собрать 2.6.9 для пробы, но получил

----- Applying patchset kernel-feat-core-realtime ------
Applying patch realtime-lsm-0.8.5.patch ...
patching file Documentation/realtime-lsm.txt
patching file include/linux/sysctl.h
patching file security/Kconfig
patching file security/Makefile
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file security/Makefile.rej
patching file security/realtime.c
ошибка: Неверный код возврата из /var/tmp/rpm-tmp.81459 (%prep)

В kernel-image-std26-smp.spec добавил только 

%add_patch_list kernel-feat-core-realtime

после всех строчек %add_patch_list kernel-feat-...

Ругается на Makefile (ниже идёт Makefile.rej):

***************
*** 16,19 ****
  obj-$(CONFIG_SECURITY_SELINUX)                += selinux/built-in.o
  obj-$(CONFIG_SECURITY_CAPABILITIES)   += commoncap.o capability.o
  obj-$(CONFIG_SECURITY_ROOTPLUG)               += commoncap.o root_plug.o
  obj-$(CONFIG_SECURITY_SECLVL)         += seclvl.o
--- 16,20 ----
  obj-$(CONFIG_SECURITY_SELINUX)                += selinux/built-in.o
  obj-$(CONFIG_SECURITY_CAPABILITIES)   += commoncap.o capability.o
  obj-$(CONFIG_SECURITY_ROOTPLUG)               += commoncap.o root_plug.o
+ obj-$(CONFIG_SECURITY_REALTIME)         += commoncap.o realtime.o
  obj-$(CONFIG_SECURITY_SECLVL)         += seclvl.o

Судя по всему, patch не находит строки

obj-$(CONFIG_SECURITY_SECLVL)         += seclvl.o

Откуда она берётся?

-- 
С уважением, Епифанов Сергей


  parent reply	other threads:[~2005-01-11 15:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-11 14:06 Daedalus
2005-01-11 14:20 ` Вася Макаров
2005-01-11 20:07   ` [sisyphus] " Konstantin A. Lepikhov
2005-01-12  6:32     ` Вася Макаров
2005-01-11 15:28 ` Epiphanov Sergei [this message]
2005-01-11 15:26   ` [sisyphus] " Aleksandr Blokhin
2005-01-11 20:04   ` [sisyphus] " Konstantin A. Lepikhov
2005-01-12  7:30     ` Epiphanov Sergei
2005-01-12  8:47       ` Konstantin A. Lepikhov

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=200501111828.21305.serpiph@nikiet.ru \
    --to=serpiph@nikiet.ru \
    --cc=sisyphus@altlinux.ru \
    /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

ALT Linux Sisyphus discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/sisyphus/0 sisyphus/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 sisyphus sisyphus/ http://lore.altlinux.org/sisyphus \
		sisyphus@altlinux.ru sisyphus@altlinux.org sisyphus@lists.altlinux.org sisyphus@lists.altlinux.ru sisyphus@lists.altlinux.com sisyphus@linuxteam.iplabs.ru sisyphus@list.linux-os.ru
	public-inbox-index sisyphus

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.sisyphus


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git