From fc17959bcdc11e1e272d66bd571fe24afd847b6e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 27 Jul 2012 15:59:02 +0200 Subject: [PATCH 1/2] installer: depends on package 'syslinux' Signed-off-by: Stephan Raue --- packages/tools/installer/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/installer/meta b/packages/tools/installer/meta index 50443d391b..4b91990400 100644 --- a/packages/tools/installer/meta +++ b/packages/tools/installer/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv/" PKG_URL="" -PKG_DEPENDS="busybox dialog parted e2fsprogs $BOOTLOADER" +PKG_DEPENDS="busybox dialog parted e2fsprogs syslinux" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="tools" @@ -37,4 +37,4 @@ PKG_AUTORECONF="no" if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then PKG_DEPENDS="$PKG_DEPENDS flashrom" -fi \ No newline at end of file +fi From 77737b659853420a1f30f3ff7b54a0c5c5a97acb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 27 Jul 2012 16:01:53 +0200 Subject: [PATCH 2/2] linux: everytime install $BOOTLOADER, this should fix #926 Signed-off-by: Stephan Raue --- packages/linux/meta | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/linux/meta b/packages/linux/meta index 7b868d8cae..ab71b03517 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" #PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/testing/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils" +PKG_DEPENDS="busybox linux-drivers linux-firmware pciutils $BOOTLOADER" PKG_BUILD_DEPENDS="toolchain module-init-tools xz cpio pciutils" PKG_PRIORITY="optional" PKG_SECTION="linux" @@ -40,11 +40,3 @@ if [ "$LINUX" = "ti-omap4" ]; then PKG_VERSION="2.6.38-ti-omap4" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" fi - -if [ "$BOOTLOADER" = "atv-bootloader" ]; then - PKG_DEPENDS="$PKG_DEPENDS atv-bootloader" -fi - -if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then - PKG_DEPENDS="$PKG_DEPENDS bcm2835-bootloader" -fi