From 5206b0d92ce6a6622ec041231314d7242a35f0e8 Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andy@protium.com>
Date: Mon, 17 Dec 2007 06:05:26 +0000
Subject: Rename uboot-utils to u-boot-utils-native. u-boot-utils now makes
 target u-boot utility fw_setenv for one distro.

---
 packages/uboot/u-boot-1.2.0/env-Makefile.patch | 29 ++++++++----------
 packages/uboot/u-boot-utils-native_1.2.0.bb    | 28 ++++++++++++++++++
 packages/uboot/u-boot-utils_1.2.0.bb           | 41 ++++++++++++++++++++++++++
 packages/uboot/uboot-utils_1.2.0.bb            | 25 ----------------
 4 files changed, 81 insertions(+), 42 deletions(-)
 create mode 100644 packages/uboot/u-boot-utils-native_1.2.0.bb
 create mode 100644 packages/uboot/u-boot-utils_1.2.0.bb
 delete mode 100644 packages/uboot/uboot-utils_1.2.0.bb

(limited to 'packages/uboot')

diff --git a/packages/uboot/u-boot-1.2.0/env-Makefile.patch b/packages/uboot/u-boot-1.2.0/env-Makefile.patch
index ad3a6b39a3..f6e9cb39ae 100644
--- a/packages/uboot/u-boot-1.2.0/env-Makefile.patch
+++ b/packages/uboot/u-boot-1.2.0/env-Makefile.patch
@@ -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 @@
  
- #########################################################################
- 
--.depend:	Makefile $(SOURCES)
--		$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
-+#.depend:	Makefile $(SOURCES)
-+#		$(CC) -M $(HOST_CFLAGS) $(TARGET_CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
+ include $(TOPDIR)/rules.mk
  
--sinclude .depend
-+#sinclude .depend
+-sinclude $(obj).depend
++#sinclude $(obj).depend
  
  #########################################################################
diff --git a/packages/uboot/u-boot-utils-native_1.2.0.bb b/packages/uboot/u-boot-utils-native_1.2.0.bb
new file mode 100644
index 0000000000..02f9748ae3
--- /dev/null
+++ b/packages/uboot/u-boot-utils-native_1.2.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "U-boot bootloader mkimage utility"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+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() {
+	:
+}
+
+do_compile () {
+	oe_runmake Sandpoint8240_config
+	oe_runmake tools
+}
+
+# install mkimage for the kernel makefile
+do_stage() {
+	install -d ${STAGING_BINDIR_NATIVE}
+	install -m 755 ${S}/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
new file mode 100644
index 0000000000..e86fc60311
--- /dev/null
+++ b/packages/uboot/u-boot-utils_1.2.0.bb
@@ -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
+}
+
diff --git a/packages/uboot/uboot-utils_1.2.0.bb b/packages/uboot/uboot-utils_1.2.0.bb
deleted file mode 100644
index fe9b3aca26..0000000000
--- a/packages/uboot/uboot-utils_1.2.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
-SECTION = "bootloaders"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r6"
-
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
-
-S = "${WORKDIR}/u-boot-${PV}"
-
-do_configure() {
-	:
-}
-
-do_compile () {
-	oe_runmake Sandpoint8240_config
-	oe_runmake tools
-}
-
-# install mkimage for the kernel makefile
-do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}
-	install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/
-}
-
-- 
cgit v1.2.3