calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Удалены настройки calckernel из шаблонов

Browse Source
atratsevskiy
Mike Khiretskiy 9 years ago
parent 7a178ca58f
commit f68c1e51a5
17 changed files with 0 additions and 247 deletions
Show Stats Download Patch File Download Diff File

1
profiles/templates/3.1/2_ac_install_merge/Depends/glibc
Unescape View File

@ -1 +0,0 @@
# Calculate append=skip merge(sys-libs/glibc)!= merge=sys-kernel/calckernel

2
profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory
Unescape View File

@ -1,2 +0,0 @@
# Calculate merge()!=&&pkg()!= path=/ name=etc

110
profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch
Unescape View File

@ -1,110 +0,0 @@
# Calculate append=replace path=/usr/share/genkernel/patches/busybox/1.20.1 pkg(sys-libs/glibc)>=2.16
https://bugs.gentoo.org/424954
From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 5 Jul 2012 23:19:09 -0400
Subject: [PATCH] include sys/resource.h where needed
We use functions from sys/resource.h in misc applets, but don't include
the header. This breaks building with newer glibc versions, so add the
include where needed.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
loginutils/passwd.c | 1 +
miscutils/time.c | 1 +
networking/inetd.c | 1 +
networking/ntpd.c | 1 +
networking/ntpd_simple.c | 1 +
runit/chpst.c | 1 +
shell/shell_common.c | 1 +
7 files changed, 7 insertions(+)
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index b83db00..a7006f0 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -15,6 +15,7 @@
#include "libbb.h"
#include <syslog.h>
+#include <sys/resource.h> /* setrlimit */
static void nuke_str(char *str)
{
diff --git a/miscutils/time.c b/miscutils/time.c
index 945f15f..ffed386 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -16,6 +16,7 @@
//usage: "\n -v Verbose"
#include "libbb.h"
+#include <sys/resource.h> /* getrusage */
/* Information on the resources used by a child process. */
typedef struct {
diff --git a/networking/inetd.c b/networking/inetd.c
index 1308d74..00baf69 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -165,6 +165,7 @@
//usage: "\n (default: 0 - disabled)"
#include <syslog.h>
+#include <sys/resource.h> /* setrlimit */
#include <sys/un.h>
#include "libbb.h"
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 72e9d0b..5b92db6 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -46,6 +46,7 @@
#include "libbb.h"
#include <math.h>
#include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <sys/resource.h> /* setpriority */
#include <sys/timex.h>
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
index 4ad44e4..1b7c66b 100644
--- a/networking/ntpd_simple.c
+++ b/networking/ntpd_simple.c
@@ -7,6 +7,7 @@
*/
#include "libbb.h"
#include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <sys/resource.h> /* setpriority */
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
#endif
diff --git a/runit/chpst.c b/runit/chpst.c
index ac296ba..ed72c8b 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//usage: "\n a SIGXCPU after N seconds"
#include "libbb.h"
+#include <sys/resource.h> /* getrlimit */
/*
Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 51c92d6..780e27e 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -18,6 +18,7 @@
*/
#include "libbb.h"
#include "shell_common.h"
+#include <sys/resource.h> /* getrlimit */
const char defifsvar[] ALIGN1 = "IFS= \t\n";
--
1.7.9.7

1
profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove
Unescape View File

@ -1 +0,0 @@
# Calculate append=remove path=/usr/share/genkernel/patches/busybox/1.20.1 pkg(sys-libs/glibc)<2.16 name=busybox-1.20.2-glibc-sys-resource.patch

1
profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf
Unescape View File

@ -1 +0,0 @@
# Calculate format=patch autoupdate

2
profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory
Unescape View File

@ -1,2 +0,0 @@
# Calculate merge()!=&&pkg()!= path=/ name=etc

3
profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix
Unescape View File

@ -1,3 +0,0 @@
# Calculate exec=/bin/bash path=/tmp ac_install_disk==off&&cl_merge_pkg!=&&pkg(sys-boot/grub:0)!=
sed -ri 's|(vmlinuz-#-cl_kernel_uid-#.*)CONSOLE=/dev/tty1|\1console=tty1|' /boot/grub/grub.conf

1
profiles/templates/3.3/2_ac_install_merge/Depends/glibc
Unescape View File

@ -1 +0,0 @@
# Calculate append=skip merge(sys-libs/glibc)!= merge=sys-kernel/calckernel

2
profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory
Unescape View File

@ -1,2 +0,0 @@
# Calculate merge()!=&&pkg()!= path=/ name=etc

110
profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch
Unescape View File

@ -1,110 +0,0 @@
# Calculate append=replace path=/usr/share/genkernel/patches/busybox/1.20.1 pkg(sys-libs/glibc)>=2.16
https://bugs.gentoo.org/424954
From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 5 Jul 2012 23:19:09 -0400
Subject: [PATCH] include sys/resource.h where needed
We use functions from sys/resource.h in misc applets, but don't include
the header. This breaks building with newer glibc versions, so add the
include where needed.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
loginutils/passwd.c | 1 +
miscutils/time.c | 1 +
networking/inetd.c | 1 +
networking/ntpd.c | 1 +
networking/ntpd_simple.c | 1 +
runit/chpst.c | 1 +
shell/shell_common.c | 1 +
7 files changed, 7 insertions(+)
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index b83db00..a7006f0 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -15,6 +15,7 @@
#include "libbb.h"
#include <syslog.h>
+#include <sys/resource.h> /* setrlimit */
static void nuke_str(char *str)
{
diff --git a/miscutils/time.c b/miscutils/time.c
index 945f15f..ffed386 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -16,6 +16,7 @@
//usage: "\n -v Verbose"
#include "libbb.h"
+#include <sys/resource.h> /* getrusage */
/* Information on the resources used by a child process. */
typedef struct {
diff --git a/networking/inetd.c b/networking/inetd.c
index 1308d74..00baf69 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -165,6 +165,7 @@
//usage: "\n (default: 0 - disabled)"
#include <syslog.h>
+#include <sys/resource.h> /* setrlimit */
#include <sys/un.h>
#include "libbb.h"
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 72e9d0b..5b92db6 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -46,6 +46,7 @@
#include "libbb.h"
#include <math.h>
#include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <sys/resource.h> /* setpriority */
#include <sys/timex.h>
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
index 4ad44e4..1b7c66b 100644
--- a/networking/ntpd_simple.c
+++ b/networking/ntpd_simple.c
@@ -7,6 +7,7 @@
*/
#include "libbb.h"
#include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <sys/resource.h> /* setpriority */
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
#endif
diff --git a/runit/chpst.c b/runit/chpst.c
index ac296ba..ed72c8b 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//usage: "\n a SIGXCPU after N seconds"
#include "libbb.h"
+#include <sys/resource.h> /* getrlimit */
/*
Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 51c92d6..780e27e 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -18,6 +18,7 @@
*/
#include "libbb.h"
#include "shell_common.h"
+#include <sys/resource.h> /* getrlimit */
const char defifsvar[] ALIGN1 = "IFS= \t\n";
--
1.7.9.7

1
profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove
Unescape View File

@ -1 +0,0 @@
# Calculate append=remove path=/usr/share/genkernel/patches/busybox/1.20.1 pkg(sys-libs/glibc)<2.16 name=busybox-1.20.2-glibc-sys-resource.patch

1
profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf
Unescape View File

@ -1 +0,0 @@
# Calculate format=patch autoupdate

2
profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory
Unescape View File

@ -1,2 +0,0 @@
# Calculate merge()!=&&pkg()!= path=/ name=etc

3
profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix
Unescape View File

@ -1,3 +0,0 @@
# Calculate exec=/bin/bash path=/tmp ac_install_disk==off&&cl_merge_pkg!=&&pkg(sys-boot/grub:0)!=
sed -ri 's|(vmlinuz-#-cl_kernel_uid-#.*)CONSOLE=/dev/tty1|\1console=tty1|' /boot/grub/grub.conf

5
profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/62
Unescape View File

@ -1,5 +0,0 @@
# Calculate ini(update.rev)<62 format=samba path=/etc/calculate name=ini.env merge=sys-kernel/calckernel
# add patch for calckernel
[update]
rev = 62

1
profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base
Unescape View File

@ -18,7 +18,6 @@ sys-boot/os-prober
sys-fs/btrfs-progs
sys-fs/nilfs-utils
sys-fs/reiserfsprogs
sys-kernel/calckernel
sys-kernel/calculate-sources
#?os_arch_machine==x86_64#

1
profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base
Unescape View File

@ -19,7 +19,6 @@ sys-boot/os-prober
sys-fs/btrfs-progs
sys-fs/nilfs-utils
sys-fs/reiserfsprogs
sys-kernel/calckernel
sys-kernel/calculate-sources
#in#

Write Preview
Loading…
Cancel
Save