From f68c1e51a56e718016ffa159d8f427118f35af6b Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 19 Jan 2015 09:49:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20calcke?= =?UTF-8?q?rnel=20=D0=B8=D0=B7=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.1/2_ac_install_merge/Depends/glibc | 1 - .../calckernel/.calculate_directory | 2 - .../busybox-1.20.2-glibc-sys-resource.patch | 110 ------------------ ...box-1.20.2-glibc-sys-resource.patch.remove | 1 - .../sys-kernel/calckernel/genkernel.conf | 1 - .../calckernel/.calculate_directory | 2 - .../sys-kernel/calckernel/grub.conf.fix | 3 - .../3.3/2_ac_install_merge/Depends/glibc | 1 - .../calckernel/.calculate_directory | 2 - .../busybox-1.20.2-glibc-sys-resource.patch | 110 ------------------ ...box-1.20.2-glibc-sys-resource.patch.remove | 1 - .../sys-kernel/calckernel/genkernel.conf | 1 - .../calckernel/.calculate_directory | 2 - .../sys-kernel/calckernel/grub.conf.fix | 3 - .../3.1/6_ac_update_sync/revision/000/62 | 5 - .../3.1/6_ac_update_sync/world/1_create/base | 1 - .../3.2/6_ac_update_sync/world/1_create/base | 1 - 17 files changed, 247 deletions(-) delete mode 100644 profiles/templates/3.1/2_ac_install_merge/Depends/glibc delete mode 100644 profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory delete mode 100644 profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch delete mode 100644 profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove delete mode 100644 profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf delete mode 100644 profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory delete mode 100644 profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix delete mode 100644 profiles/templates/3.3/2_ac_install_merge/Depends/glibc delete mode 100644 profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory delete mode 100644 profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch delete mode 100644 profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove delete mode 100644 profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf delete mode 100644 profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory delete mode 100644 profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix delete mode 100644 profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/62 diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/glibc b/profiles/templates/3.1/2_ac_install_merge/Depends/glibc deleted file mode 100644 index 5e099fde8..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/Depends/glibc +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(sys-libs/glibc)!= merge=sys-kernel/calckernel diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory deleted file mode 100644 index 337207d78..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate merge()!=&&pkg()!= path=/ name=etc - diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch b/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch deleted file mode 100644 index 6cb7fe1ea..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch +++ /dev/null @@ -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 -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 ---- - 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 -+#include /* 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 /* 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 -+#include /* setrlimit */ - #include - - #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 - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #include - #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 /* For IPTOS_LOWDELAY definition */ -+#include /* 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 /* 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 /* getrlimit */ - - const char defifsvar[] ALIGN1 = "IFS= \t\n"; - --- -1.7.9.7 - diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove b/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove deleted file mode 100644 index d519d02c6..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove +++ /dev/null @@ -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 diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf b/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf deleted file mode 100644 index 48349544f..000000000 --- a/profiles/templates/3.1/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf +++ /dev/null @@ -1 +0,0 @@ -# Calculate format=patch autoupdate diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory deleted file mode 100644 index 337207d78..000000000 --- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate merge()!=&&pkg()!= path=/ name=etc - diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix b/profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix deleted file mode 100644 index 7152b37ea..000000000 --- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-kernel/calckernel/grub.conf.fix +++ /dev/null @@ -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 diff --git a/profiles/templates/3.3/2_ac_install_merge/Depends/glibc b/profiles/templates/3.3/2_ac_install_merge/Depends/glibc deleted file mode 100644 index 5e099fde8..000000000 --- a/profiles/templates/3.3/2_ac_install_merge/Depends/glibc +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip merge(sys-libs/glibc)!= merge=sys-kernel/calckernel diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory deleted file mode 100644 index 337207d78..000000000 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate merge()!=&&pkg()!= path=/ name=etc - diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch deleted file mode 100644 index 6cb7fe1ea..000000000 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch +++ /dev/null @@ -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 -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 ---- - 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 -+#include /* 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 /* 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 -+#include /* setrlimit */ - #include - - #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 - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #include - #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 /* For IPTOS_LOWDELAY definition */ -+#include /* 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 /* 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 /* getrlimit */ - - const char defifsvar[] ALIGN1 = "IFS= \t\n"; - --- -1.7.9.7 - diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove deleted file mode 100644 index d519d02c6..000000000 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/busybox-1.20.2-glibc-sys-resource.patch.remove +++ /dev/null @@ -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 diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf deleted file mode 100644 index 48349544f..000000000 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/calckernel/genkernel.conf +++ /dev/null @@ -1 +0,0 @@ -# Calculate format=patch autoupdate diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory deleted file mode 100644 index 337207d78..000000000 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/.calculate_directory +++ /dev/null @@ -1,2 +0,0 @@ -# Calculate merge()!=&&pkg()!= path=/ name=etc - diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix deleted file mode 100644 index 7152b37ea..000000000 --- a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-kernel/calckernel/grub.conf.fix +++ /dev/null @@ -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 diff --git a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/62 b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/62 deleted file mode 100644 index a865038f6..000000000 --- a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/62 +++ /dev/null @@ -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 diff --git a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base index 234140362..ba95d2a8f 100644 --- a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base +++ b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base @@ -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# diff --git a/profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base b/profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base index be3a2a99b..96a800aaa 100644 --- a/profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base +++ b/profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base @@ -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#