[oe-commits] org.oe.dev merge of '487bc5fe6a8bd87d425c042e0b0fc4ec73b896f0'

[oe commit]

merge of '487bc5fe6a8bd87d425c042e0b0fc4ec73b896f0'
     and 'dc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: ccdb554f27d940b07a6e6b9686617b0aa58f3374
ViewMTN: http://monotone.openembedded.org/revision/info/ccdb554f27d940b07a6e6b9686617b0aa58f3374
Files:
1
packages/curl/curl_7.16.4.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/linux/linux-linkstationarm_2.6.12.bb
packages/linux/linux-linkstationppc_2.6.21-rc5.bb
packages/tasks/task-base.bb
packages/uboot/u-boot-utils-native_1.2.0.bb
packages/uboot/u-boot-utils_1.2.0.bb
Diffs:

#
# mt diff -r487bc5fe6a8bd87d425c042e0b0fc4ec73b896f0 -rccdb554f27d940b07a6e6b9686617b0aa58f3374
#
# 
# 
# patch "packages/curl/curl_7.16.4.bb"
#  from [9f422993011a8a54e5050ac333fe5e07a7112e3d]
#    to [e059af19afea35121903c9bfbda21700cbf38c07]
# 
============================================================
--- packages/curl/curl_7.16.4.bb	9f422993011a8a54e5050ac333fe5e07a7112e3d
+++ packages/curl/curl_7.16.4.bb	e059af19afea35121903c9bfbda21700cbf38c07
@@ -12,6 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LI
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
                 --without-ssl \
+                --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
 		--enable-crypto-auth \


#
# mt diff -rdc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6 -rccdb554f27d940b07a6e6b9686617b0aa58f3374
#
# 
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [2ee34e9004f488e328231f5a1f139e5225d0e2cf]
#    to [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
# 
# patch "packages/linux/linux-linkstationarm_2.6.12.bb"
#  from [230d19e2e48f76e44f8caf816eef47910be90255]
#    to [5c531f3ff8db593954394d2cd7b0bbf6d5f3c034]
# 
# patch "packages/linux/linux-linkstationppc_2.6.21-rc5.bb"
#  from [d038fcab32af632acacf324702cc25ae2f298bb7]
#    to [679383825421e632b5d7cc7a4a1a719a3b8a403a]
# 
# patch "packages/tasks/task-base.bb"
#  from [7a9b59f5510daa79b732e48d67445e1d5ebc4c81]
#    to [3005c202e492ec2ec94e87ee07291c4f96060530]
# 
# patch "packages/uboot/u-boot-utils-native_1.2.0.bb"
#  from [a79cb700407a2e90e0c039014ac9e7ebb0f22219]
#    to [6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528]
# 
# patch "packages/uboot/u-boot-utils_1.2.0.bb"
#  from [64396fa43c9fcef1ed1cd3ae82a49d140febbbd0]
#    to [a665ab3de0681644fca851349a5fd6339733fb46]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	2ee34e9004f488e328231f5a1f139e5225d0e2cf
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	9bb6cf26f7a7451d99dda12e51b6584c26194aa5
@@ -1891,7 +1891,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
 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"
============================================================
--- packages/linux/linux-linkstationarm_2.6.12.bb	230d19e2e48f76e44f8caf816eef47910be90255
+++ packages/linux/linux-linkstationarm_2.6.12.bb	5c531f3ff8db593954394d2cd7b0bbf6d5f3c034
@@ -1,6 +1,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
 SECTION = "kernel"
 LICENSE = "GPL"
+DEPENDS += "u-boot-utils-native"
 PR = "r2"
 
 COMPATIBLE_MACHINE = "lsarm"
============================================================
--- packages/linux/linux-linkstationppc_2.6.21-rc5.bb	d038fcab32af632acacf324702cc25ae2f298bb7
+++ packages/linux/linux-linkstationppc_2.6.21-rc5.bb	679383825421e632b5d7cc7a4a1a719a3b8a403a
@@ -1,9 +1,9 @@ PR = "r0"
 DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5"
 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 \
============================================================
--- packages/tasks/task-base.bb	7a9b59f5510daa79b732e48d67445e1d5ebc4c81
+++ packages/tasks/task-base.bb	3005c202e492ec2ec94e87ee07291c4f96060530
@@ -295,7 +295,7 @@ RDEPENDS_task-base-uboot = "\
     kernel-module-usb-storage "
 
 RDEPENDS_task-base-uboot = "\
-    u-boot-utils-native"
+    u-boot"
 
 RDEPENDS_task-base-redboot = "\
     fis"
============================================================
--- packages/uboot/u-boot-utils-native_1.2.0.bb	a79cb700407a2e90e0c039014ac9e7ebb0f22219
+++ packages/uboot/u-boot-utils-native_1.2.0.bb	6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528
@@ -22,7 +22,6 @@ do_stage() {
 
 # 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}/
 }
 
============================================================
--- packages/uboot/u-boot-utils_1.2.0.bb	64396fa43c9fcef1ed1cd3ae82a49d140febbbd0
+++ packages/uboot/u-boot-utils_1.2.0.bb	a665ab3de0681644fca851349a5fd6339733fb46
@@ -1,12 +1,11 @@ LICENSE = "GPL"
 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 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}"
 
-EXTRA_OEMAKE_openprotium = "CROSS_COMPILE=${TARGET_PREFIX}"
-
 do_configure() {
         :
 }