[oe-commits] org.oe.dev uboot: unify, fix SECTION

Laibsch commit openembedded-commits at lists.openembedded.org
Mon Feb 12 12:17:08 UTC 2007


uboot: unify, fix SECTION

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 350577dc9d50fd104cbe65fcdd6fc4ef3687461a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=350577dc9d50fd104cbe65fcdd6fc4ef3687461a
Files:
1
packages/uboot/u-boot.inc
packages/uboot/u-boot_1.1.2.bb
packages/uboot/u-boot_1.1.4.bb
packages/uboot/u-boot_1.1.6.bb
packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
packages/uboot/u-boot_git.bb
Diffs:

#
# mt diff -rbfbdf129025cef99f011583141c246a1c9c673a5 -r350577dc9d50fd104cbe65fcdd6fc4ef3687461a
#
# 
# 
# add_file "packages/uboot/u-boot.inc"
#  content [fbb40888f231248af214a033f28c83c5405190a9]
# 
# patch "packages/uboot/u-boot_1.1.2.bb"
#  from [668f6cada3376fefd98547234d2f3843cf5b16a3]
#    to [a3889377bb092548a1ccae47ac1eef61ed16b8dd]
# 
# patch "packages/uboot/u-boot_1.1.4.bb"
#  from [cb20ba4ccf65593a0956f21de3000492c0751b2b]
#    to [d547515bb840f96de1ead3e9199d9fd85f4536eb]
# 
# patch "packages/uboot/u-boot_1.1.6.bb"
#  from [ec09049450242b4815dfeac570e8e8746357b149]
#    to [4fc0f6a543827c9634e59fdcf640234b80d8580f]
# 
# patch "packages/uboot/u-boot_LABEL.2006.06.30.2020.bb"
#  from [386fbaf7a89676a16a38226d518180ae09ee1c22]
#    to [a55508552317a15106b6a19b7d1802cb6b493e73]
# 
# patch "packages/uboot/u-boot_git.bb"
#  from [647c38c6dd82905949e15f573b51a74b2dfa0ed5]
#    to [d81b1c5ae9a4114a9a8a3bd25210c9271eb4a2a0]
# 
============================================================
--- packages/uboot/u-boot.inc	fbb40888f231248af214a033f28c83c5405190a9
+++ packages/uboot/u-boot.inc	fbb40888f231248af214a033f28c83c5405190a9
@@ -0,0 +1,30 @@
+DESCRIPTION = "U-boot bootloader"
+HOMEPAGE = "http://u-boot.sf.net"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "virtual/bootloader"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+UBOOT_MACHINE ?= "${MACHINE}_config"
+UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
+
+do_compile () {
+	unset LDFLAGS
+	unset CFLAGS
+	unset CPPFLAGS
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake all
+}
+
+do_deploy () {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
+
+do_stage() {
+	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
+}
============================================================
--- packages/uboot/u-boot_1.1.2.bb	668f6cada3376fefd98547234d2f3843cf5b16a3
+++ packages/uboot/u-boot_1.1.2.bb	a3889377bb092548a1ccae47ac1eef61ed16b8dd
@@ -1,8 +1,4 @@
-DESCRIPTION = "U-boot bootloader"
-PROVIDES = "virtual/bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require u-boot.inc
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	   file://arm_flags.patch;patch=1 "
@@ -13,13 +9,10 @@ SRC_URI_append_mnci   = "file://mnci.pat
                          file://command-names.patch;patch=1"
 # TODO: SRC_URI_append_rt3000
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 TARGET_LDFLAGS = ""
 
-UBOOT_MACHINE ?= "${MACHINE}_config"
 UBOOT_MACHINE_mnci   = "mnci_config"
 UBOOT_MACHINE_vibren = "pxa255_idp_config"
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
 
 inherit base
 
@@ -28,18 +21,6 @@ do_compile () {
 	oe_runmake all
 }
 
-do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
-
-
 #########################################################
 
 RDEPENDS_append_mnci = " hwctrl"
============================================================
--- packages/uboot/u-boot_1.1.4.bb	cb20ba4ccf65593a0956f21de3000492c0751b2b
+++ packages/uboot/u-boot_1.1.4.bb	d547515bb840f96de1ead3e9199d9fd85f4536eb
@@ -1,8 +1,4 @@
-DESCRIPTION = "U-boot bootloader"
-PROVIDES = "virtual/bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -30,13 +26,9 @@ SRC_URI_append_dht-walnut= "\
         file://u-boot-dht-walnut-df2.patch;patch=1"
 
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}"
 TARGET_LDFLAGS = ""
 
-UBOOT_MACHINE ?= "${MACHINE}_config"
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
-
 UBOOT_MACHINE_dht-walnut = "walnut_config"
 
 def gumstix_mhz(d):
@@ -55,14 +47,3 @@ do_compile () {
 	oe_runmake ${UBOOT_MACHINE}
 	oe_runmake all
 }
-
-do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
============================================================
--- packages/uboot/u-boot_1.1.6.bb	ec09049450242b4815dfeac570e8e8746357b149
+++ packages/uboot/u-boot_1.1.6.bb	4fc0f6a543827c9634e59fdcf640234b80d8580f
@@ -1,36 +1,8 @@
-DESCRIPTION = "U-boot bootloader"
-PROVIDES = "virtual/bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require u-boot.inc
 
 PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \
            file://devkit-idp.patch;patch=1"
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-
-UBOOT_MACHINE ?= "${MACHINE}_config"
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_compile () {
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-}
-
-do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
============================================================
--- packages/uboot/u-boot_LABEL.2006.06.30.2020.bb	386fbaf7a89676a16a38226d518180ae09ee1c22
+++ packages/uboot/u-boot_LABEL.2006.06.30.2020.bb	a55508552317a15106b6a19b7d1802cb6b493e73
@@ -1,8 +1,4 @@
-DESCRIPTION = "U-boot bootloader"
-PROVIDES = "virtual/bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require u-boot.inc
 
 PR = "r2"
 
@@ -16,31 +12,6 @@ S = "${WORKDIR}/git"
 
 S = "${WORKDIR}/git"
 
-#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS="""
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-
-UBOOT_MACHINE ?= "${MACHINE}_config"
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #inherit base
-
-do_compile () {
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-}
-
-do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
============================================================
--- packages/uboot/u-boot_git.bb	647c38c6dd82905949e15f573b51a74b2dfa0ed5
+++ packages/uboot/u-boot_git.bb	d81b1c5ae9a4114a9a8a3bd25210c9271eb4a2a0
@@ -1,8 +1,4 @@
-DESCRIPTION = "U-boot bootloader"
-PROVIDES = "virtual/bootloader"
-SECTION = "bootloader"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -10,31 +6,6 @@ S = "${WORKDIR}/git"
 
 S = "${WORKDIR}/git"
 
-#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS="""
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-
-UBOOT_MACHINE ?= "${MACHINE}_config"
-UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #inherit base
-
-do_compile () {
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake ${UBOOT_MACHINE}
-	oe_runmake all
-}
-
-do_stage() {
-	install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE}
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-}
-do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile






More information about the Openembedded-commits mailing list