[oe-commits] org.oe.dev merge of 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'

[oe commit]

merge of 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'
     and 'dee5d8b7b54d72358d0edb5fc940ae498a6b4939'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: fe581e77a9fb94cb67b56fe4285ce1023a21eac9
ViewMTN: http://monotone.openembedded.org/revision/info/fe581e77a9fb94cb67b56fe4285ce1023a21eac9
Files:
1
classes/package_ipk.bbclass
packages/images/nslu2-minimal-image.bb
packages/images/nslu2-base-image.bb
contrib/angstrom/build-release.sh
Diffs:

#
# mt diff -rc4c17ca83d23bc51028aa72cd2f94ead9497b597 -rfe581e77a9fb94cb67b56fe4285ce1023a21eac9
#
# 
# 
# patch "classes/package_ipk.bbclass"
#  from [a8bf45567c155d0584cbfbffdacb48a0add41657]
#    to [026a54435a436ef29405fa6b02afea519cc76ce7]
# 
============================================================
--- classes/package_ipk.bbclass	a8bf45567c155d0584cbfbffdacb48a0add41657
+++ classes/package_ipk.bbclass	026a54435a436ef29405fa6b02afea519cc76ce7
@@ -323,4 +323,5 @@ do_package_write_ipk[dirs] = "${D}"
 	bb.build.exec_func("do_package_ipk", d)
 }
 do_package_write_ipk[dirs] = "${D}"
+do_package_write_ipk[depends] = "ipkg-utils-native:do_populate_staging"
 addtask package_write_ipk before do_package_write after do_package


#
# mt diff -rdee5d8b7b54d72358d0edb5fc940ae498a6b4939 -rfe581e77a9fb94cb67b56fe4285ce1023a21eac9
#
# 
# 
# rename "packages/images/nslu2-minimal-image.bb"
#     to "packages/images/nslu2-base-image.bb"
# 
# patch "contrib/angstrom/build-release.sh"
#  from [6e9b6db12a381f8be056191a2a70904f430255a4]
#    to [8d77a44ca4304a0ee848142edd6f3c86b6abc9ea]
# 
# patch "packages/images/nslu2-base-image.bb"
#  from [14898795bea95dfcd88ed66ae25730964af725c5]
#    to [554cbad7ee3ea28180edebc058b1f80051094c78]
# 
============================================================
--- contrib/angstrom/build-release.sh	6e9b6db12a381f8be056191a2a70904f430255a4
+++ contrib/angstrom/build-release.sh	8d77a44ca4304a0ee848142edd6f3c86b6abc9ea
@@ -44,7 +44,7 @@ do
 for machine in ixp4xxle ixp4xxbe 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="nslu2-minimal-image"
+	BUILD_TARGETS="minimal-image nslu2-base-image"
 	do_build
 done	 
 
============================================================
--- packages/images/nslu2-minimal-image.bb	14898795bea95dfcd88ed66ae25730964af725c5
+++ packages/images/nslu2-base-image.bb	554cbad7ee3ea28180edebc058b1f80051094c78
@@ -1,14 +1,14 @@
 # Note that this package is intended to create an *identical*
-# kernel and rootfs as the normal minimal-image.bb
+# kernel and rootfs as the normal base-image.bb
 
 # The only reason for the existence of this .bb file is to
 # create the 8MB and 16MB flashable NSLU2 firmware images.
 
 # Please do not add anything other than the following two
 # lines to this file, and please do not do anything in
-# the nslu2-image.bb class which might affect the kernel
+# the nslu2-image class which might affect the kernel
 # or rootfs.
 
-require minimal-image.bb
+require base-image.bb
 
 inherit nslu2-image