From 0644428de00294fe2ccd4214a828971c5089c4de Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 Oct 2013 12:33:21 +0300 Subject: [PATCH 1/4] remove package: 'kexec-tools' --- packages/sysutils/busybox/meta | 2 +- packages/sysutils/kexec-tools/build | 42 --------------------------- packages/sysutils/kexec-tools/install | 26 ----------------- packages/sysutils/kexec-tools/meta | 36 ----------------------- 4 files changed, 1 insertion(+), 105 deletions(-) delete mode 100755 packages/sysutils/kexec-tools/build delete mode 100755 packages/sysutils/kexec-tools/install delete mode 100644 packages/sysutils/kexec-tools/meta diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index 662e6c2244..ccd78e3111 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils parted" +PKG_DEPENDS="hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils parted" PKG_BUILD_DEPENDS="toolchain busybox-hosttools" PKG_PRIORITY="required" PKG_SECTION="system" diff --git a/packages/sysutils/kexec-tools/build b/packages/sysutils/kexec-tools/build deleted file mode 100755 index 55d33a508c..0000000000 --- a/packages/sysutils/kexec-tools/build +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - - -#CFLAGS="$TARGET_FPU_FLAGS" # -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2" -#LDFLAGS="" - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --libexecdir=/usr/lib/upower \ - --localstatedir=/var \ - --without-gamecube \ - --with-zlib \ - --without-lzma \ - --without-xen \ - -make diff --git a/packages/sysutils/kexec-tools/install b/packages/sysutils/kexec-tools/install deleted file mode 100755 index 103aeb3902..0000000000 --- a/packages/sysutils/kexec-tools/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/sbin - cp $PKG_BUILD/build/sbin/kexec $INSTALL/usr/sbin diff --git a/packages/sysutils/kexec-tools/meta b/packages/sysutils/kexec-tools/meta deleted file mode 100644 index fbd0b79677..0000000000 --- a/packages/sysutils/kexec-tools/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="kexec-tools" -PKG_VERSION="2.0.3" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.kernel.org/pub/linux/kernel/people/horms/" -PKG_URL="http://horms.net/projects/kexec/kexec-tools/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib" -PKG_BUILD_DEPENDS="toolchain zlib" -PKG_PRIORITY="optional" -PKG_SECTION="system" -PKG_SHORTDESC="kexec-tools: the user-space portion of kexec" -PKG_LONGDESC="kexec-tools is the user-space portion of kexec, a tool to load another kernel from the currently executing Linux kernel." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" From 39bdc7fe0dba0f8528662b76482990837a11e581 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 Oct 2013 12:33:39 +0300 Subject: [PATCH 2/4] projects/*/linux/linux.*.conf: disable CONFIG_KEXEC --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 2 +- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.x86_64.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Virtual/linux/linux.i386.conf | 2 +- projects/Virtual/linux/linux.x86_64.conf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index bd231bb6b5..679637b180 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -434,7 +434,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 927d85645b..4767f29cf9 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -438,7 +438,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index cb26c4d502..e1e5f49a0d 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -422,7 +422,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 2bc29f8312..b8c2297613 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -445,7 +445,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index a4b96de410..79d3d340fd 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -434,7 +434,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 56ee1a4ccb..72192573d2 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -415,7 +415,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 67796c73d9..310147b926 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -427,7 +427,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 3c4d01dddb..b235fb6c71 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -445,7 +445,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index c9cc600524..d730fd5789 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -434,7 +434,7 @@ CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set From 01e9c4225ba5507bc98fc6e71ff8556ecfa951ba Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 Oct 2013 12:34:15 +0300 Subject: [PATCH 3/4] systemd: cleanup --- packages/sysutils/systemd/package.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 476a62fa22..469b6cec53 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -103,6 +103,9 @@ post_makeinstall_target() { # remove unneeded stuff rm -rf $INSTALL/etc/systemd/system rm -rf $INSTALL/usr/share/zsh + rm -rf $INSTALL/usr/lib/kernel/install.d + rm -rf $INSTALL/usr/lib/rpm + rm -f $INSTALL/usr/bin/kernel-install # replace systemd-machine-id-setup with ours mkdir -p $INSTALL/bin From 68f93320459f6ad072b697ef4b93950cfe168dba Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 7 Oct 2013 17:02:12 +0300 Subject: [PATCH 4/4] linux: dont let cpupower-start.service fail if setting up to performance fails --- packages/linux/system.d/cpupower-start.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/system.d/cpupower-start.service b/packages/linux/system.d/cpupower-start.service index 5b29359d1a..b967eb78d5 100644 --- a/packages/linux/system.d/cpupower-start.service +++ b/packages/linux/system.d/cpupower-start.service @@ -4,7 +4,7 @@ DefaultDependencies=false [Service] Type=oneshot -ExecStart=/bin/sh -c 'for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do printf "performance" > $i; done' +ExecStart=-/bin/sh -c 'for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do printf "performance" > $i; done' RemainAfterExit=yes [Install]