From df3dfec2b3a7ccc3f06b60c904c3209bc47f5087 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 21 Dec 2013 08:47:07 +0100 Subject: [PATCH] linux: convert to new package format Signed-off-by: Stephan Raue --- packages/devel/eglibc/package.mk | 2 +- packages/initramfs/linux-initramfs/install | 46 ----- packages/initramfs/linux-initramfs/meta | 36 ---- packages/initramfs/package.mk | 2 +- packages/linux/build | 71 ------- packages/linux/install | 50 ----- packages/linux/meta | 46 ----- packages/linux/package.mk | 201 +++++++++++++++++++ packages/linux/unpack | 75 ------- packages/toolchain/devel/binutils/meta | 2 +- packages/toolchain/devel/linux-headers/build | 32 --- packages/toolchain/devel/linux-headers/meta | 36 ---- 12 files changed, 204 insertions(+), 395 deletions(-) delete mode 100755 packages/initramfs/linux-initramfs/install delete mode 100644 packages/initramfs/linux-initramfs/meta delete mode 100755 packages/linux/build delete mode 100755 packages/linux/install delete mode 100644 packages/linux/meta create mode 100644 packages/linux/package.mk delete mode 100755 packages/linux/unpack delete mode 100755 packages/toolchain/devel/linux-headers/build delete mode 100644 packages/toolchain/devel/linux-headers/meta diff --git a/packages/devel/eglibc/package.mk b/packages/devel/eglibc/package.mk index acb5cd79d2..b438907036 100644 --- a/packages/devel/eglibc/package.mk +++ b/packages/devel/eglibc/package.mk @@ -27,7 +27,7 @@ PKG_SITE="http://www.eglibc.org/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="timezone-data" PKG_DEPENDS_INIT="" -PKG_BUILD_DEPENDS_TARGET="ccache autotools autoconf-2.68 linux-headers gcc:bootstrap" +PKG_BUILD_DEPENDS_TARGET="ccache autotools autoconf-2.68 linux:host gcc:bootstrap" PKG_BUILD_DEPENDS_INIT="eglibc" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" diff --git a/packages/initramfs/linux-initramfs/install b/packages/initramfs/linux-initramfs/install deleted file mode 100755 index b94eb997b0..0000000000 --- a/packages/initramfs/linux-initramfs/install +++ /dev/null @@ -1,46 +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 - -VER=`ls $BUILD/linux*/modules/lib/modules` -LINUX_MODULES_DIR=`echo $BUILD/linux*/modules/lib/modules/$VER/kernel` - -if [ -n "$INITRAMFS_MODULES" ]; then - mkdir -p $INSTALL/etc - mkdir -p $INSTALL/lib/modules - - rm -f $INSTALL/etc/modules - for i in $INITRAMFS_MODULES; do - module=`find $LINUX_MODULES_DIR -name $i.ko` - if [ -n "$module" ]; then - echo $i >> $INSTALL/etc/modules - cp $module $INSTALL/lib/modules/`basename $module` - fi - done -fi - -if [ "$UVESAFB_SUPPORT" = yes ]; then - mkdir -p $INSTALL/lib/modules - uvesafb=`find $LINUX_MODULES_DIR -name uvesafb.ko` - cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb` -fi diff --git a/packages/initramfs/linux-initramfs/meta b/packages/initramfs/linux-initramfs/meta deleted file mode 100644 index 610d2d64d3..0000000000 --- a/packages/initramfs/linux-initramfs/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="linux-initramfs" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.kernel.org" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="initramfs" -PKG_SHORTDESC="linux: initramfs kernel module support" -PKG_LONGDESC="Support for loading kernel modules during early boot." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/initramfs/package.mk b/packages/initramfs/package.mk index 4885f46030..d91cc8ec08 100644 --- a/packages/initramfs/package.mk +++ b/packages/initramfs/package.mk @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="eglibc:init busybox:init linux-initramfs plymouth-lite:init diskdev_cmds:init" +PKG_DEPENDS="eglibc:init busybox:init linux:init plymouth-lite:init diskdev_cmds:init" PKG_BUILD_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="virtual" diff --git a/packages/linux/build b/packages/linux/build deleted file mode 100755 index e7fb6016d9..0000000000 --- a/packages/linux/build +++ /dev/null @@ -1,71 +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 - -if [ "$BOOTLOADER" = "u-boot" ]; then - $SCRIPTS/build u-boot - KERNEL_IMAGE="uImage" -else - KERNEL_IMAGE="bzImage" -fi - -cd $PKG_BUILD -rm -rf modules -mkdir -p modules - -LDFLAGS="" make modules -LDFLAGS="" make INSTALL_MOD_PATH=modules DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install -rm -f modules/lib/modules/*/build -rm -f modules/lib/modules/*/source -cd - - -$SCRIPTS/install initramfs - -cd $PKG_BUILD -LDFLAGS="" make $KERNEL_IMAGE - -if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then - ( cd tools/perf - - # dont use some optimizations because of build problems - LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` - - export FLAGSGLIBC="$CFLAGS -I$SYSROOT_PREFIX/usr/include" - export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include" - export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/lib -L$SYSROOT_PREFIX/usr/lib" - - make CROSS_COMPILE="$TARGET_PREFIX" \ - ARCH="$TARGET_ARCH" \ - V=1 \ - DEBUG=false \ - NLS=false \ - NO_GTK2=true \ - NO_LIBELF=false \ - NO_LIBPERL=true \ - NO_LIBPYTHON=false \ - PYTHON=$SYSROOT_PREFIX/usr/bin/python \ - WERROR=0 \ - NO_SLANG=1 \ - ) -fi - diff --git a/packages/linux/install b/packages/linux/install deleted file mode 100755 index 606e08de8a..0000000000 --- a/packages/linux/install +++ /dev/null @@ -1,50 +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 - -RAMFS_DRV_SUBSYSTEMS="ata ide scsi" - -VER=`ls $PKG_BUILD/modules/lib/modules` - -mkdir -p $INSTALL/lib/modules/$VER - cp -r $PKG_BUILD/modules/* $INSTALL - rm -f $INSTALL/lib/modules/$VER/modules.* - -# copy kernel firmwares (if present and requested) - mkdir -p $INSTALL/lib/firmware - [ -d $PKG_BUILD/modules/lib/firmware ] && \ - cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true - -mkdir -p $INSTALL/etc/modprobe.d - cp $PKG_DIR/modprobe.d/*.conf $INSTALL/etc/modprobe.d - -if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/tools/perf/perf $INSTALL/usr/bin/ - - mkdir -p $INSTALL/usr/libexec/perf-core/scripts/python/ - cp -P $PKG_BUILD/tools/perf/perf-archive $INSTALL/usr/libexec/perf-core/ - cp -rP $PKG_BUILD/tools/perf/scripts/python/* $INSTALL/usr/libexec/perf-core/scripts/python/ -fi - -enable_service cpufreq-threshold.service diff --git a/packages/linux/meta b/packages/linux/meta deleted file mode 100644 index 25956b7794..0000000000 --- a/packages/linux/meta +++ /dev/null @@ -1,46 +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="linux" -case "$LINUX" in - *) - PKG_VERSION="3.12.5" - ;; -esac -PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.kernel.org" -PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER" -PKG_BUILD_DEPENDS="toolchain cpio module-init-tools pciutils xz" -PKG_NEED_UNPACK="$LINUX_DEPENDS" -PKG_PRIORITY="optional" -PKG_SECTION="linux" -PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules" -PKG_LONGDESC="This package contains a precompiled kernel image and the modules." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" - -if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then - PKG_DEPENDS="$PKG_DEPENDS Python" - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS elfutils Python" -fi diff --git a/packages/linux/package.mk b/packages/linux/package.mk new file mode 100644 index 0000000000..e034d93c6d --- /dev/null +++ b/packages/linux/package.mk @@ -0,0 +1,201 @@ +################################################################################ +# 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="linux" +case "$LINUX" in + *) + PKG_VERSION="3.12.5" + ;; +esac +PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://www.kernel.org" +PKG_DEPENDS_TARGET="busybox linux-drivers linux-firmware pciutils $BOOTLOADER" +PKG_BUILD_DEPENDS_HOST="ccache" +PKG_BUILD_DEPENDS_TARGET="toolchain cpio module-init-tools pciutils xz" +PKG_BUILD_DEPENDS_INIT="toolchain" +PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_PRIORITY="optional" +PKG_SECTION="linux" +PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules" +PKG_LONGDESC="This package contains a precompiled kernel image and the modules." + +PKG_IS_ADDON="no" +PKG_AUTORECONF="no" + +if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then + PKG_DEPENDS="$PKG_DEPENDS Python" + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS elfutils Python" +fi + +PKG_MAKE_OPTS_HOST="ARCH=$TARGET_ARCH headers_check" + +if [ "$BOOTLOADER" = "u-boot" ]; then + KERNEL_IMAGE="uImage" +else + KERNEL_IMAGE="bzImage" +fi + +post_unpack() { + if [ -f $PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_NAME.$TARGET_ARCH.conf ]; then + KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_NAME.$TARGET_ARCH.conf + else + KERNEL_CFG_FILE=$PKG_DIR/config/$PKG_NAME.$TARGET_ARCH.conf + fi + + sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ + -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $HOST_CXX|" \ + -e "s|^ARCH[[:space:]]*?=.*$|ARCH = $TARGET_ARCH|" \ + -e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \ + $PKG_BUILD/Makefile + + cp $KERNEL_CFG_FILE $PKG_BUILD/.config + sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" $PKG_BUILD/.config + + # disable PPP support if not enabled + if [ ! "$PPTP_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_PPP=.*$|# CONFIG_PPP is not set|" $PKG_BUILD/.config + fi + + # disable swap support if not enabled + if [ ! "$SWAP_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $PKG_BUILD/.config + fi + + # disable nfs support if not enabled + if [ ! "$NFS_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" $PKG_BUILD/.config + fi + + # disable cifs support if not enabled + if [ ! "$SAMBA_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" $PKG_BUILD/.config + fi + + # disable iscsi support if not enabled + if [ ! "$ISCSI_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config + fi + + # copy some extra firmware to linux tree + cp -R $PKG_DIR/firmware/* $PKG_BUILD/firmware + + make -C $PKG_BUILD oldconfig +} + +makeinstall_host() { + make ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install + mkdir -p $SYSROOT_PREFIX/usr/include + cp -R dest/include/* $SYSROOT_PREFIX/usr/include +} + +pre_make_target() { + if [ "$BOOTLOADER" = "u-boot" ]; then + $SCRIPTS/build u-boot + fi +} + +make_target() { + LDFLAGS="" make modules + LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install + rm -f $INSTALL/lib/modules/*/build + rm -f $INSTALL/lib/modules/*/source + rm -f $INSTALL/lib/modules/*/modules.* + + ( cd $ROOT + $SCRIPTS/install initramfs + ) + + LDFLAGS="" make $KERNEL_IMAGE + + if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then + ( cd tools/perf + + # dont use some optimizations because of build problems + LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + + export FLAGSGLIBC="$CFLAGS -I$SYSROOT_PREFIX/usr/include" + export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include" + export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/lib -L$SYSROOT_PREFIX/usr/lib" + + make CROSS_COMPILE="$TARGET_PREFIX" \ + ARCH="$TARGET_ARCH" \ + V=1 \ + DEBUG=false \ + NLS=false \ + NO_GTK2=true \ + NO_LIBELF=false \ + NO_LIBPERL=true \ + NO_LIBPYTHON=false \ + PYTHON=$SYSROOT_PREFIX/usr/bin/python \ + WERROR=0 \ + NO_SLANG=1 \ + ) + fi +} + +makeinstall_target() { + if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then + mkdir -p $INSTALL/usr/bin + cp -P tools/perf/perf $INSTALL/usr/bin/ + + mkdir -p $INSTALL/usr/libexec/perf-core/scripts/python/ + cp -P tools/perf/perf-archive $INSTALL/usr/libexec/perf-core/ + cp -rP tools/perf/scripts/python/* $INSTALL/usr/libexec/perf-core/scripts/python/ + fi +} + +make_init() { + : # reuse make_target() +} + +makeinstall_init() { + if [ -n "$INITRAMFS_MODULES" ]; then + mkdir -p $INSTALL/etc + mkdir -p $INSTALL/lib/modules + + for i in $INITRAMFS_MODULES; do + module=`find .install_pkg/lib/modules/$PKG_VERSION/kernel -name $i.ko` + if [ -n "$module" ]; then + echo $i >> $INSTALL/etc/modules + cp $module $INSTALL/lib/modules/`basename $module` + fi + done + fi + + if [ "$UVESAFB_SUPPORT" = yes ]; then + mkdir -p $INSTALL/lib/modules + uvesafb=`find .install_pkg/lib/modules/$PKG_VERSION/kernel -name uvesafb.ko` + cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb` + fi +} + +post_install() { + mkdir -p $INSTALL/etc/modprobe.d + cp $PKG_DIR/modprobe.d/*.conf $INSTALL/etc/modprobe.d + + enable_service cpufreq-threshold.service +} diff --git a/packages/linux/unpack b/packages/linux/unpack deleted file mode 100755 index 3a42225898..0000000000 --- a/packages/linux/unpack +++ /dev/null @@ -1,75 +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 - -LINUX=`ls -d $PKG_BUILD` - -if [ -f $PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf ]; then - KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf -else - KERNEL_CFG_FILE=$PKG_DIR/config/$1.$TARGET_ARCH.conf -fi - -sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \ - -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $HOST_CXX|" \ - -e "s|^ARCH[[:space:]]*?=.*$|ARCH = $TARGET_ARCH|" \ - -e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \ - $LINUX/Makefile - -cp $KERNEL_CFG_FILE $LINUX/.config -sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \ - $LINUX/.config - -# disable PPP support if not enabled - if [ ! "$PPTP_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_PPP=.*$|# CONFIG_PPP is not set|" $LINUX/.config - fi - -# disable swap support if not enabled - if [ ! "$SWAP_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $LINUX/.config - fi - -# disable nfs support if not enabled - if [ ! "$NFS_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" $LINUX/.config - fi - -# disable cifs support if not enabled - if [ ! "$SAMBA_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" $LINUX/.config - fi - -# disable iscsi support if not enabled - if [ ! "$ISCSI_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" $LINUX/.config - sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" $LINUX/.config - sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" $LINUX/.config - sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $LINUX/.config - sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $LINUX/.config - fi - -# copy some extra firmware to linux tree - cp -R $PKG_DIR/firmware/* $LINUX/firmware - -make -C $LINUX oldconfig diff --git a/packages/toolchain/devel/binutils/meta b/packages/toolchain/devel/binutils/meta index 35f397e86d..885e5be7f4 100644 --- a/packages/toolchain/devel/binutils/meta +++ b/packages/toolchain/devel/binutils/meta @@ -29,7 +29,7 @@ PKG_SITE="http://www.gnu.org/software/binutils/binutils.html" PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz" #PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache bison:host flex linux-headers gmp:host mpfr cloog ppl:host" +PKG_BUILD_DEPENDS="ccache bison:host flex linux:host gmp:host mpfr cloog ppl:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="binutils: A GNU collection of binary utilities" diff --git a/packages/toolchain/devel/linux-headers/build b/packages/toolchain/devel/linux-headers/build deleted file mode 100755 index 8182f0958f..0000000000 --- a/packages/toolchain/devel/linux-headers/build +++ /dev/null @@ -1,32 +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 - -$SCRIPTS/unpack linux - -cd $(kernel_path) -make ARCH=$TARGET_ARCH headers_check -make ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install - -mkdir -p $SYSROOT_PREFIX/usr/include - cp -R dest/include/* $SYSROOT_PREFIX/usr/include diff --git a/packages/toolchain/devel/linux-headers/meta b/packages/toolchain/devel/linux-headers/meta deleted file mode 100644 index 2e9eefa4b6..0000000000 --- a/packages/toolchain/devel/linux-headers/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="linux-headers" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.kernel.org" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache" -PKG_PRIORITY="optional" -PKG_SECTION="toolchain/devel" -PKG_SHORTDESC="linux-headers: "Sanitized" Linux kernel headers" -PKG_LONGDESC="This package includes the linux kernel headers (include files) needed to compile applications. The files resist in /usr/include/{asm,asm-generic,linux}." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no"