From ce77ced0ef562fdc882a36176dcb21ca096ed365 Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Mon, 17 Dec 2007 18:31:29 +0000 Subject: Remove u-boot-utils-native from RDEPENDS. Remove openprotium specificity. Add u-boot-utils-native dependency in linux-linstation kernels. Fix of previous u-boot commit. --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- packages/linux/linux-linkstationarm_2.6.12.bb | 1 + packages/linux/linux-linkstationppc_2.6.21-rc5.bb | 2 +- packages/tasks/task-base.bb | 2 +- packages/uboot/u-boot-utils-native_1.2.0.bb | 3 +-- packages/uboot/u-boot-utils_1.2.0.bb | 7 ++----- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index ddd9b61791..1b6ed46ac7 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1891,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" PREFERRED_VERSION_uae4all ?= "0.7.1" PREFERRED_VERSION_ubahnnav ?= "0.4.1" -PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0" +PREFERRED_VERSION_u-boot-utils ?= "1.2.0" PREFERRED_VERSION_udev ?= "092" PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0" PREFERRED_VERSION_udhcp ?= "0.9.8" diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb index 77703ad999..704309162c 100644 --- a/packages/linux/linux-linkstationarm_2.6.12.bb +++ b/packages/linux/linux-linkstationarm_2.6.12.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations" SECTION = "kernel" LICENSE = "GPL" +DEPENDS += "u-boot-utils-native" PR = "r2" COMPATIBLE_MACHINE = "lsarm" diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb index 7a6efb0059..6bcc0d9a06 100644 --- a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb +++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb @@ -3,7 +3,7 @@ SECTION = "kernel" LICENSE = "GPL" PR = "r0" -DEPENDS = "dtc-native" +DEPENDS = "dtc-native u-boot-utils-native" COMPATIBLE_MACHINE = "(lsppchd|lsppchg)" SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index dc071f16ce..def6bec2bc 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -295,7 +295,7 @@ RRECOMMENDS_task-base-usbhost = "\ kernel-module-usb-storage " RDEPENDS_task-base-uboot = "\ - u-boot-utils-native" + u-boot" RDEPENDS_task-base-redboot = "\ fis" diff --git a/packages/uboot/u-boot-utils-native_1.2.0.bb b/packages/uboot/u-boot-utils-native_1.2.0.bb index 02f9748ae3..b04b366ffe 100644 --- a/packages/uboot/u-boot-utils-native_1.2.0.bb +++ b/packages/uboot/u-boot-utils-native_1.2.0.bb @@ -22,7 +22,6 @@ do_compile () { # install mkimage for the kernel makefile do_stage() { - install -d ${STAGING_BINDIR_NATIVE} - install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/ + install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/ } diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/uboot/u-boot-utils_1.2.0.bb index e86fc60311..1734b41a0e 100644 --- a/packages/uboot/u-boot-utils_1.2.0.bb +++ b/packages/uboot/u-boot-utils_1.2.0.bb @@ -2,11 +2,10 @@ DESCRIPTION = "U-boot bootloader OS env. access tools" SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS_openprotium = "mtd-utils" +DEPENDS = "mtd-utils" PR = "r7" -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" -SRC_URI_append_openprotium = " \ +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ file://fw_env.c.patch;patch=1 \ file://tools-Makefile.patch;patch=1 \ file://env-Makefile.patch;patch=1 \ @@ -16,8 +15,6 @@ S = "${WORKDIR}/u-boot-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}" -EXTRA_OEMAKE_openprotium = "CROSS_COMPILE=${TARGET_PREFIX}" - do_configure() { : } -- cgit v1.2.3