[oe-commits] org.oe.dev angstrom build release: do uclibc stuff first, so initramfs kernels build properly

[koen commit]

angstrom build release: do uclibc stuff first, so initramfs kernels build properly

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a877d0fad972bed96b2f61ea7688b2b406e22fb6
ViewMTN: http://monotone.openembedded.org/revision/info/a877d0fad972bed96b2f61ea7688b2b406e22fb6
Files:
1
contrib/angstrom/build-release.sh
Diffs:

#
# mt diff -r98700fc111380481358743cb52acd7b96a7e1aeb -ra877d0fad972bed96b2f61ea7688b2b406e22fb6
#
# 
# 
# patch "contrib/angstrom/build-release.sh"
#  from [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
#    to [ba8f992bfe8e6c725b91b12fbe667c9f9423659b]
# 
============================================================
--- contrib/angstrom/build-release.sh	b708ec70fd4e4e0c2756d122aa95b1d653019a9e
+++ contrib/angstrom/build-release.sh	ba8f992bfe8e6c725b91b12fbe667c9f9423659b
@@ -5,6 +5,22 @@ do_build() {
 do_build() {
 	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
 
+        if [ $DO_UCLIBC = 1 ]
+        then
+                BUILD_MODE="uclibc"
+                echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+                if [ "$BUILD_CLEAN" != "" ]
+                then
+                        bitbake -c clean $BUILD_CLEAN
+                fi
+
+                for target in $BUILD_TARGETS
+                do
+                        bitbake $target && do_report_success
+                done
+        fi
+
 	BUILD_MODE="glibc"
 	if [ "$BUILD_CLEAN" != "" ]
 	then
@@ -15,22 +31,6 @@ do_build() {
 	do
 		bitbake $target && do_report_success
 	done
-
-	if [ $DO_UCLIBC = 1 ]
-	then
-		BUILD_MODE="uclibc"
-		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
-		
-		if [ "$BUILD_CLEAN" != "" ]
-        	then
-                	bitbake -c clean $BUILD_CLEAN
-        	fi
-
-		for target in $BUILD_TARGETS
-		do
-			bitbake $target && do_report_success
-		done
-	fi
 }
 
 do_report_success() {
@@ -79,7 +79,7 @@ do
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
+	BUILD_TARGETS="initramfs-bootmenu-image base-image console-image minimal-gpe-image x11-image"
 	do_build
 done