[oe-commits] org.oe.dev Rename uboot-utils to u-boot-utils-native. u-boot-utils now makes
awilcox commit
openembedded-commits at lists.openembedded.org
Mon Dec 17 06:39:11 UTC 2007
Rename uboot-utils to u-boot-utils-native. u-boot-utils now makes
target u-boot utility fw_setenv for one distro.
Author: awilcox at openembedded.org
Branch: org.openembedded.dev
Revision: 9f549d07dc4c9fb0a26eb9f91bcbcc74e588f631
ViewMTN: http://monotone.openembedded.org/revision/info/9f549d07dc4c9fb0a26eb9f91bcbcc74e588f631
Files:
1
packages/uboot/uboot-utils_1.2.0.bb
packages/uboot/u-boot-utils-native_1.2.0.bb
packages/uboot/u-boot-utils_1.2.0.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/linux/em-x270_2.6.23.bb
packages/linux/linux-bd-neon-2.6_2.6.22.bb
packages/linux/linux-gumstix_2.6.15.bb
packages/linux/linux-omap.inc
packages/linux/linux-turbostation_2.6.20.2.bb
packages/tasks/task-base.bb
packages/uboot/u-boot-1.2.0/env-Makefile.patch
Diffs:
#
# mt diff -r8ffce91089fef628ba8e59b79e7f8d3c1690ef7e -r9f549d07dc4c9fb0a26eb9f91bcbcc74e588f631
#
#
#
# rename "packages/uboot/uboot-utils_1.2.0.bb"
# to "packages/uboot/u-boot-utils-native_1.2.0.bb"
#
# add_file "packages/uboot/u-boot-utils_1.2.0.bb"
# content [64396fa43c9fcef1ed1cd3ae82a49d140febbbd0]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [f3d89d1d37708d933d79f1a37dbef5925a80cf82]
# to [2ee34e9004f488e328231f5a1f139e5225d0e2cf]
#
# patch "packages/linux/em-x270_2.6.23.bb"
# from [d325248b45b97467425b18642a6edc661f795a55]
# to [9561b00c60fa2dae984a16bc2e79152e0043a233]
#
# patch "packages/linux/linux-bd-neon-2.6_2.6.22.bb"
# from [7414432e92b9ffbb6e75fa61df919f18e6d010ad]
# to [457d040120a5884806bf1ae597512aa6e951e1fa]
#
# patch "packages/linux/linux-gumstix_2.6.15.bb"
# from [5e487b2ff0a5c5204061cf12f89a2cd544260963]
# to [5e35bf29285ac1fbc0b075f0367bc1a8d88b3b3b]
#
# patch "packages/linux/linux-omap.inc"
# from [ddb0989b0eff634d3c86b2b86fc04e7c795ae8c1]
# to [511a21147c331fc26f3e5848413c000974a7fedd]
#
# patch "packages/linux/linux-turbostation_2.6.20.2.bb"
# from [b96efd8f4a67e72804a71f076b5374f53521e42c]
# to [abd711d81a65da03e4199ceaf85703d9c052a26b]
#
# patch "packages/tasks/task-base.bb"
# from [784db9539c99a3dfc0ce43cc4b61f9cd5eba3b27]
# to [7a9b59f5510daa79b732e48d67445e1d5ebc4c81]
#
# patch "packages/uboot/u-boot-1.2.0/env-Makefile.patch"
# from [e3822526b16e32cf8162168cfedf194aad7d1dee]
# to [b1e371fb91a8dd7c63dc14647ea28a46072cdafb]
#
# patch "packages/uboot/u-boot-utils-native_1.2.0.bb"
# from [f7517fc7aea30f86896606bcfc953b6fe63234e0]
# to [a79cb700407a2e90e0c039014ac9e7ebb0f22219]
#
============================================================
--- packages/uboot/u-boot-utils_1.2.0.bb 64396fa43c9fcef1ed1cd3ae82a49d140febbbd0
+++ packages/uboot/u-boot-utils_1.2.0.bb 64396fa43c9fcef1ed1cd3ae82a49d140febbbd0
@@ -0,0 +1,41 @@
+DESCRIPTION = "U-boot bootloader OS env. access tools"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS_openprotium = "mtd-utils"
+PR = "r7"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
+SRC_URI_append_openprotium = " \
+ file://fw_env.c.patch;patch=1 \
+ file://tools-Makefile.patch;patch=1 \
+ file://env-Makefile.patch;patch=1 \
+ file://fw_env.config"
+
+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() {
+ :
+}
+
+do_compile () {
+ oe_runmake Sandpoint8240_config
+ oe_runmake tools
+}
+
+do_install () {
+ :
+}
+
+do_install_openprotium () {
+ install -d ${D}/sbin
+ install -d ${D}${sysconfdir}
+ install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+ install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
+ install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
+}
+
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc f3d89d1d37708d933d79f1a37dbef5925a80cf82
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 2ee34e9004f488e328231f5a1f139e5225d0e2cf
@@ -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_uboot-utils ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0"
PREFERRED_VERSION_udev ?= "092"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
============================================================
--- packages/linux/em-x270_2.6.23.bb d325248b45b97467425b18642a6edc661f795a55
+++ packages/linux/em-x270_2.6.23.bb 9561b00c60fa2dae984a16bc2e79152e0043a233
@@ -1,10 +1,10 @@ LICENSE = "GPL"
require linux.inc
SECTION = "kernel"
DESCRIPTION = "Linux kernel for the Compulab EM-X270 system"
LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r0"
+DEPENDS = "u-boot-utils-native"
+PR = "r1"
KERNEL_IMAGETYPE = "uImage"
============================================================
--- packages/linux/linux-bd-neon-2.6_2.6.22.bb 7414432e92b9ffbb6e75fa61df919f18e6d010ad
+++ packages/linux/linux-bd-neon-2.6_2.6.22.bb 457d040120a5884806bf1ae597512aa6e951e1fa
@@ -1,10 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board"
SECTION = "kernel"
HOMEPAGE = "N/A"
LICENSE = "GPL"
-DEPENDS += "uboot-utils"
+DEPENDS += "u-boot-utils-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1 \
============================================================
--- packages/linux/linux-gumstix_2.6.15.bb 5e487b2ff0a5c5204061cf12f89a2cd544260963
+++ packages/linux/linux-gumstix_2.6.15.bb 5e35bf29285ac1fbc0b075f0367bc1a8d88b3b3b
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "Linux Kernel for the Gumstix"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
-DEPENDS = "uboot-utils"
+DEPENDS = "u-boot-utils-native"
COMPATIBLE_MACHINE = "gumstix"
============================================================
--- packages/linux/linux-omap.inc ddb0989b0eff634d3c86b2b86fc04e7c795ae8c1
+++ packages/linux/linux-omap.inc 511a21147c331fc26f3e5848413c000974a7fedd
@@ -1,9 +1,9 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "Linux kernel for OMAP processors"
LICENSE = "GPL"
#DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']}
-DEPENDS = uboot-utils
+DEPENDS = "u-boot-utils-native"
inherit kernel
============================================================
--- packages/linux/linux-turbostation_2.6.20.2.bb b96efd8f4a67e72804a71f076b5374f53521e42c
+++ packages/linux/linux-turbostation_2.6.20.2.bb abd711d81a65da03e4199ceaf85703d9c052a26b
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
SECTION = "kernel"
LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r1"
+DEPENDS = "u-boot-utils-native"
+PR = "r2"
COMPATIBLE_MACHINE = "turbostation"
============================================================
--- packages/tasks/task-base.bb 784db9539c99a3dfc0ce43cc4b61f9cd5eba3b27
+++ packages/tasks/task-base.bb 7a9b59f5510daa79b732e48d67445e1d5ebc4c81
@@ -295,7 +295,7 @@ RDEPENDS_task-base-uboot = "\
kernel-module-usb-storage "
RDEPENDS_task-base-uboot = "\
- uboot-utils"
+ u-boot-utils-native"
RDEPENDS_task-base-redboot = "\
fis"
============================================================
--- packages/uboot/u-boot-1.2.0/env-Makefile.patch e3822526b16e32cf8162168cfedf194aad7d1dee
+++ packages/uboot/u-boot-1.2.0/env-Makefile.patch b1e371fb91a8dd7c63dc14647ea28a46072cdafb
@@ -1,24 +1,19 @@
---- u-boot-1.1.2.orig/tools/env/Makefile 2003-06-27 14:32:48.000000000 -0700
-+++ u-boot-1.1.2/tools/env/Makefile 2006-11-08 12:33:43.000000000 -0800
-@@ -27,7 +27,7 @@
- all: fw_printenv
+--- u-boot-1.2.0/tools/env/Makefile.orig 2007-12-12 12:52:51.508745236 -0800
++++ u-boot-1.2.0/tools/env/Makefile 2007-12-12 12:54:09.997218038 -0800
+@@ -31,7 +31,7 @@
+ all: $(obj)fw_printenv
- fw_printenv: $(SOURCES) $(HEADERS)
-- $(CROSS_COMPILE)gcc -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv
-+ $(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv
+ $(obj)fw_printenv: $(SRCS) $(HEADERS)
+- $(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
++ $(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -DUSE_HOSTCC $(SRCS) -o $(obj)fw_printenv
clean:
- rm -f fw_printenv crc32.c
-@@ -37,9 +37,9 @@
+ rm -f $(obj)fw_printenv $(obj)crc32.c
+@@ -43,6 +43,6 @@
- #########################################################################
+ include $(TOPDIR)/rules.mk
--.depend: Makefile $(SOURCES)
-- $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
-+#.depend: Makefile $(SOURCES)
-+# $(CC) -M $(HOST_CFLAGS) $(TARGET_CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
+-sinclude $(obj).depend
++#sinclude $(obj).depend
--sinclude .depend
-+#sinclude .depend
-
#########################################################################
============================================================
--- packages/uboot/uboot-utils_1.2.0.bb f7517fc7aea30f86896606bcfc953b6fe63234e0
+++ packages/uboot/u-boot-utils-native_1.2.0.bb a79cb700407a2e90e0c039014ac9e7ebb0f22219
@@ -1,13 +1,16 @@
-DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
+DESCRIPTION = "U-boot bootloader mkimage utility"
SECTION = "bootloaders"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r6"
+ALLOW_EMPTY = "1"
+PR = "r1"
SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
S = "${WORKDIR}/u-boot-${PV}"
+inherit native
+
do_configure() {
:
}
More information about the Openembedded-commits
mailing list